diff --git a/kubernetes/apps/security/external-secrets/app/clustersecretstore.yaml b/kubernetes/apps/security/external-secrets-stores/app/clustersecretstore.yaml similarity index 100% rename from kubernetes/apps/security/external-secrets/app/clustersecretstore.yaml rename to kubernetes/apps/security/external-secrets-stores/app/clustersecretstore.yaml diff --git a/kubernetes/apps/security/external-secrets/app/externalsecret.yaml b/kubernetes/apps/security/external-secrets-stores/app/externalsecret.yaml similarity index 100% rename from kubernetes/apps/security/external-secrets/app/externalsecret.yaml rename to kubernetes/apps/security/external-secrets-stores/app/externalsecret.yaml diff --git a/kubernetes/apps/security/external-secrets-stores/app/kustomization.yaml b/kubernetes/apps/security/external-secrets-stores/app/kustomization.yaml new file mode 100644 index 0000000..4e52424 --- /dev/null +++ b/kubernetes/apps/security/external-secrets-stores/app/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./clustersecretstore.yaml + - ./externalsecret.yaml diff --git a/kubernetes/apps/security/external-secrets-stores/ks.yaml b/kubernetes/apps/security/external-secrets-stores/ks.yaml new file mode 100644 index 0000000..0790518 --- /dev/null +++ b/kubernetes/apps/security/external-secrets-stores/ks.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: external-secrets-stores +spec: + interval: 1h + path: ./kubernetes/apps/security/external-secrets-stores/app + prune: true + sourceRef: + kind: GitRepository + name: flux-system + namespace: flux-system + targetNamespace: security + wait: true + # ClusterSecretStore и ExternalSecret — это CR, которые ставят CRD'ы из чарта + # external-secrets. В одном Kustomization с HelmRelease оператора они падали бы + # с `no matches for kind "ClusterSecretStore"`, потому что CRD'ы появляются + # только после установки релиза. Поэтому отдельный Kustomization и dependsOn. + dependsOn: + - name: external-secrets diff --git a/kubernetes/apps/security/external-secrets/app/kustomization.yaml b/kubernetes/apps/security/external-secrets/app/kustomization.yaml index f47595c..10bfeb9 100644 --- a/kubernetes/apps/security/external-secrets/app/kustomization.yaml +++ b/kubernetes/apps/security/external-secrets/app/kustomization.yaml @@ -4,5 +4,3 @@ kind: Kustomization resources: - ./ocirepository.yaml - ./helmrelease.yaml - - ./clustersecretstore.yaml - - ./externalsecret.yaml diff --git a/kubernetes/apps/security/kustomization.yaml b/kubernetes/apps/security/kustomization.yaml index 4e1672b..1a461f8 100644 --- a/kubernetes/apps/security/kustomization.yaml +++ b/kubernetes/apps/security/kustomization.yaml @@ -9,4 +9,5 @@ components: resources: - ./namespace.yaml - ./external-secrets/ks.yaml + - ./external-secrets-stores/ks.yaml - ./vault/ks.yaml