CNF-14376: Handle special overrides for extraLabels and extraAnnotations

[Missxiaoguo]

In normal cases, ClusterInstance input data from the ClusterRequest overrides the defaults from the configmap. However, for the fields extraLabels and extraAnnotations, the default values from the configmap should take precedence if the same labels/annotations exist in both. The extraLabels provided in the default configmap are specific to the templated policies. They shouldn’t be overridden by ClusterRequest.

Add a function to handle these special overrides. If extraLabels or extraAnnotations are present in both the ClusterRequest and the configmap, the values from ClusterRequest will be overriden with the defaults.

The utility merge function is invoked after to perform the normal merging behavior, where ClusterRequest overrides defaults if both exist.

[openshift-ci-robot]

@Missxiaoguo: This pull request references CNF-14376 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

In normal cases, ClusterInstance input data from the ClusterRequest overrides the defaults from the configmap. However, for the fields extraLabels and extraAnnotations, the default values from the configmap should take precedence if the same labels/annotations exist in both.

Add a function to handle these special overrides. If extraLabels or extraAnnotations are present in both the ClusterRequest and the configmap, the values from ClusterRequest will be overriden with the defaults.

The utility merge function is invoked after to perform the normal merging behavior, where ClusterRequest overrides defaults if both exist.

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 openshift-eng/jira-lifecycle-plugin repository.

[alegacy]

Could you amend your commit comment to add a sentence or two after this sentence to explain why this is the case?

"However, for the fields extraLabels and extraAnnotations, the default values from the configmap should take precedence if the same labels/annotations exist in both"

[alegacy]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from alegacy. For more information see the Kubernetes Code Review Process.

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

[openshift-ci-robot]

@Missxiaoguo: This pull request references CNF-14376 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

In normal cases, ClusterInstance input data from the ClusterRequest overrides the defaults from the configmap. However, for the fields extraLabels and extraAnnotations, the default values from the configmap should take precedence if the same labels/annotations exist in both. The extraLabels provided in the default configmap are specific to the templated policies. They shouldn’t be
overridden by ClusterRequest.

Add a function to handle these special overrides. If extraLabels or extraAnnotations are present in both the ClusterRequest and the configmap, the values from ClusterRequest will be overriden with the defaults.

The utility merge function is invoked after to perform the normal merging behavior, where ClusterRequest overrides defaults if both exist.

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@Missxiaoguo: This pull request references CNF-14376 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

In normal cases, ClusterInstance input data from the ClusterRequest overrides the defaults from the configmap. However, for the fields extraLabels and extraAnnotations, the default values from the configmap should take precedence if the same labels/annotations exist in both. The extraLabels provided in the default configmap are specific to the templated policies. They shouldn’t be overridden by ClusterRequest.

Add a function to handle these special overrides. If extraLabels or extraAnnotations are present in both the ClusterRequest and the configmap, the values from ClusterRequest will be overriden with the defaults.

The utility merge function is invoked after to perform the normal merging behavior, where ClusterRequest overrides defaults if both exist.

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 openshift-eng/jira-lifecycle-plugin repository.

[alegacy]

/lgtm