From 8e646d7b7898da37f3b57c3b800ce006893d028a Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Sat, 7 Sep 2024 00:14:50 -0400 Subject: [PATCH] feat: move cert-manager to common, add it to thin cluster --- .../apps}/cert-manager/cloudflare-cred.sops.yaml | 0 .../apps}/cert-manager/helm-release.yaml | 0 .../apps}/cert-manager/helm-repository.yaml | 0 .../apps}/cert-manager/kustomization.yaml | 0 .../apps}/cert-manager/letsencrypt-prod.yaml | 3 --- .../apps}/cert-manager/letsencrypt-stage.yaml | 3 --- .../core => common/apps}/cert-manager/namespace.yaml | 0 .../apps}/cert-manager/wildcard-cert.yaml | 11 ++--------- kubernetes/main/core/kustomization.yaml | 2 +- kubernetes/thin/apps/kustomization.yaml | 5 +---- 10 files changed, 4 insertions(+), 20 deletions(-) rename kubernetes/{main/core => common/apps}/cert-manager/cloudflare-cred.sops.yaml (100%) rename kubernetes/{main/core => common/apps}/cert-manager/helm-release.yaml (100%) rename kubernetes/{main/core => common/apps}/cert-manager/helm-repository.yaml (100%) rename kubernetes/{main/core => common/apps}/cert-manager/kustomization.yaml (100%) rename kubernetes/{main/core => common/apps}/cert-manager/letsencrypt-prod.yaml (83%) rename kubernetes/{main/core => common/apps}/cert-manager/letsencrypt-stage.yaml (83%) rename kubernetes/{main/core => common/apps}/cert-manager/namespace.yaml (100%) rename kubernetes/{main/core => common/apps}/cert-manager/wildcard-cert.yaml (51%) diff --git a/kubernetes/main/core/cert-manager/cloudflare-cred.sops.yaml b/kubernetes/common/apps/cert-manager/cloudflare-cred.sops.yaml similarity index 100% rename from kubernetes/main/core/cert-manager/cloudflare-cred.sops.yaml rename to kubernetes/common/apps/cert-manager/cloudflare-cred.sops.yaml diff --git a/kubernetes/main/core/cert-manager/helm-release.yaml b/kubernetes/common/apps/cert-manager/helm-release.yaml similarity index 100% rename from kubernetes/main/core/cert-manager/helm-release.yaml rename to kubernetes/common/apps/cert-manager/helm-release.yaml diff --git a/kubernetes/main/core/cert-manager/helm-repository.yaml b/kubernetes/common/apps/cert-manager/helm-repository.yaml similarity index 100% rename from kubernetes/main/core/cert-manager/helm-repository.yaml rename to kubernetes/common/apps/cert-manager/helm-repository.yaml diff --git a/kubernetes/main/core/cert-manager/kustomization.yaml b/kubernetes/common/apps/cert-manager/kustomization.yaml similarity index 100% rename from kubernetes/main/core/cert-manager/kustomization.yaml rename to kubernetes/common/apps/cert-manager/kustomization.yaml diff --git a/kubernetes/main/core/cert-manager/letsencrypt-prod.yaml b/kubernetes/common/apps/cert-manager/letsencrypt-prod.yaml similarity index 83% rename from kubernetes/main/core/cert-manager/letsencrypt-prod.yaml rename to kubernetes/common/apps/cert-manager/letsencrypt-prod.yaml index cff18c2..c882f1e 100644 --- a/kubernetes/main/core/cert-manager/letsencrypt-prod.yaml +++ b/kubernetes/common/apps/cert-manager/letsencrypt-prod.yaml @@ -10,9 +10,6 @@ spec: privateKeySecretRef: name: letsencrypt-production solvers: -# - http01: -# ingress: -# class: traefik - dns01: cloudflare: email: "${SECRET_MY_EMAIL}" diff --git a/kubernetes/main/core/cert-manager/letsencrypt-stage.yaml b/kubernetes/common/apps/cert-manager/letsencrypt-stage.yaml similarity index 83% rename from kubernetes/main/core/cert-manager/letsencrypt-stage.yaml rename to kubernetes/common/apps/cert-manager/letsencrypt-stage.yaml index 63b7f44..b5be2b3 100644 --- a/kubernetes/main/core/cert-manager/letsencrypt-stage.yaml +++ b/kubernetes/common/apps/cert-manager/letsencrypt-stage.yaml @@ -10,9 +10,6 @@ spec: privateKeySecretRef: name: letsencrypt-staging solvers: -# - http01: -# ingress: -# class: traefik - dns01: cloudflare: email: "${SECRET_MY_EMAIL}" diff --git a/kubernetes/main/core/cert-manager/namespace.yaml b/kubernetes/common/apps/cert-manager/namespace.yaml similarity index 100% rename from kubernetes/main/core/cert-manager/namespace.yaml rename to kubernetes/common/apps/cert-manager/namespace.yaml diff --git a/kubernetes/main/core/cert-manager/wildcard-cert.yaml b/kubernetes/common/apps/cert-manager/wildcard-cert.yaml similarity index 51% rename from kubernetes/main/core/cert-manager/wildcard-cert.yaml rename to kubernetes/common/apps/cert-manager/wildcard-cert.yaml index cc5b30f..2a8f2a9 100644 --- a/kubernetes/main/core/cert-manager/wildcard-cert.yaml +++ b/kubernetes/common/apps/cert-manager/wildcard-cert.yaml @@ -2,14 +2,10 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: wildcard-main-cert - namespace: traefik #cert-manager + namespace: traefik spec: secretName: wildcard-main-tls -# secretTemplate: -# annotations: -# replicator.v1.mittwald.de/replicate-to: "traefik" - duration: 2160h # 90d renewBefore: 360h # 15d @@ -19,7 +15,4 @@ spec: dnsNames: - "${SECRET_NEW_DOMAIN}" - - "*.${SECRET_NEW_DOMAIN}" -# - "*.k3s.${SECRET_NEW_DOMAIN}" -# - "*.database.${SECRET_NEW_DOMAIN}" -# - "*.s3.${SECRET_NEW_DOMAIN}" \ No newline at end of file + - "*.${SECRET_NEW_DOMAIN}" \ No newline at end of file diff --git a/kubernetes/main/core/kustomization.yaml b/kubernetes/main/core/kustomization.yaml index e505ffa..f5e016b 100644 --- a/kubernetes/main/core/kustomization.yaml +++ b/kubernetes/main/core/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - ./kube-system - ./helm-repositories.yaml -- ./cert-manager +- ../../common/apps/cert-manager - ../../common/apps/metallb - ../../common/apps/traefik/ks.yaml # storage diff --git a/kubernetes/thin/apps/kustomization.yaml b/kubernetes/thin/apps/kustomization.yaml index a2eaf7b..2df0834 100644 --- a/kubernetes/thin/apps/kustomization.yaml +++ b/kubernetes/thin/apps/kustomization.yaml @@ -2,14 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helm-repositories.yaml -#- ../../common/apps/metallb - ./main-ip-pool.yaml +- ../../common/apps/cert-manager - ../../common/apps/traefik/ks.yaml # storage -#- ./longhorn #- ../../common/apps/openebs -#- ./kube-replicator - - ../../common/apps/nfd/ks.yaml - ../../common/apps/intel-gpu/ks.yaml \ No newline at end of file