Merge pull request #511 from mgfritch/update-multus-v4.1.0

Update multus v4.1.0
rancher · Sep 4, 2024 · 5203bb8 · 5203bb8
2 parents 7597f63 + 627c9f5
commit 5203bb8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/rke2-multus/charts/Chart.yaml b/packages/rke2-multus/charts/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 4.0.2
+appVersion: 4.1.0
 dependencies:
 - condition: rke2-whereabouts.enabled
   name: rke2-whereabouts
@@ -14,4 +14,4 @@ name: rke2-multus
 sources:
 - https://github.com/intel/multus-cni
 type: application
-version: v4.0.2
+version: 4.1.0
diff --git a/packages/rke2-multus/charts/values.yaml b/packages/rke2-multus/charts/values.yaml
@@ -20,7 +20,7 @@
 
 image:
   repository: rancher/hardened-multus-cni
-  tag: v4.0.2-build20240612
+  tag: v4.1.0-build20240830
   pullPolicy: IfNotPresent
 
 #imagePullSecrets: []
@@ -122,7 +122,7 @@ tolerations:
 cniplugins:
   image:
     repository: rancher/hardened-cni-plugins
-    tag: v1.4.1-build20240430
+    tag: v1.5.1-build20240830
 
   # 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: 07
+packageVersion: 00
diff --git a/updatecli/scripts/update-multus.sh b/updatecli/scripts/update-multus.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 set -eu
 if [ -n "$MULTUS_VERSION" ]; then
-	app_version=$(echo "$MULTUS_VERSION" | grep -Eo 'v[0-9]+.[0-9]+.[0-9]+')
+	app_version=$(echo "$MULTUS_VERSION" | grep -Eo '^v*[0-9]+.[0-9]+.[0-9]+' | tr -d 'v')
 	current_multus_version=$(yq '.image.tag' packages/rke2-multus/charts/values.yaml)
-	current_app_version=$(echo "$current_multus_version" | grep -Eo 'v[0-9]+.[0-9]+.[0-9]+')
+	current_app_version=$(echo "$current_multus_version" | grep -Eo '^v*[0-9]+.[0-9]+.[0-9]+' | tr -d 'v')
 	if [ "$current_multus_version" != "$MULTUS_VERSION" ]; then
 		echo "Updating Multus chart to $MULTUS_VERSION"
 		if [ "$app_version" != "$current_app_version" ]; then
 			sed -i "s/version: .*/version: $app_version/g" packages/rke2-multus/charts/Chart.yaml
 			sed -i "s/appVersion: .*/appVersion: $app_version/g" packages/rke2-multus/charts/Chart.yaml
-			sed -i "s/  tag: $current_app_version/  tag: $app_version/g" packages/rke2-multus/charts/values.yaml
 			sed -i "s/  tag: $current_multus_version/  tag: $MULTUS_VERSION/g" packages/rke2-multus/charts/values.yaml
+			sed -i "s/  tag: $current_app_version/  tag: $app_version/g" packages/rke2-multus/charts/values.yaml
 			yq -i ".packageVersion = 00" packages/rke2-multus/package.yaml
 		else
 			sed -i "s/  tag: $current_multus_version/  tag: $MULTUS_VERSION/g" packages/rke2-multus/charts/values.yaml