first commit to move everything to its own kustomization, also removes...

first commit to move everything to its own kustomization, also removes deprecated value from kustomizations

.gitlab-ci.yml

@@ -82,9 +82,9 @@ include:
     - changes:
         - flux2/apps/monitoring/*.yaml
         - flux2/cluster/optional/monitoring/*.yaml
-        - flux2/infrastructure/sources/grafana.yaml
-        - flux2/infrastructure/sources/wikimedia.yaml
-        - flux2/infrastructure/sources/prometheus-community.yaml
+        - flux2/core/base/sources/grafana.yaml
+        - flux2/core/base/sources/wikimedia.yaml
+        - flux2/core/base/sources/prometheus-community.yaml
         - flux2/config/monitoring/*.yaml
         - install/install-app.sh
         - install/flux-version-check.sh
@@ -114,7 +114,7 @@ include:
     - changes:
         - flux2/apps/$RESOURCE/*.yaml
         - flux2/cluster/optional/$RESOURCE/*.yaml
-        - flux2/infrastructure/sources/nextcloud.yaml
+        - flux2/core/base/sources/nextcloud.yaml
         - install/install-app.sh
         - install/flux-version-check.sh
         - test/taiko/*
@@ -146,7 +146,7 @@ include:
     - changes:
         - flux2/apps/$RESOURCE/*.yaml
         - flux2/cluster/optional/$RESOURCE/*.yaml
-        - flux2/infrastructure/sources/wekan.yaml
+        - flux2/core/base/sources/wekan.yaml
         - install/install-app.sh
         - install/flux-version-check.sh
         - test/taiko/*
@@ -159,7 +159,7 @@ include:
     - changes:
         - flux2/apps/$RESOURCE/*.yaml
         - flux2/cluster/optional/$RESOURCE/*.yaml
-        - flux2/infrastructure/sources/wordpress.yaml
+        - flux2/core/base/sources/wordpress.yaml
         - install/install-app.sh
         - install/flux-version-check.sh
         - test/taiko/*
@@ -172,7 +172,7 @@ include:
     - changes:
         - flux2/apps/$RESOURCE/*.yaml
         - flux2/cluster/optional/$RESOURCE/*.yaml
-        - flux2/infrastructure/sources/zulip.yaml
+        - flux2/core/base/sources/zulip.yaml
         - install/install-app.sh
         - install/flux-version-check.sh
         - test/taiko/*
@@ -379,15 +379,57 @@ setup-stackspin:
     - .general_rules
   interruptible: true
 
-core-kustomizations-ready:
+cert-manager-kustomizations-ready:
   variables:
-    RESOURCE: "core"
+    RESOURCE: "cert-manager"
   extends:
     - .kustomization-ready
 
-infrastructure-kustomizations-ready:
+dashboard-kustomizations-ready:
   variables:
-    RESOURCE: "infrastructure"
+    RESOURCE: "dashboard"
+  extends:
+    - .kustomization-ready
+
+letsencrypt-issuer-kustomizations-ready:
+  variables:
+    RESOURCE: "letsencrypt-issuer"
+  extends:
+    - .kustomization-ready
+
+local-path-provisioner-kustomizations-ready:
+  variables:
+    RESOURCE: "local-path-provisioner"
+  extends:
+    - .kustomization-ready
+
+metallb-kustomizations-ready:
+  variables:
+    RESOURCE: "metallb"
+  extends:
+    - .kustomization-ready
+
+namespaces-kustomizations-ready:
+  variables:
+    RESOURCE: "namespaces"
+  extends:
+    - .kustomization-ready
+
+nginx-kustomizations-ready:
+  variables:
+    RESOURCE: "nginx"
+  extends:
+    - .kustomization-ready
+
+single-sign-on-kustomizations-ready:
+  variables:
+    RESOURCE: "single-sign-on"
+  extends:
+    - .kustomization-ready
+
+sources-kustomizations-ready:
+  variables:
+    RESOURCE: "sources"
   extends:
     - .kustomization-ready
 
@@ -547,7 +589,7 @@ single-sign-on-cert:
   variables:
     RESOURCE: "single-sign-on"
   needs:
-    - job: core-kustomizations-ready
+    - job: single-sign-on-kustomizations-ready
     - job: setup-stackspin
   extends:
     - .apps-cert
@@ -557,7 +599,7 @@ dashboard-cert:
   variables:
     RESOURCE: "dashboard"
   needs:
-    - job: core-kustomizations-ready
+    - job: dashboard-kustomizations-ready
     - job: setup-stackspin
   extends:
     - .apps-cert
@@ -654,7 +696,7 @@ dashboard-taiko:
     RESOURCE: "dashboard"
   needs:
     - job: setup-stackspin
-    - job: core-kustomizations-ready
+    - job: dashboard-kustomizations-ready
   extends:
     - .taiko
     - .general_rules

flux2/cluster/base/cert-manager.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: cert-manager
+  namespace: flux-system
+spec:
+  interval: 1h
+  dependsOn:
+    - namespaces
+    - metallb
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/cert-manager
+  prune: true
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+      kind: HelmRelease
+      name: cert-manager
+      namespace: cert-manager
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: cert-manager
+      namespace: cert-manager

flux2/cluster/base/dashboard.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: dashboard
+  namespace: flux-system
+spec:
+  dependsOn:
+    - name: single-sign-on
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/dashboard
+  prune: true
+  wait: true
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: stackspin-dashboard-variables
+      - kind: Secret
+        name: stackspin-oauth-variables
+      - kind: Secret
+        name: stackspin-cluster-variables
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+      kind: HelmRelease
+      name: dashboard
+      namespace: stackspin
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: dashboard
+      namespace: stackspin

flux2/cluster/base/letsencrypt-issuer.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: letsencrypt-issuer
+  namespace: flux-system
+spec:
+  dependsOn:
+    - name: cert-manager
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/letsencrypt-issuer
+  prune: true
+  wait: true
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: stackspin-cluster-variables

flux2/cluster/base/infrastructure.yaml → flux2/cluster/base/local-path-provisioner.yaml

@@ -2,29 +2,21 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
-  name: infrastructure
+  name: local-path-provisioner
   namespace: flux-system
 spec:
   interval: 1h
+  timeout: 20m
   sourceRef:
     kind: GitRepository
     name: stackspin
-  path: ./flux2/infrastructure
+  path: ./flux2/core/base/local-path-provisioner
   prune: true
-  validation: client
   healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
-      kind: HelmRelease
-      name: cert-manager
-      namespace: cert-manager
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease
       name: local-path-provisioner
       namespace: kube-system
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: cert-manager
-      namespace: cert-manager
     - apiVersion: apps/v1
       kind: Deployment
       name: local-path-provisioner

flux2/cluster/base/metallb.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: metallb
+  namespace: flux-system
+spec:
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/metallb
+  prune: true
+  wait: true

flux2/cluster/base/namespaces.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: namespaces
+  namespace: flux-system
+spec:
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/namespaces
+  prune: true
+  wait: true

flux2/cluster/base/nginx.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: nginx
+  namespace: flux-system
+spec:
+  dependsOn:
+    - name: metallb
+    - name: sources
+    - name: namespaces
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/nginx
+  prune: true
+  postBuild:
+    substituteFrom:
+      - kind: Secret
+        name: stackspin-cluster-variables
+  wait: true

flux2/cluster/base/core.yaml → flux2/cluster/base/single-sign-on.yaml

@@ -2,22 +2,22 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
-  name: core
+  name: single-sign-on
   namespace: flux-system
 spec:
   dependsOn:
-    - name: infrastructure
+    - name: nginx
+    - name: letsencrypt-issuer
+    - name: local-path-provisioner
   interval: 1h
+  timeout: 20m
   sourceRef:
     kind: GitRepository
     name: stackspin
-  path: ./flux2/core
+  path: ./flux2/core/base/single-sign-on
   prune: true
-  validation: client
   postBuild:
     substituteFrom:
-      - kind: Secret
-        name: stackspin-dashboard-variables
       - kind: Secret
         name: stackspin-single-sign-on-variables
       - kind: Secret
@@ -25,22 +25,10 @@ spec:
       - kind: Secret
         name: stackspin-cluster-variables
   healthChecks:
-    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
-      kind: HelmRelease
-      name: metallb
-      namespace: kube-system
-    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
-      kind: HelmRelease
-      name: nginx
-      namespace: stackspin
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease
       name: single-sign-on
       namespace: stackspin
-    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
-      kind: HelmRelease
-      name: dashboard
-      namespace: stackspin
     - apiVersion: apps/v1
       kind: Deployment
       name: single-sign-on-userbackend
@@ -53,7 +41,3 @@ spec:
       kind: Deployment
       name: single-sign-on-login
       namespace: stackspin
-    - apiVersion: apps/v1
-      kind: Deployment
-      name: dashboard
-      namespace: stackspin

flux2/cluster/base/sources.yaml

+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: sources
+  namespace: flux-system
+spec:
+  interval: 1h
+  timeout: 20m
+  sourceRef:
+    kind: GitRepository
+    name: stackspin
+  path: ./flux2/core/base/sources
+  prune: true
+  wait: true

flux2/cluster/optional/monitoring/monitoring-config.yaml

@@ -13,4 +13,3 @@ spec:
     name: stackspin
   path: ./flux2/config/monitoring
   prune: true
-  validation: client

flux2/cluster/optional/monitoring/monitoring.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/monitoring
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/nextcloud/nextcloud.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/nextcloud
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/rocketchat/rocketchat.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/rocketchat
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/velero/velero.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/velero
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/wekan/wekan.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/wekan
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/wordpress/wordpress.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/wordpress
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease

flux2/cluster/optional/zulip/zulip.yaml

@@ -7,14 +7,20 @@ metadata:
 spec:
   interval: 1h
   dependsOn:
-    - name: core
-    - name: infrastructure
+    - cert-manager
+    - dashboard
+    - letsencrypt-issuer
+    - local-path-provisioner
+    - metallb
+    - namespaces
+    - nginx
+    - single-sign-on
+    - sources
   sourceRef:
     kind: GitRepository
     name: stackspin
   path: ./flux2/apps/zulip
   prune: true
-  validation: client
   healthChecks:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease