feat!: Update Flux ks names and add volsync and snapshot-controller (#1036)

2023-11-23 17:49:40 -05:00
1 parent fc3c7b56af
commit 84574b2f64
@@ -3,7 +3,6 @@ apiVersion: externaldns.k8s.io/v1alpha1
 kind: DNSEndpoint
 metadata:
  name: cloudflared
-  namespace: networking
 spec:
  endpoints:
    - dnsName: "external.${SECRET_DOMAIN}"
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: cloudflared
-  namespace: networking
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./dnsendpoint.yaml
  - ./secret.sops.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: cloudflared-secret
-  namespace: networking
 stringData:
  TUNNEL_ID: "{{ bootstrap_cloudflare_tunnel_id }}"
  credentials.json: |
@@ -2,11 +2,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-cloudflared
+  name: &app cloudflared
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-external-dns
+    - name: external-dns
  path: ./kubernetes/apps/networking/cloudflared/app
  prune: true
  sourceRef:
@@ -4,7 +4,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: echo-server
-  namespace: networking
 spec:
  interval: 30m
  chart:
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./helmrelease.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-echo-server
+  name: &app echo-server
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/networking/echo-server/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: &app external-dns
-  namespace: networking
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./dnsendpoint-crd.yaml
  - ./secret.sops.yaml
@@ -3,6 +3,5 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: external-dns-secret
-  namespace: networking
 stringData:
  api-token: "{{ bootstrap_cloudflare_token }}"
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-external-dns
+  name: &app external-dns
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/networking/external-dns/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: k8s-gateway
-  namespace: networking
 spec:
  interval: 30m
  chart:
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./helmrelease.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-k8s-gateway
+  name: &app k8s-gateway
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/networking/k8s-gateway/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
  name: "${SECRET_DOMAIN/./-}-production"
-  namespace: networking
 spec:
  secretName: "${SECRET_DOMAIN/./-}-production-tls"
  issuerRef:
@@ -3,7 +3,6 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
  name: "${SECRET_DOMAIN/./-}-staging"
-  namespace: networking
 spec:
  secretName: "${SECRET_DOMAIN/./-}-staging-tls"
  issuerRef:
@@ -4,7 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: nginx-external
-  namespace: networking
+  namespace: &namespace networking
 spec:
  interval: 30m
  chart:
@@ -70,7 +70,7 @@ spec:
        enabled: true
        serviceMonitor:
          enabled: true
-          namespace: networking
+          namespace: *namespace
          namespaceSelector:
            any: true
      extraArgs:
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./helmrelease.yaml
@@ -4,7 +4,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: nginx-internal
-  namespace: networking
+  namespace: &namespace networking
 spec:
  interval: 30m
  chart:
@@ -67,7 +67,7 @@ spec:
        enabled: true
        serviceMonitor:
          enabled: true
-          namespace: networking
+          namespace: *namespace
          namespaceSelector:
            any: true
      extraArgs:
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: networking
 resources:
  - ./helmrelease.yaml
@@ -2,11 +2,15 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-nginx-certificates
+  name: &app nginx-certificates
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-cert-manager-issuers
+    - name: cert-manager-issuers
  path: ./kubernetes/apps/networking/nginx/certificates
  prune: true
  sourceRef:
@@ -20,11 +24,15 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-nginx-external
+  name: &app nginx-external
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-nginx-certificates
+    - name: nginx-certificates
  path: ./kubernetes/apps/networking/nginx/external
  prune: true
  sourceRef:
@@ -38,11 +46,15 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-nginx-internal
+  name: &app nginx-internal
  namespace: flux-system
 spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-nginx-certificates
+    - name: nginx-certificates
  path: ./kubernetes/apps/networking/nginx/internal
  prune: true
  sourceRef: