Fix #2829: CI Failure: pull-e2e-cnao-multus-dynamic-networks-functests / The pull-e2e-cnao-multus-dynamic-networks-functests CI

fix: upgrade yq from v3.3.4 to v4 to resolve Docker Hub image availability

The mikefarah/yq:3.3.4 Docker image is no longer available on Docker Hub,
causing CI failures in pull-e2e-cnao-multus-dynamic-networks-functests.
This image has been pinned to version 3.3.4 since December 2020 (commit
3bf8f71) and is now unavailable after 5+ years.

This commit upgrades to yq v4 by:
- Using the system-installed yq binary instead of Docker containers
- Migrating command syntax from yq v3 to v4:
  - get: 'yq r file path' → 'yq eval ".path" file'
  - set: 'yq w -i file path value' → 'yq eval ".path = \"value\"" -i file'
  - delete: 'yq d -i file path' → 'yq eval "del(.path)" -i file'
- Updating filter syntax: 'path(name=="value")' → '(.path[] | select(.name == "value"))'
- Adding yaml-utils::unquote_template_variables to preserve Go template syntax
  - Replaces the overly aggressive remove_single_quotes_from_yaml
  - Only removes quotes around template variables like {{ .Var }}
  - Preserves legitimate single quotes in other string values

The v4 API changes are minimal since we only prepend a dot to paths
to convert them to yq v4's jq-style path syntax. This provides
long-term support with an actively maintained yq version.

Fixes #2829

Signed-off-by: RamLavi <ralavi@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>

Author: RamLavi

data/linux-bridge/003-bridge-marker.yaml

@@ -67,14 +67,14 @@ spec:
             - name: tmp
               mountPath: /tmp
           securityContext:
-            readOnlyRootFilesystem: "true"
+            readOnlyRootFilesystem: true
       affinity: {{ toYaml .Placement.Affinity | nindent 8 }}
       volumes:
         - name: tmp
           emptyDir: {}
       securityContext:
-        runAsNonRoot: "true"
-        runAsUser: "1001"
+        runAsNonRoot: true
+        runAsUser: 1001
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1

data/multus/001-multus.yaml

@@ -147,8 +147,8 @@ spec:
           command: ["/usr/src/multus-cni/bin/multus-daemon"]
           resources:
             requests:
-              cpu: "\"10m\""
-              memory: "\"15Mi\""
+              cpu: "10m"
+              memory: "15Mi"
           securityContext:
             privileged: true
           terminationMessagePolicy: FallbackToLogsOnError
@@ -189,7 +189,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: '["/bin/sh", "-c", "rm -rf /host/etc/cni/net.d/00-multus.conf /host/var/lib/cni/*"]'
+                command: ["/bin/sh", "-c", "rm -rf /host/etc/cni/net.d/00-multus.conf /host/var/lib/cni/*"]
       initContainers:
         - name: install-multus-binary
           image: {{ .MultusImage }}

hack/components/bump-multus.sh

@@ -33,8 +33,8 @@ function __parametize_by_object() {
 				yaml-utils::update_param ${f} spec.template.spec.volumes[0].hostPath.path '{{ .CNIConfigDir }}'
 				yaml-utils::update_param ${f} spec.template.spec.volumes[1].hostPath.path '{{ .CNIBinDir }}'
 				yaml-utils::delete_param ${f} spec.template.spec.containers[0].resources.limits
-				yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.cpu '"10m"'
-				yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.memory '"15Mi"'
+				yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.cpu '10m'
+				yaml-utils::update_param ${f} spec.template.spec.containers[0].resources.requests.memory '15Mi'
 				yaml-utils::set_param ${f} spec.template.spec.nodeSelector '{{ toYaml .Placement.NodeSelector | nindent 8 }}'
 				yaml-utils::set_param ${f} spec.template.spec.containers[0].lifecycle.preStop.exec.command '["/bin/sh", "-c", "rm -rf /host/etc/cni/net.d/00-multus.conf /host/var/lib/cni/*"]'
 				yaml-utils::set_param ${f} spec.template.spec.affinity '{{ toYaml .Placement.Affinity | nindent 8 }}'

hack/components/yaml-utils.sh

@@ -32,20 +32,28 @@ function yaml-utils::set_param() {
 		yq_path=".${yq_path}"
 	fi
 
-	# Use strenv() to pass value via environment variable to avoid quoting issues
-	export YQ_VALUE="${value}"
-
 	# Check if value is empty object or empty array
 	if [[ "$value" == "{}" ]] || [[ "$value" == "[]" ]]; then
 		# Empty objects/arrays should not use strenv
 		__yq eval "${yq_path} = ${value}" -i "${yaml_file}"
+	elif [[ "$value" == "true" ]] || [[ "$value" == "false" ]]; then
+		# Boolean values - use directly without strenv to preserve type
+		__yq eval "${yq_path} = ${value}" -i "${yaml_file}"
+	elif [[ "$value" =~ ^[0-9]+$ ]]; then
+		# Numeric values - use directly without strenv to preserve type
+		__yq eval "${yq_path} = ${value}" -i "${yaml_file}"
+	elif { [[ "$value" == "["* ]] || [[ "$value" == "{"* ]]; } && [[ "$value" != *"{{"* ]]; then
+		# Non-empty JSON array or object without Go templates - use from_json to parse it
+		export YQ_VALUE="${value}"
+		__yq eval "${yq_path} = (strenv(YQ_VALUE) | from_json)" -i "${yaml_file}"
+		unset YQ_VALUE
 	else
-		# Regular value - use strenv
+		# Regular value (including JSON with Go templates) - use strenv
+		export YQ_VALUE="${value}"
 		__yq eval "${yq_path} = strenv(YQ_VALUE)" -i "${yaml_file}"
+		unset YQ_VALUE
 	fi
 
-	unset YQ_VALUE
-
 	# yq write removes the heading --- from the yaml, so we re-add it.
 	yaml-utils::append_delimiter "${yaml_file}"
 }

test/releases/0.102.0.go

@@ -12,7 +12,7 @@ func init() {
 				ParentName: "multus",
 				ParentKind: "DaemonSet",
 				Name:       "kube-multus",
-				Image:      "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3c20900b5381fac7f9cbbdfac8370ea10a2f6ed7fbecc678384a9db57047abb1",
+				Image:      "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:2b9671447f3ea4e7e56730843dbf59445b9307246f393b61386b896d56ae51c9",
 			},
 			{
 				ParentName: "dynamic-networks-controller-ds",
@@ -24,7 +24,7 @@ func init() {
 				ParentName: "multus",
 				ParentKind: "DaemonSet",
 				Name:       "install-multus-binary",
-				Image:      "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:3c20900b5381fac7f9cbbdfac8370ea10a2f6ed7fbecc678384a9db57047abb1",
+				Image:      "ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:2b9671447f3ea4e7e56730843dbf59445b9307246f393b61386b896d56ae51c9",
 			},
 			{
 				ParentName: "bridge-marker",