Merge pull request #683 from shiftstack/optional-OCS_CNI_IMAGE

Make OVS_CNI_IMAGE truly optional
k8snetworkplumbingwg · Apr 18, 2024 · 4774203 · 4774203
2 parents 359bb79 + aa1ba65
commit 4774203
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hack/env.sh b/hack/env.sh
@@ -9,10 +9,10 @@ if [ -z $SKIP_VAR_SET ]; then
         export SRIOV_NETWORK_WEBHOOK_IMAGE=${SRIOV_NETWORK_WEBHOOK_IMAGE:-ghcr.io/k8snetworkplumbingwg/sriov-network-operator-webhook}
         export SRIOV_NETWORK_OPERATOR_IMAGE=${SRIOV_NETWORK_OPERATOR_IMAGE:-ghcr.io/k8snetworkplumbingwg/sriov-network-operator}
 else
+        # ensure that OVS_CNI_IMAGE is set, empty string is a valid value
+        OVS_CNI_IMAGE=${OVS_CNI_IMAGE:-}
         [ -z $SRIOV_CNI_IMAGE ] && echo "SRIOV_CNI_IMAGE is empty but SKIP_VAR_SET is set" && exit 1
         [ -z $SRIOV_INFINIBAND_CNI_IMAGE ] && echo "SRIOV_INFINIBAND_CNI_IMAGE is empty but SKIP_VAR_SET is set" && exit 1
-        # check that OVS_CNI_IMAGE is set to any value, empty string is a valid value
-        [ -z ${OVS_CNI_IMAGE+set} ] && echo "OVS_CNI_IMAGE is empty but SKIP_VAR_SET is set" && exit 1
         [ -z $SRIOV_DEVICE_PLUGIN_IMAGE ] && echo "SRIOV_DEVICE_PLUGIN_IMAGE is empty but SKIP_VAR_SET is set" && exit 1
         [ -z $NETWORK_RESOURCES_INJECTOR_IMAGE ] && echo "NETWORK_RESOURCES_INJECTOR_IMAGE is empty but SKIP_VAR_SET is set" && exit 1
         [ -z $SRIOV_NETWORK_CONFIG_DAEMON_IMAGE ] && echo "SRIOV_NETWORK_CONFIG_DAEMON_IMAGE is empty but SKIP_VAR_SET is set" && exit 1