fix: cluster user settings and secrets should be optional (#1245)
* fix: cluster user settings and secrets should be optional * Delete bootstrap/templates/kubernetes/flux/vars/cluster-secrets-user.sops.yaml.j2 * Delete bootstrap/templates/kubernetes/flux/vars/cluster-settings-user.yaml.j2 * Update kustomization.yaml.j2 * Update storageclass.yaml.j2
This commit is contained in:
1 parent
59b896fa33
commit
35185f8aa2
5 files changed
+5
-19
No files matched your search
@@ -9,7 +9,7 @@ parameters:
|
||||
source: "#{ item.source }#"
|
||||
csi.storage.k8s.io/node-stage-secret-name: "#{ item.secret_name|default(item.name + '-secret') }#"
|
||||
csi.storage.k8s.io/node-stage-secret-namespace: "#{ item.secret_namespace|default('storage') }#"
|
||||
reclaimPolicy: Retain
|
||||
reclaimPolicy: Delete
|
||||
volumeBindingMode: Immediate
|
||||
mountOptions:
|
||||
- "dir_mode=#{ item.dir_mode|default('0777') }#"
|
||||
|
||||
@@ -23,8 +23,10 @@ spec:
|
||||
name: cluster-secrets
|
||||
- kind: ConfigMap
|
||||
name: cluster-settings-user
|
||||
optional: true
|
||||
- kind: Secret
|
||||
name: cluster-secrets-user
|
||||
optional: true
|
||||
patches:
|
||||
- patch: |-
|
||||
apiVersion: kustomize.toolkit.fluxcd.io/v1
|
||||
@@ -44,8 +46,10 @@ spec:
|
||||
name: cluster-secrets
|
||||
- kind: ConfigMap
|
||||
name: cluster-settings-user
|
||||
optional: true
|
||||
- kind: Secret
|
||||
name: cluster-secrets-user
|
||||
optional: true
|
||||
target:
|
||||
group: kustomize.toolkit.fluxcd.io
|
||||
kind: Kustomization
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: cluster-secrets-user
|
||||
namespace: flux-system
|
||||
stringData:
|
||||
SECRET_PLACEHOLDER: "secret-value"
|
||||
@@ -1,8 +0,0 @@
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: cluster-settings-user
|
||||
namespace: flux-system
|
||||
data:
|
||||
SETTINGS_PLACEHOLDER: "settings-value"
|
||||
@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ./cluster-settings.yaml
|
||||
- ./cluster-settings-user.yaml
|
||||
- ./cluster-secrets.sops.yaml
|
||||
- ./cluster-secrets-user.sops.yaml
|
||||
Reference in new issue
Block a user