Fix bad merge in env.sh for OVS_CNI_IMAGE variable

[thom311]

This also leads to a failure during deploy:

+ 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: c77576f ('Merge branch 'master' into sync-2024-04-09')

[openshift-ci]

Hi @thom311. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[zeeke]

/ok-to-test
/lgtm

@thom311 thanks for fixing this!

[zeeke]

/retest

[thom311]

New changes are detected. LGTM label has been removed.

Sorry, there was a spelling error in the commit message. Force Repushed.

[openshift-ci]

@thom311: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-openstack-nfv-hwoffload	2ead688	link	false	/test e2e-openstack-nfv-hwoffload
ci/prow/e2e-openstack-nfv	2ead688	link	false	/test e2e-openstack-nfv
ci/prow/security	2ead688	link	false	/test security

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[zeeke]

/lgtm

@bn222 @SchSeba PTAL

[bn222]

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bn222, thom311, zeeke

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [bn222]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build sriov-network-config-daemon-container-v4.17.0-202404220616.p0.g3b79f5e.assembly.stream.el9 for distgit sriov-network-config-daemon.
All builds following this will include this PR.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build sriov-network-operator-container-v4.17.0-202404220616.p0.g3b79f5e.assembly.stream.el9 for distgit sriov-network-operator.
All builds following this will include this PR.