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: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: csi-driver-nfs
-  namespace: kube-system
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kube-system
 resources:
  - ./helmrelease.yaml
  - ./storageclass.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-csi-driver-nfs
+  name: &app csi-driver-nfs
  namespace: flux-system
 spec:
+  targetNamespace: kube-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/kube-system/csi-driver-nfs/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: discord-template-notifier
-  namespace: default
 spec:
  interval: 15m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
 resources:
  - ./secret.sops.yaml
  - ./helmrelease.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: discord-template-notifier-secret
-  namespace: default
 type: Opaque
 stringData:
  config.toml: |-
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-discord-template-notifier
+  name: &app discord-template-notifier
  namespace: flux-system
 spec:
+  targetNamespace: default
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/default/discord-template-notifier/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: grafana
-  namespace: monitoring
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
 resources:
  - ./secret.sops.yaml
  - ./helmrelease.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: grafana-admin-secret
-  namespace: monitoring
 stringData:
  admin-user: admin
  admin-password: "{{ grafana.password }}"
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-grafana
+  name: &app grafana
  namespace: flux-system
 spec:
+  targetNamespace: monitoring
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/monitoring/grafana/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: hajimari
-  namespace: default
 spec:
  interval: 30m
  chart:
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
 resources:
  - ./helmrelease.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-hajimari
+  name: &app hajimari
  namespace: flux-system
 spec:
+  targetNamespace: default
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/default/hajimari/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: kube-prometheus-stack
-  namespace: monitoring
 spec:
  interval: 30m
  timeout: 15m
@@ -4,7 +4,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: kube-prometheus-stack-values
-  namespace: monitoring
 data:
  values.yaml: |
    crds:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
 resources:
  - ./helmvalues.yaml
  - ./helmrelease.yaml
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-kube-prometheus-stack
+  name: &app kube-prometheus-stack
  namespace: flux-system
 spec:
+  targetNamespace: monitoring
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/monitoring/kube-prometheus-stack/app
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: kubernetes-dashboard
-  namespace: monitoring
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: monitoring
 resources:
  - ./rbac.yaml
  - ./helmrelease.yaml
@@ -5,7 +5,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: kubernetes-dashboard
-  namespace: monitoring
  labels:
    app.kubernetes.io/managed-by: Helm
  annotations:
@@ -19,7 +18,6 @@ kind: Secret
 type: kubernetes.io/service-account-token
 metadata:
  name: kubernetes-dashboard
-  namespace: monitoring
  labels:
    app.kubernetes.io/managed-by: Helm
  annotations:
@@ -2,12 +2,16 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-kubernetes-dashboard
+  name: &app kubernetes-dashboard
  namespace: flux-system
 spec:
+  targetNamespace: monitoring
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-cert-manager
-    - name: cluster-apps-metrics-server
+    - name: cert-manager
+    - name: metrics-server
  path: ./kubernetes/apps/monitoring/kubernetes-dashboard/app
  prune: true
  sourceRef:
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-system-upgrade-controller
+  name: &app system-upgrade-controller
  namespace: flux-system
 spec:
+  targetNamespace: system-upgrade
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/system-upgrade/system-upgrade-controller/app
  prune: true
  sourceRef:
@@ -18,11 +22,15 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-system-upgrade-controller-plans
+  name: &app system-upgrade-controller-plans
  namespace: flux-system
 spec:
+  targetNamespace: system-upgrade
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  dependsOn:
-    - name: cluster-apps-system-upgrade-controller
+    - name: system-upgrade-controller
  path: ./kubernetes/apps/system-upgrade/system-upgrade-controller/plans
  prune: true
  sourceRef:
@@ -3,7 +3,6 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
  name: agent
-  namespace: system-upgrade
 spec:
  # renovate: datasource=github-releases depName=k3s-io/k3s
  version: "v1.28.3+k3s1"
@@ -3,7 +3,6 @@ apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
  name: server
-  namespace: system-upgrade
 spec:
  # renovate: datasource=github-releases depName=k3s-io/k3s
  version: "v1.28.3+k3s1"
@@ -3,7 +3,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
  name: weave-gitops
-  namespace: flux-system
 spec:
  interval: 30m
  chart:
@@ -1,7 +1,6 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: flux-system
 resources:
  - ./secret.sops.yaml
  - ./helmrelease.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: cluster-user-auth
-  namespace: flux-system
 type: Opaque
 stringData:
  username: admin
@@ -2,9 +2,13 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: cluster-apps-weave-gitops
+  name: &app weave-gitops
  namespace: flux-system
 spec:
+  targetNamespace: flux-system
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
  path: ./kubernetes/apps/flux-system/weave-gitops/app
  prune: true
  sourceRef: