From 2ead688997c064b6f6dc39570c8f0091c37fc2aa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 19 Apr 2024 07:42:10 +0200 Subject: [PATCH] Fix bad merge in env.sh for OVS_CNI_IMAGE variable This also leads to envsubst replacing "operator.yaml" with - name: OVS_CNI_IMAGE value: {OVS_CNI_IMAGE:-quay.io/kubevirt/ovs-cni-plugin@sha256:7ec7e51e66e42501b79cc97eba8871b9b2ed5328fbcfce2160352e3d44fee852} This leads then to an error: + oc apply -n openshift-sriov-network-operator --validate=false -f - Error from server (BadRequest): error when creating "STDIN": Deployment in version "v1" cannot be handled as a Deployment: json: cannot unmarshal object into Go struct field EnvVar.spec.template.spec.containers.env.value of type string Fixes: c77576f336d7 ('Merge branch 'master' into sync-2024-04-09') --- hack/env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/env.sh b/hack/env.sh index a1fb3678d..97b2c50a5 100755 --- a/hack/env.sh +++ b/hack/env.sh @@ -10,7 +10,7 @@ if [ -z $SKIP_VAR_SET ]; then export SRIOV_INFINIBAND_CNI_IMAGE=${SRIOV_INFINIBAND_CNI_IMAGE:-quay.io/openshift/origin-sriov-infiniband-cni@${INFINIBAND_CNI_IMAGE_DIGEST}} # OVS_CNI_IMAGE can be explicitly set to empty value, use default only if the var is not set OVS_CNI_IMAGE_DIGEST=$(skopeo inspect docker://quay.io/kubevirt/ovs-cni-plugin | jq --raw-output '.Digest') - export OVS_CNI_IMAGE={OVS_CNI_IMAGE:-quay.io/kubevirt/ovs-cni-plugin@${OVS_CNI_IMAGE_DIGEST}} + export OVS_CNI_IMAGE=${OVS_CNI_IMAGE:-quay.io/kubevirt/ovs-cni-plugin@${OVS_CNI_IMAGE_DIGEST}} DP_IMAGE_DIGEST=$(skopeo inspect docker://quay.io/openshift/origin-sriov-network-device-plugin | jq --raw-output '.Digest') export SRIOV_DEVICE_PLUGIN_IMAGE=${SRIOV_DEVICE_PLUGIN_IMAGE:-quay.io/openshift/origin-sriov-network-device-plugin@${DP_IMAGE_DIGEST}} INJECTOR_IMAGE_DIGEST=$(skopeo inspect docker://quay.io/openshift/origin-sriov-dp-admission-controller | jq --raw-output '.Digest')