diff --git a/clusters/testing/kustomization.yaml b/clusters/testing/kustomization.yaml index 3add58d..54286ad 100644 --- a/clusters/testing/kustomization.yaml +++ b/clusters/testing/kustomization.yaml @@ -12,7 +12,6 @@ resources: - ../../controllers/cnpg/cnpg.yaml - ../../configs/artifacts.yaml - - ../../configs/letsencrypt/letsencrypt.yaml - ../../configs/certificates/certificates.yaml - ../../configs/alerts/alerts.yaml - ../../configs/longhorn-jobs/longhorn-jobs.yaml diff --git a/configs/artifacts.yaml b/configs/artifacts.yaml index b7f5f5c..1b61bb8 100644 --- a/configs/artifacts.yaml +++ b/configs/artifacts.yaml @@ -9,11 +9,6 @@ spec: kind: GitRepository name: flux-system artifacts: - - name: letsencrypt - originRevision: "@foundation" - copy: - - from: "@foundation/configs/letsencrypt/**" - to: "@artifact/" - name: certificates originRevision: "@foundation" copy: diff --git a/configs/letsencrypt/cluster-issuer.yaml b/configs/certificates/base/cluster-issuer.yaml similarity index 100% rename from configs/letsencrypt/cluster-issuer.yaml rename to configs/certificates/base/cluster-issuer.yaml diff --git a/configs/certificates/base/kustomization.yaml b/configs/certificates/base/kustomization.yaml index 632af6a..74f4e83 100644 --- a/configs/certificates/base/kustomization.yaml +++ b/configs/certificates/base/kustomization.yaml @@ -3,3 +3,5 @@ kind: Kustomization resources: - namespace.yaml - certificate-huizinga-dev.yaml + - secret-cloudflare-token.enc.yaml + - cluster-issuer.yaml diff --git a/configs/letsencrypt/secret-cloudflare-token.enc.yaml b/configs/certificates/base/secret-cloudflare-token.enc.yaml similarity index 100% rename from configs/letsencrypt/secret-cloudflare-token.enc.yaml rename to configs/certificates/base/secret-cloudflare-token.enc.yaml diff --git a/configs/certificates/certificates.yaml b/configs/certificates/certificates.yaml index 9284fb0..9ce5f2e 100644 --- a/configs/certificates/certificates.yaml +++ b/configs/certificates/certificates.yaml @@ -8,10 +8,14 @@ spec: retryInterval: 2m timeout: 15m dependsOn: - - name: letsencrypt + - name: cert-manager sourceRef: kind: ExternalArtifact name: certificates + decryption: + provider: sops + secretRef: + name: sops-gpg path: ./${cluster_env} prune: true wait: true diff --git a/configs/letsencrypt/kustomization.yaml b/configs/letsencrypt/kustomization.yaml deleted file mode 100644 index bd1263d..0000000 --- a/configs/letsencrypt/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - secret-cloudflare-token.enc.yaml - - cluster-issuer.yaml diff --git a/configs/letsencrypt/letsencrypt.yaml b/configs/letsencrypt/letsencrypt.yaml deleted file mode 100644 index f53081b..0000000 --- a/configs/letsencrypt/letsencrypt.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: letsencrypt - namespace: flux-system -spec: - interval: 1h - retryInterval: 2m - timeout: 5m - dependsOn: - - name: cert-manager - sourceRef: - kind: ExternalArtifact - name: letsencrypt - decryption: - provider: sops - secretRef: - name: sops-gpg - path: ./ - prune: true - wait: true