[OSPRH-11235] Do not fail when clouds CM exists

[lpiwowar]

The Ensure[Horizon|Tobiko]CloudsYAML function was failing when the CM containing the modified clouds.yaml already existed:

Object openstack/horizontest-clouds-config is already owned
by another HorizonTest controller horizontest-tests

This patch does two things:

• Ensures that we do not create the modified clouds.yaml when it already exists.

• Removes the duplicate implementation of of the Ensure*CloudsYAML function and replaces it with EnsureCloudsConfigMapExists.

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[lpiwowar]

/test precommit-check

[lpiwowar]

Thank you @kstrenkova! 🙏

[softwarefactory-project-zuul]

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/71c97e8ffb6b455bb3c9a2ba24d20a9f

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 07m 03s
❌ podified-multinode-edpm-deployment-crc-test-operator FAILURE in 2h 52m 02s

[lpiwowar]

recheck

[kstrenkova]

I have tested this change and it seems to be working. Lgtm.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kstrenkova, lpiwowar

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 [lpiwowar]

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

[kstrenkova]

/lgtm

[evallesp]

Some questions but in general lgtm.

[evallesp]

(blocking) question: I guess this one is not required right? Related as well with @kstrenkova
comment.
Found TestOperatorCloudsConfigMapName in the volumes.go files.

[evallesp]

(non-blocking) question: would take the name from pkg.util.common.go ? So we don't need to maintain same const in two different places.

[lpiwowar]

/cherry-pick 18.0-fr1

[openshift-cherrypick-robot]

@lpiwowar: #240 failed to apply on top of branch "18.0-fr1":

Applying: Do not fail when clouds CM exists
Using index info to reconstruct a base tree...
M	controllers/common.go
M	controllers/horizontest_controller.go
M	controllers/tobiko_controller.go
M	pkg/util/common.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/util/common.go
Auto-merging controllers/tobiko_controller.go
Auto-merging controllers/horizontest_controller.go
Auto-merging controllers/common.go
CONFLICT (content): Merge conflict in controllers/common.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Do not fail when clouds CM exists

In response to this:

/cherry-pick 18.0-fr1

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-sigs/prow repository.