feat: rename addon vars to addon_ prefix and simplify logic in jinja templates (#1216)
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed
1 parent
b89b7b3ed9
commit
db21ea82fa
63 files changed
+102
-101
No files matched your search
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
|
||||
#% if addon_csi_driver_nfs.enabled %#
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
|
||||
#% if addon_csi_driver_nfs.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
|
||||
#% for item in csi_driver_nfs.storage_class %#
|
||||
#% if addon_csi_driver_nfs.enabled %#
|
||||
#% for item in addon_csi_driver_nfs.storage_class %#
|
||||
---
|
||||
apiVersion: storage.k8s.io/v1
|
||||
kind: StorageClass
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
|
||||
#% if addon_csi_driver_nfs.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% for item in csi_driver_smb.storage_class %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
#% for item in addon_csi_driver_smb.storage_class %#
|
||||
#% if not item.existing_secret_name %#
|
||||
---
|
||||
apiVersion: v1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% for item in csi_driver_smb.storage_class %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
#% for item in addon_csi_driver_smb.storage_class %#
|
||||
---
|
||||
apiVersion: storage.k8s.io/v1
|
||||
kind: StorageClass
|
||||
@@ -25,6 +25,6 @@ mountOptions:
|
||||
- noperm
|
||||
- mfsymlinks
|
||||
- cache=strict
|
||||
- noserverino # required to prevent data corruption
|
||||
- noserverino # required to prevent data corruption
|
||||
#% endfor %#
|
||||
#% endif %#
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
|
||||
@@ -3,14 +3,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./namespace.yaml
|
||||
#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
|
||||
#% if addon_csi_driver_nfs.enabled %#
|
||||
- ./csi-driver-nfs/ks.yaml
|
||||
#% endif %#
|
||||
#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
|
||||
#% if addon_csi_driver_smb.enabled %#
|
||||
- ./csi-driver-smb/ks.yaml
|
||||
#% endif %#
|
||||
- ./openebs/ks.yaml
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
- ./volsync/ks.yaml
|
||||
#% endif %#
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: monitoring.coreos.com/v1
|
||||
kind: PrometheusRule
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
kind: Kustomization
|
||||
@@ -10,7 +10,7 @@ spec:
|
||||
commonMetadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: *app
|
||||
#% if longhorn|default({}) and longhorn.enabled|default(false) %#
|
||||
#% if addon_longhorn.enabled %#
|
||||
dependsOn:
|
||||
- name: longhorn
|
||||
#% endif %#
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: helm.toolkit.fluxcd.io/v2beta2
|
||||
kind: HelmRelease
|
||||
@@ -27,7 +27,7 @@ spec:
|
||||
keepHistory: false
|
||||
values:
|
||||
controller:
|
||||
#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
|
||||
#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
|
||||
volumeSnapshotClasses:
|
||||
- name: longhorn-snapclass
|
||||
annotations:
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#% if volsync|default({}) and volsync.enabled|default(false) %#
|
||||
#% if addon_volsync.enabled %#
|
||||
---
|
||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
Reference in new issue
Block a user