fix: apply strategic merge to workspace-preferences-configmap

[akurinnoy]

What does this PR do?

This PR fixes the bug that causes overwriting the data section of the workspace-preferences-configmap.

Screenshot/screencast of this PR

n/a

What issues does this PR fix or reference?

fixes https://issues.redhat.com/browse/CRW-7179
fixes eclipse-che/che#23154

How to test this PR?

1. Deploy the Eclipse Che (or DevSpaces) using this image: quay.io/okurinny/che-server:next;
2. Configure OAuth2 for the Bitbucket Cloud https://eclipse.dev/che/docs/stable/administration-guide/configuring-oauth-2-for-the-bitbucket-cloud/;
3. Launch a factory using a project URL from your Bitbucket Cloud;
4. Decline the authorization prompt;
5. At this point
   • the dashboard should proceed with creating the new workspace;
   • the Untrusted repository modal should not appear.

PR Checklist

As the author of this Pull Request I made sure that:

• The Eclipse Contributor Agreement is valid
• Code produced is complete
• Code builds without errors
• Tests are covering the bugfix
• The repository devfile is up to date and works
• Sections What issues does this PR fix or reference and How to test this PR completed
• Relevant user documentation updated
• Relevant contributing documentation updated
• CI/CD changes implemented, documented and communicated

Release Notes

Reviewers

Reviewers, please comment how you tested the PR when approving it.

[openshift-ci]

@akurinnoy: The following test 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/v14-gitlab-with-oauth-setup-flow	04f0b76	link	true	/test v14-gitlab-with-oauth-setup-flow

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-sigs/prow repository. I understand the commands that are listed here.

[akurinnoy]

@artaleks9 @dmytro-ndp can you please verify this fix?

[artaleks9]

Verified on Che with quay.io/eclipse/che-server:pr-723
the functionality works properly

[artaleks9]

/retest

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, ibuziuk, vinokurig

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

Needs approval from an approver in each of these files:

• OWNERS

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

[devstudio-release]

Build 3.18 :: server_3.x/363: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: sync-to-downstream_3.x/7787: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: get-sources-rhpkg-container-build_3.x/7787: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: push-latest-container-to-quay_3.x/4963: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: get-sources-rhpkg-container-build_3.x/7787:

server : 3.x :: Build 64794659 : quay.io/devspaces/server-rhel8:3.18-2
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4963 triggered

[devstudio-release]

Build 3.18 :: update-digests_3.x/7693: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: server_3.x/363:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/7787 triggered

[devstudio-release]

Build 3.18 :: operator-bundle_3.x/3652: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: sync-to-downstream_3.x/7788: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: get-sources-rhpkg-container-build_3.x/7788: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: push-latest-container-to-quay_3.x/4964: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: get-sources-rhpkg-container-build_3.x/7788:

devspaces-operator-bundle : 3.x :: Build 64794906 : quay.io/devspaces/devspaces-operator-bundle:3.18-3
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4964 triggered;

Bundle CSV related images:
- quay.io/devspaces/code-rhel8:3.18-1
- quay.io/devspaces/configbump-rhel8:3.18-1
- quay.io/devspaces/dashboard-rhel8:3.18-2
- quay.io/devspaces/devspaces-rhel8-operator:3.18-3
- quay.io/devspaces/idea-rhel8:3.18-1
- quay.io/devspaces/pluginregistry-rhel8:3.18-2
- quay.io/devspaces/server-rhel8:3.18-2
- quay.io/devspaces/traefik-rhel8:3.18-1
= registry.redhat.io/devspaces/udi-rhel8:3.15-5.1724033655
- quay.io/devspaces/udi-rhel8:3.18-2
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.14.0-202409240108.p0.g1a646b9.assembly.stream.el8
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.14.0-202409250238.p0.ga4a2f27.assembly.stream.el8
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

[devstudio-release]

Build 3.18 :: sync-to-downstream_3.x/7788:

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/7788 triggered; /job/DS_CI/job/dsc_3.x triggered;

[devstudio-release]

Build 3.18 :: operator-bundle_3.x/3652:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/7788 triggered

[devstudio-release]

Build 3.18 :: copyIIBsToQuay/2824: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: dsc_3.x/2012: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: update-digests_3.x/7693:

Detected new images: rebuild operator-bundle
* server; /DS_CI/operator-bundle_3.x/3652 triggered

[devstudio-release]

Build 3.18 :: dsc_3.x/2012:

3.18.0-CI