From 17bae3c1a288896323631f4222c07e962025e808 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 29 Nov 2022 09:19:57 -0500 Subject: [PATCH] feat!: Move networking apps into kube-system namespace Signed-off-by: Devin Buhl --- cluster/apps/default/kustomization.yaml | 1 - cluster/apps/flux-system/kustomization.yaml | 5 ----- cluster/apps/flux-system/namespace.yaml | 7 ------- .../cert-manager/helm-release.yaml | 2 +- .../cert-manager/issuers/helm-release.yaml | 4 ++-- .../cert-manager/issuers/kustomization.yaml | 0 .../cert-manager/kustomization.yaml | 0 .../cloudflare-ddns/cloudflare-ddns.sh | 0 .../cloudflare-ddns/cron-job.yaml | 2 +- .../cloudflare-ddns/kustomization.yaml | 2 +- .../external-dns/helm-release.yaml | 2 +- .../external-dns/kustomization.yaml | 0 .../ingress-nginx/cloudflare-proxied-networks.txt | 0 .../ingress-nginx/helm-release.yaml | 6 +++--- .../ingress-nginx/kustomization.yaml | 2 +- .../k8s-gateway/helm-release.yaml | 4 ++-- .../k8s-gateway}/kustomization.yaml | 0 cluster/apps/kube-system/kustomization.yaml | 11 +++++++++-- .../metallb/config/helm-release.yaml | 8 ++++---- .../metallb/config/kustomization.yaml | 0 .../metallb/helm-release.yaml | 2 +- .../metallb/kustomization.yaml | 0 .../reloader/helm-release.yaml | 0 .../reloader}/kustomization.yaml | 0 cluster/apps/kustomization.yaml | 2 -- cluster/apps/networking/kustomization.yaml | 11 ----------- cluster/apps/networking/namespace.yaml | 7 ------- configure | 12 ++++++------ 28 files changed, 32 insertions(+), 58 deletions(-) delete mode 100644 cluster/apps/flux-system/kustomization.yaml delete mode 100644 cluster/apps/flux-system/namespace.yaml rename cluster/apps/{networking => kube-system}/cert-manager/helm-release.yaml (96%) rename cluster/apps/{networking => kube-system}/cert-manager/issuers/helm-release.yaml (97%) rename cluster/apps/{networking => kube-system}/cert-manager/issuers/kustomization.yaml (100%) rename cluster/apps/{networking => kube-system}/cert-manager/kustomization.yaml (100%) rename cluster/apps/{networking => kube-system}/cloudflare-ddns/cloudflare-ddns.sh (100%) rename cluster/apps/{networking => kube-system}/cloudflare-ddns/cron-job.yaml (98%) rename cluster/apps/{networking => kube-system}/cloudflare-ddns/kustomization.yaml (93%) rename cluster/apps/{networking => kube-system}/external-dns/helm-release.yaml (97%) rename cluster/apps/{networking => kube-system}/external-dns/kustomization.yaml (100%) rename cluster/apps/{networking => kube-system}/ingress-nginx/cloudflare-proxied-networks.txt (100%) rename cluster/apps/{networking => kube-system}/ingress-nginx/helm-release.yaml (96%) rename cluster/apps/{networking => kube-system}/ingress-nginx/kustomization.yaml (91%) rename cluster/apps/{networking => kube-system}/k8s-gateway/helm-release.yaml (93%) rename cluster/apps/{default/reloader => kube-system/k8s-gateway}/kustomization.yaml (100%) rename cluster/apps/{networking => kube-system}/metallb/config/helm-release.yaml (87%) rename cluster/apps/{networking => kube-system}/metallb/config/kustomization.yaml (100%) rename cluster/apps/{networking => kube-system}/metallb/helm-release.yaml (94%) rename cluster/apps/{networking => kube-system}/metallb/kustomization.yaml (100%) rename cluster/apps/{default => kube-system}/reloader/helm-release.yaml (100%) rename cluster/apps/{networking/k8s-gateway => kube-system/reloader}/kustomization.yaml (100%) delete mode 100644 cluster/apps/networking/kustomization.yaml delete mode 100644 cluster/apps/networking/namespace.yaml diff --git a/cluster/apps/default/kustomization.yaml b/cluster/apps/default/kustomization.yaml index bd16b986..5bdcb771 100644 --- a/cluster/apps/default/kustomization.yaml +++ b/cluster/apps/default/kustomization.yaml @@ -5,4 +5,3 @@ resources: - namespace.yaml - echo-server - hajimari - - reloader diff --git a/cluster/apps/flux-system/kustomization.yaml b/cluster/apps/flux-system/kustomization.yaml deleted file mode 100644 index 809cbe53..00000000 --- a/cluster/apps/flux-system/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - namespace.yaml diff --git a/cluster/apps/flux-system/namespace.yaml b/cluster/apps/flux-system/namespace.yaml deleted file mode 100644 index b48db452..00000000 --- a/cluster/apps/flux-system/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: flux-system - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/cluster/apps/networking/cert-manager/helm-release.yaml b/cluster/apps/kube-system/cert-manager/helm-release.yaml similarity index 96% rename from cluster/apps/networking/cert-manager/helm-release.yaml rename to cluster/apps/kube-system/cert-manager/helm-release.yaml index c12cce82..2523712f 100644 --- a/cluster/apps/networking/cert-manager/helm-release.yaml +++ b/cluster/apps/kube-system/cert-manager/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: cert-manager - namespace: networking + namespace: kube-system spec: interval: 15m chart: diff --git a/cluster/apps/networking/cert-manager/issuers/helm-release.yaml b/cluster/apps/kube-system/cert-manager/issuers/helm-release.yaml similarity index 97% rename from cluster/apps/networking/cert-manager/issuers/helm-release.yaml rename to cluster/apps/kube-system/cert-manager/issuers/helm-release.yaml index 15088a49..fe2b9ffb 100644 --- a/cluster/apps/networking/cert-manager/issuers/helm-release.yaml +++ b/cluster/apps/kube-system/cert-manager/issuers/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: cert-manager-issuers - namespace: networking + namespace: kube-system spec: interval: 15m chart: @@ -23,7 +23,7 @@ spec: retries: 5 dependsOn: - name: cert-manager - namespace: networking + namespace: kube-system values: resources: - apiVersion: cert-manager.io/v1 diff --git a/cluster/apps/networking/cert-manager/issuers/kustomization.yaml b/cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml similarity index 100% rename from cluster/apps/networking/cert-manager/issuers/kustomization.yaml rename to cluster/apps/kube-system/cert-manager/issuers/kustomization.yaml diff --git a/cluster/apps/networking/cert-manager/kustomization.yaml b/cluster/apps/kube-system/cert-manager/kustomization.yaml similarity index 100% rename from cluster/apps/networking/cert-manager/kustomization.yaml rename to cluster/apps/kube-system/cert-manager/kustomization.yaml diff --git a/cluster/apps/networking/cloudflare-ddns/cloudflare-ddns.sh b/cluster/apps/kube-system/cloudflare-ddns/cloudflare-ddns.sh similarity index 100% rename from cluster/apps/networking/cloudflare-ddns/cloudflare-ddns.sh rename to cluster/apps/kube-system/cloudflare-ddns/cloudflare-ddns.sh diff --git a/cluster/apps/networking/cloudflare-ddns/cron-job.yaml b/cluster/apps/kube-system/cloudflare-ddns/cron-job.yaml similarity index 98% rename from cluster/apps/networking/cloudflare-ddns/cron-job.yaml rename to cluster/apps/kube-system/cloudflare-ddns/cron-job.yaml index 9ae4561f..6c8244ac 100644 --- a/cluster/apps/networking/cloudflare-ddns/cron-job.yaml +++ b/cluster/apps/kube-system/cloudflare-ddns/cron-job.yaml @@ -3,7 +3,7 @@ apiVersion: batch/v1 kind: CronJob metadata: name: &app cloudflare-ddns - namespace: default + namespace: kube-system spec: schedule: "@hourly" concurrencyPolicy: Forbid diff --git a/cluster/apps/networking/cloudflare-ddns/kustomization.yaml b/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml similarity index 93% rename from cluster/apps/networking/cloudflare-ddns/kustomization.yaml rename to cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml index 57df8484..2f6a8346 100644 --- a/cluster/apps/networking/cloudflare-ddns/kustomization.yaml +++ b/cluster/apps/kube-system/cloudflare-ddns/kustomization.yaml @@ -4,7 +4,7 @@ kind: Kustomization resources: - cron-job.yaml - secret.sops.yaml -namespace: networking +namespace: kube-system configMapGenerator: - name: cloudflare-ddns files: diff --git a/cluster/apps/networking/external-dns/helm-release.yaml b/cluster/apps/kube-system/external-dns/helm-release.yaml similarity index 97% rename from cluster/apps/networking/external-dns/helm-release.yaml rename to cluster/apps/kube-system/external-dns/helm-release.yaml index fd1a2829..d4fb53cd 100644 --- a/cluster/apps/networking/external-dns/helm-release.yaml +++ b/cluster/apps/kube-system/external-dns/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: external-dns - namespace: networking + namespace: kube-system spec: interval: 15m chart: diff --git a/cluster/apps/networking/external-dns/kustomization.yaml b/cluster/apps/kube-system/external-dns/kustomization.yaml similarity index 100% rename from cluster/apps/networking/external-dns/kustomization.yaml rename to cluster/apps/kube-system/external-dns/kustomization.yaml diff --git a/cluster/apps/networking/ingress-nginx/cloudflare-proxied-networks.txt b/cluster/apps/kube-system/ingress-nginx/cloudflare-proxied-networks.txt similarity index 100% rename from cluster/apps/networking/ingress-nginx/cloudflare-proxied-networks.txt rename to cluster/apps/kube-system/ingress-nginx/cloudflare-proxied-networks.txt diff --git a/cluster/apps/networking/ingress-nginx/helm-release.yaml b/cluster/apps/kube-system/ingress-nginx/helm-release.yaml similarity index 96% rename from cluster/apps/networking/ingress-nginx/helm-release.yaml rename to cluster/apps/kube-system/ingress-nginx/helm-release.yaml index 1a3f8ddc..0484c637 100644 --- a/cluster/apps/networking/ingress-nginx/helm-release.yaml +++ b/cluster/apps/kube-system/ingress-nginx/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: ingress-nginx - namespace: networking + namespace: kube-system spec: interval: 15m chart: @@ -24,9 +24,9 @@ spec: retries: 5 dependsOn: - name: cert-manager - namespace: networking + namespace: kube-system - name: cert-manager-issuers - namespace: networking + namespace: kube-system values: controller: replicaCount: 1 diff --git a/cluster/apps/networking/ingress-nginx/kustomization.yaml b/cluster/apps/kube-system/ingress-nginx/kustomization.yaml similarity index 91% rename from cluster/apps/networking/ingress-nginx/kustomization.yaml rename to cluster/apps/kube-system/ingress-nginx/kustomization.yaml index 9304637e..093cb30a 100644 --- a/cluster/apps/networking/ingress-nginx/kustomization.yaml +++ b/cluster/apps/kube-system/ingress-nginx/kustomization.yaml @@ -1,7 +1,7 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: networking +namespace: kube-system resources: - helm-release.yaml configMapGenerator: diff --git a/cluster/apps/networking/k8s-gateway/helm-release.yaml b/cluster/apps/kube-system/k8s-gateway/helm-release.yaml similarity index 93% rename from cluster/apps/networking/k8s-gateway/helm-release.yaml rename to cluster/apps/kube-system/k8s-gateway/helm-release.yaml index 8a32d1bf..f33b86ca 100644 --- a/cluster/apps/networking/k8s-gateway/helm-release.yaml +++ b/cluster/apps/kube-system/k8s-gateway/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: k8s-gateway - namespace: networking + namespace: kube-system spec: interval: 15m chart: @@ -24,7 +24,7 @@ spec: retries: 5 dependsOn: - name: metallb - namespace: networking + namespace: kube-system values: fullnameOverride: k8s-gateway domain: ${SECRET_DOMAIN} diff --git a/cluster/apps/default/reloader/kustomization.yaml b/cluster/apps/kube-system/k8s-gateway/kustomization.yaml similarity index 100% rename from cluster/apps/default/reloader/kustomization.yaml rename to cluster/apps/kube-system/k8s-gateway/kustomization.yaml diff --git a/cluster/apps/kube-system/kustomization.yaml b/cluster/apps/kube-system/kustomization.yaml index 1dc050cf..92724f8a 100644 --- a/cluster/apps/kube-system/kustomization.yaml +++ b/cluster/apps/kube-system/kustomization.yaml @@ -2,5 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml - - metrics-server + - ./namespace.yaml + - ./cert-manager + - ./cloudflare-ddns + - ./external-dns + - ./ingress-nginx + - ./k8s-gateway + - ./metallb + - ./metrics-server + - ./reloader diff --git a/cluster/apps/networking/metallb/config/helm-release.yaml b/cluster/apps/kube-system/metallb/config/helm-release.yaml similarity index 87% rename from cluster/apps/networking/metallb/config/helm-release.yaml rename to cluster/apps/kube-system/metallb/config/helm-release.yaml index 57929208..bf05f755 100644 --- a/cluster/apps/networking/metallb/config/helm-release.yaml +++ b/cluster/apps/kube-system/metallb/config/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: metallb-config - namespace: networking + namespace: kube-system spec: interval: 15m chart: @@ -23,14 +23,14 @@ spec: retries: 5 dependsOn: - name: metallb - namespace: networking + namespace: kube-system values: resources: - apiVersion: metallb.io/v1beta1 kind: L2Advertisement metadata: name: l2-ip - namespace: networking + namespace: kube-system spec: ipAddressPools: - default-pool @@ -39,7 +39,7 @@ spec: kind: IPAddressPool metadata: name: default-pool - namespace: networking + namespace: kube-system spec: addresses: - "${METALLB_LB_RANGE}" diff --git a/cluster/apps/networking/metallb/config/kustomization.yaml b/cluster/apps/kube-system/metallb/config/kustomization.yaml similarity index 100% rename from cluster/apps/networking/metallb/config/kustomization.yaml rename to cluster/apps/kube-system/metallb/config/kustomization.yaml diff --git a/cluster/apps/networking/metallb/helm-release.yaml b/cluster/apps/kube-system/metallb/helm-release.yaml similarity index 94% rename from cluster/apps/networking/metallb/helm-release.yaml rename to cluster/apps/kube-system/metallb/helm-release.yaml index 1f12fc27..4358eff3 100644 --- a/cluster/apps/networking/metallb/helm-release.yaml +++ b/cluster/apps/kube-system/metallb/helm-release.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: name: metallb - namespace: networking + namespace: kube-system spec: interval: 15m chart: diff --git a/cluster/apps/networking/metallb/kustomization.yaml b/cluster/apps/kube-system/metallb/kustomization.yaml similarity index 100% rename from cluster/apps/networking/metallb/kustomization.yaml rename to cluster/apps/kube-system/metallb/kustomization.yaml diff --git a/cluster/apps/default/reloader/helm-release.yaml b/cluster/apps/kube-system/reloader/helm-release.yaml similarity index 100% rename from cluster/apps/default/reloader/helm-release.yaml rename to cluster/apps/kube-system/reloader/helm-release.yaml diff --git a/cluster/apps/networking/k8s-gateway/kustomization.yaml b/cluster/apps/kube-system/reloader/kustomization.yaml similarity index 100% rename from cluster/apps/networking/k8s-gateway/kustomization.yaml rename to cluster/apps/kube-system/reloader/kustomization.yaml diff --git a/cluster/apps/kustomization.yaml b/cluster/apps/kustomization.yaml index 10518a56..6d13d726 100644 --- a/cluster/apps/kustomization.yaml +++ b/cluster/apps/kustomization.yaml @@ -3,7 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - default - - flux-system - kube-system - - networking # - system-upgrade diff --git a/cluster/apps/networking/kustomization.yaml b/cluster/apps/networking/kustomization.yaml deleted file mode 100644 index 37ebeef8..00000000 --- a/cluster/apps/networking/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - namespace.yaml - - cloudflare-ddns - - external-dns - - ingress-nginx - - metallb - - k8s-gateway - - cert-manager \ No newline at end of file diff --git a/cluster/apps/networking/namespace.yaml b/cluster/apps/networking/namespace.yaml deleted file mode 100644 index b9e4a416..00000000 --- a/cluster/apps/networking/namespace.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: networking - labels: - kustomize.toolkit.fluxcd.io/prune: disabled diff --git a/configure b/configure index 5a43a05b..6165a967 100755 --- a/configure +++ b/configure @@ -53,16 +53,16 @@ main() { envsubst < "${PROJECT_DIR}/tmpl/cluster/cluster-secrets.sops.yaml" \ > "${PROJECT_DIR}/cluster/flux/vars/cluster-secrets.sops.yaml" envsubst < "${PROJECT_DIR}/tmpl/cluster/cert-manager-secret.sops.yaml" \ - > "${PROJECT_DIR}/cluster/apps/networking/cert-manager/issuers/secret.sops.yaml" + > "${PROJECT_DIR}/cluster/apps/kube-system/cert-manager/issuers/secret.sops.yaml" envsubst < "${PROJECT_DIR}/tmpl/cluster/cloudflare-ddns-secret.sops.yaml" \ - > "${PROJECT_DIR}/cluster/apps/networking/cloudflare-ddns/secret.sops.yaml" + > "${PROJECT_DIR}/cluster/apps/kube-system/cloudflare-ddns/secret.sops.yaml" envsubst < "${PROJECT_DIR}/tmpl/cluster/external-dns-secret.sops.yaml" \ - > "${PROJECT_DIR}/cluster/apps/networking/external-dns/secret.sops.yaml" + > "${PROJECT_DIR}/cluster/apps/kube-system/external-dns/secret.sops.yaml" # encrypt cluster secrets sops --encrypt --in-place "${PROJECT_DIR}/cluster/flux/vars/cluster-secrets.sops.yaml" - sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/networking/cert-manager/issuers/secret.sops.yaml" - sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/networking/cloudflare-ddns/secret.sops.yaml" - sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/networking/external-dns/secret.sops.yaml" + sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/kube-system/cert-manager/issuers/secret.sops.yaml" + sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/kube-system/cloudflare-ddns/secret.sops.yaml" + sops --encrypt --in-place "${PROJECT_DIR}/cluster/apps/kube-system/external-dns/secret.sops.yaml" # generate terraform secrets envsubst < "${PROJECT_DIR}/tmpl/terraform/secret.sops.yaml" \ > "${PROJECT_DIR}/provision/terraform/cloudflare/secret.sops.yaml"