Backport image bump to charts with old hardened-cni-plugins (#548)

* Revert "Bump cni plugins version" This reverts commit e26e77b. * update package versions Signed-off-by: GitHub <[email protected]> --------- Signed-off-by: GitHub <[email protected]>
rancher · Oct 23, 2024 · 8c27a56 · 8c27a56
1 parent ab72355
commit 8c27a56
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/packages/rke2-cilium/generated-changes/patch/values.yaml.patch b/packages/rke2-cilium/generated-changes/patch/values.yaml.patch
@@ -200,7 +200,7 @@
 +portmapPlugin:
 +  image:
 +    repository: "rancher/hardened-cni-plugins"
-+    tag: "v1.6.0-build20241022"
++    tag: "v1.5.1-build20241009"
 +
 +global:
 +  systemDefaultRegistry: ""
diff --git a/packages/rke2-cilium/package.yaml b/packages/rke2-cilium/package.yaml
@@ -1,2 +1,2 @@
 url: https://helm.cilium.io/cilium-1.16.3.tgz
-packageVersion: 01
+packageVersion: 02
diff --git a/packages/rke2-flannel/generated-changes/patch/values.yaml.patch b/packages/rke2-flannel/generated-changes/patch/values.yaml.patch
@@ -22,7 +22,7 @@
 -    repository: docker.io/flannel/flannel-cni-plugin
 -    tag: v1.5.1-flannel2
 +    repository: rancher/hardened-cni-plugins
-+    tag: v1.6.0-build20241022
++    tag: v1.5.1-build20241009
    # flannel command arguments
    enableNFTables: false
    args:

diff --git a/packages/rke2-flannel/package.yaml b/packages/rke2-flannel/package.yaml
@@ -1,2 +1,2 @@
 url: https://github.com/flannel-io/flannel/releases/download/v0.25.7/flannel.tgz
-packageVersion: 03
+packageVersion: 04
diff --git a/packages/rke2-multus/charts/values.yaml b/packages/rke2-multus/charts/values.yaml
@@ -122,7 +122,7 @@ tolerations:
 cniplugins:
   image:
     repository: rancher/hardened-cni-plugins
-    tag: v1.6.0-build20241022
+    tag: v1.5.1-build20241009
 
   # skipcnis is a comma separated list of cni binaries to skip from
   # installing.

diff --git a/packages/rke2-multus/package.yaml b/packages/rke2-multus/package.yaml
@@ -1,3 +1,3 @@
 url: local
 workingDir: charts
-packageVersion: 04
+packageVersion: 05
diff --git a/updatecli/scripts/cilium-values.yaml.patch.template b/updatecli/scripts/cilium-values.yaml.patch.template
@@ -200,7 +200,7 @@
 +portmapPlugin:
 +  image:
 +    repository: "rancher/hardened-cni-plugins"
-+    tag: "v1.6.0-build20241022"
++    tag: "v1.5.1-build20241009"
 +
 +global:
 +  systemDefaultRegistry: ""