fix(cilium): specify image for Renovate changelogs

JJGadgets · Mar 13, 2024 · 7c3b5a1 · 7c3b5a1
1 parent 695c1da
commit 7c3b5a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.renovate/groups.json5 b/.renovate/groups.json5
@@ -36,6 +36,16 @@
       "matchFileNames": ["kube/deploy/apps/**"],
       "labels": ["kube-deploy-apps"]
     },
+    {
+      "description": "Cilium Group",
+      "groupName": "Cilium",
+      "matchPackagePatterns": ["cilium"],
+      "versioning": "semver",
+      "separateMinorPatch": true,
+      "group": {
+        "commitMessageTopic": "{{{groupName}}} group"
+      }
+    },
     // FluxCD
     {
       "description": "Flux Group",

diff --git a/..._networking/cilium/app/kustomization.yaml → ...king/cilium/app/config/kustomization.yaml b/..._networking/cilium/app/kustomization.yaml → ...king/cilium/app/config/kustomization.yaml
@@ -2,14 +2,12 @@
 # this Kustomization is the actual one used by Flux
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - hr.yaml
 configMapGenerator:
   - name: "cilium-helm-values"
     namespace: kube-system
     files:
-      - biohazard.yaml=config/biohazard/helm-values.yaml
-      - hercules.yaml=config/hercules/helm-values.yaml
-      - nuclear.yaml=config/nuclear/helm-values.yaml
+      - biohazard.yaml=biohazard/helm-values.yaml
+      - hercules.yaml=hercules/helm-values.yaml
+      - nuclear.yaml=nuclear/helm-values.yaml
 configurations:
   - kustomizeconfig.yaml
diff --git a/...etworking/cilium/app/kustomizeconfig.yaml → ...ng/cilium/app/config/kustomizeconfig.yaml b/...etworking/cilium/app/kustomizeconfig.yaml → ...ng/cilium/app/config/kustomizeconfig.yaml
diff --git a/kube/deploy/core/_networking/cilium/app/hr.yaml b/kube/deploy/core/_networking/cilium/app/hr.yaml
@@ -23,9 +23,12 @@ spec:
   valuesFrom:
     - kind: "ConfigMap"
       name: "cilium-helm-values"
-      valuesKey: "${CLUSTER_NAME}.yaml"
+      valuesKey: "${CLUSTER_NAME:=biohazard}.yaml"
       optional: false
   values:
+    image: # for Renovate changelog
+      repository: "quay.io/cilium/cilium"
+      tag: "v1.15.1@sha256:351d6685dc6f6ffbcd5451043167cfa8842c6decf80d8c8e426a417c73fb56d4"
     ## NOTE: Cilium Agent API rate limit configuration
     ### upon reboot/untaint/uncordon, burst(s) of pod creations causes Cilium to 429 rate limit pods from getting their network configuration
     ### current config stolen from https://github.com/cilium/cilium/issues/24361#issuecomment-1564825275