feat: update the dir structure

mesosphere · Jan 29, 2025 · cd205c5 · cd205c5
1 parent 9ea137f
commit cd205c5
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 39 deletions.
diff --git a/services/traefik/34.1.0/crds/crds.yaml b/services/traefik/34.1.0/crds/crds.yaml
@@ -13,8 +13,8 @@ spec:
         kind: HelmRepository
         name: helm.traefik.io-traefik
         namespace: kommander-flux
-  valuesFrom:
-    - kind: ConfigMap
-      name: traefik-crd-1.2.0-d2iq-defaults
+  # valuesFrom:
+  #   - kind: ConfigMap
+  #     name: traefik-crd-1.2.0-d2iq-defaults
   values:
     - ./list-images-values.yaml 
diff --git a/services/traefik/34.1.0/crds/list-images-values.yaml b/services/traefik/34.1.0/crds/list-images-values.yaml
@@ -1,4 +1,4 @@
-valuesFrom:
-  - kind: ConfigMap
-    name: traefik-crd-1.2.0-d2iq-defaults
-    namespace: ${releaseNamespace} 
+gatewayAPI: false
+traefik: true
+hub: false
+deleteOnUninstall: false
diff --git a/services/traefik/34.1.0/defaults/cm.yaml → ...ices/traefik/34.1.0/defaults/traefik.yaml b/services/traefik/34.1.0/defaults/cm.yaml → ...ices/traefik/34.1.0/defaults/traefik.yaml
diff --git a/services/traefik/34.1.0/traefik.yaml b/services/traefik/34.1.0/traefik.yaml
@@ -1,35 +1,3 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  name: traefik
-  namespace: ${releaseNamespace}
-spec:
-  chart:
-    spec:
-      chart: traefik
-      sourceRef:
-        kind: HelmRepository
-        name: helm.traefik.io-traefik
-        namespace: kommander-flux
-      version: 34.1.0
-  interval: 15s
-  install:
-    crds: CreateReplace
-    remediation:
-      retries: 30
-  upgrade:
-    crds: CreateReplace
-    remediation:
-      retries: 30
-  timeout: 5m0s
-  releaseName: kommander-traefik
-  valuesFrom:
-    - kind: ConfigMap
-      name: traefik-34.1.0-d2iq-defaults
-    - kind: ConfigMap
-      name: traefik-overrides
-      optional: true
----
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/services/traefik/34.1.0/traefik/kustomization.yaml b/services/traefik/34.1.0/traefik/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - traefik.yaml
diff --git a/services/traefik/34.1.0/traefik/traefik.yaml b/services/traefik/34.1.0/traefik/traefik.yaml
@@ -0,0 +1,31 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: traefik
+  namespace: ${releaseNamespace}
+spec:
+  chart:
+    spec:
+      chart: traefik
+      sourceRef:
+        kind: HelmRepository
+        name: helm.traefik.io-traefik
+        namespace: kommander-flux
+      version: 34.1.0
+  interval: 15s
+  install:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+  upgrade:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+  timeout: 5m0s
+  releaseName: kommander-traefik
+  valuesFrom:
+    - kind: ConfigMap
+      name: traefik-34.1.0-d2iq-defaults
+    - kind: ConfigMap
+      name: traefik-overrides
+      optional: true