fix: Add GitRepository and Kustomization resources for FluxCD synchronization

n3rdc4ptn · n3rdc4ptn · commit 5e297dbe56a1 · 2025-09-01T16:16:32.000+02:00
- Created gotk-sync.yaml to define a GitRepository for managing environments.
- Added kustomization.yaml to include gotk-components and gotk-sync resources.
- Updated openmcp overlay kustomization to use dynamic resources path from values.
diff --git a/docs/Templating.md b/docs/Templating.md
@@ -34,14 +34,15 @@ git:
 When rendering the `overlays` files, the following values are used:
 
 ```yaml
-targetPath: "" # The path were the fluxcd resources are lying relative to the overlays
+fluxCDResourcesPath: "" # The path were the fluxcd resources are lying relative to the overlays
 gitRepoEnvBranch: "" # The branch for this environment to look at
 envPathFluxSystem: "" # The path were the env overlays are located at from the root of the git repo
 ```
 
 ### OpenMCP
 
 ```yaml
+openMCPResourcesPath: "" # The path were the fluxcd resources are lying relative to the overlays
 openMCPOperator:
     image: "" # the image of the openmcp operator to use
     tag: "" # the tag of the image of the openmcp operator you want to use for deployment
diff --git a/templates/fluxcd/resources/kustomization.yaml b/templates/fluxcd/resources/kustomization.yaml
diff --git a/templates/fluxcd/templates/overlays/gotk-sync-gitrepo.yaml b/templates/fluxcd/templates/overlays/gotk-sync-gitrepo.yaml
diff --git a/templates/fluxcd/templates/overlays/gotk-sync-kustomization.yaml b/templates/fluxcd/templates/overlays/gotk-sync-kustomization.yaml
diff --git a/templates/fluxcd/templates/overlays/kustomization.yaml b/templates/fluxcd/templates/overlays/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - {{ .Values.targetPath }}
+  - {{ .Values.fluxCDResourcesPath }}
 patches:
 - path: gotk-sync-gitrepo.yaml
 - path: gotk-sync-kustomization.yaml
diff --git a/templates/fluxcd/templates/resources/gotk-components.yaml b/templates/fluxcd/templates/resources/gotk-components.yaml
@@ -5344,6 +5344,8 @@ spec:
           name: data
         - mountPath: /tmp
           name: tmp
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
@@ -7240,6 +7242,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: temp
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
@@ -11042,6 +11046,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: temp
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       priorityClassName: system-cluster-critical
@@ -13021,6 +13027,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: temp
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       securityContext:
@@ -14131,6 +14139,8 @@ spec:
           name: temp
         - mountPath: /data
           name: data
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       securityContext:
@@ -14964,6 +14974,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: temp
+      imagePullSecrets:
+      - name: \{\{ .Values.imagePullSecret }}
       nodeSelector:
         kubernetes.io/os: linux
       securityContext:
diff --git a/templates/fluxcd/templates/resources/gotk-sync.yaml b/templates/fluxcd/templates/resources/gotk-sync.yaml
@@ -24,3 +24,19 @@ spec:
   sourceRef:
     kind: GitRepository
     name: environments
+
+
+
+##
+GITREPO/
+  envs/
+    dev/ envName
+      flux-system/
+        gotk-sync-gitrepo.yaml
+        gotk-sync-kustomization.yaml (envPathFluxSystem zeigt auf parent /envs/dev/flux-system)
+        kustomization.yaml (targetpath zeigt auf ../../../resources/flux-system)
+  resources/
+    flux-system/ TARGETPATH
+      gotk-components.yaml
+      gotk-sync.yaml
+      kustomization.yaml
diff --git a/templates/fluxcd/templates/resources/kustomization.yaml b/templates/fluxcd/templates/resources/kustomization.yaml
@@ -0,0 +1,8 @@
+---
+resources:
+  - gotk-components.yaml
+  - gotk-sync.yaml
+images:
+  - name: ghcr.io/fluxcd/source-controller
+    newName: {{ .Values.sourceControllerImage }}
+  - name: ghcr.io/fluxcd/notification-controller
diff --git a/templates/openmcp/templates/overlays/kustomization.yaml b/templates/openmcp/templates/overlays/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../resources
+  - {{ .Values.openMCPResourcesPath }}
 images:
   - name: <openmcp/openmcp-operator>
     newName: {{.Values.openmcpOperator.image }}
