Create per-app kustomizations

basic/apps/stackspout/dev/gitea-release.yaml

@@ -12,7 +12,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: gitea
-        namespace: stackspout
+        namespace: flux-system
   interval: 10m
   valuesFrom:
     - kind: ConfigMap

basic/apps/stackspout/dev/gitea-values-configmap.yaml

@@ -23,7 +23,7 @@ data:
       oauth:
         - name: Stackspin
           provider: 'openidConnect'
-          key: gitea
+          key: "${client_id}"
           secret: "${client_secret}"
           customAuthUrl: "https://sso.ftt.gmbh"
           #autoDiscoverUrl: 'https://gitea.example.com/.well-known/openid-configuration'

basic/apps/stackspout/do/vikunja-release.yaml

@@ -12,7 +12,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: k8s-at-home
-        namespace: stackspout
+        namespace: flux-system
   interval: 10m
   valuesFrom:
     - kind: ConfigMap

basic/clusters/production/apps-kustomization.yaml

@@ -1,13 +0,0 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
-kind: Kustomization
-metadata:
-  name: apps
-  namespace: stackspout
-spec:
-  interval: 10m
-  sourceRef:
-    kind: GitRepository
-    name: stackspout
-  path: ./basic/apps
-  prune: true
-  validation: client

basic/clusters/production/gitea-kustomization.yaml

@@ -0,0 +1,35 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: gitea
+  namespace: stackspout
+spec:
+  interval: 10m
+  timeout: 30m
+  dependsOn:
+    - name: single-sign-on
+  sourceRef:
+    kind: GitRepository
+    name: stackspout
+  path: ./basic/apps/gitea
+  prune: true
+  # TODO what does this mean?
+  #validation: client
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      kind: HelmRelease
+      name: gitea
+      namespace: stackspout
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: gitea
+      namespace: stackspout
+  postBuild:
+    substituteFrom:
+      #- kind: Secret
+      #  name: stackspin-gitea-variables
+      - kind: Secret
+        name: stackspin-gitea-oauth-variables
+      - kind: Secret
+        name: stackspin-cluster-variables

basic/clusters/production/vikunja-kustomization.yaml

@@ -0,0 +1,35 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: vikunja
+  namespace: stackspout
+spec:
+  interval: 10m
+  timeout: 30m
+  dependsOn:
+    - name: single-sign-on
+  sourceRef:
+    kind: GitRepository
+    name: stackspout
+  path: ./basic/apps/vikunja
+  prune: true
+  # TODO what does this mean?
+  #validation: client
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+      kind: HelmRelease
+      name: vikunja
+      namespace: stackspout
+    - apiVersion: apps/v1
+      kind: Deployment
+      name: vikunja
+      namespace: stackspout
+  postBuild:
+    substituteFrom:
+      #- kind: Secret
+      #  name: stackspin-vikunja-variables
+      - kind: Secret
+        name: stackspin-vikunja-oauth-variables
+      - kind: Secret
+        name: stackspin-cluster-variables

basic/infrastructure/sources/gitea.yaml

@@ -2,7 +2,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: gitea
-  namespace: stackspout
+  namespace: flux-system
 spec:
   interval: 10m
   url: https://dl.gitea.io/charts/

basic/infrastructure/sources/k8s-at-home.yaml

@@ -1,8 +1,9 @@
+# For Vikunja
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
   name: k8s-at-home
-  namespace: stackspout
+  namespace: flux-system
 spec:
   interval: 10m
   url: https://k8s-at-home.com/charts/