OCPBUGS-63617: Fix Prevent conflicting feature gate settings in catalogd deployment

[jianzhangbjz]

Fix Conflicting Feature Gate Settings in Catalogd

Problem

APIV1MetasHandler was set to both true and false due to helm values
files conflicting with cluster feature gate configuration.

    jiazha-mac:cluster-olm-operator jiazha$ oc get deploy catalogd-controller-manager -o yaml |grep APIV1MetasHandler
        - --feature-gates=APIV1MetasHandler=true
        - --feature-gates=APIV1MetasHandler=false    

Solution

Clear helm values file feature gates before applying cluster configuration.
This ensures cluster-driven settings take precedence.

Changes

• Add ClearFeatureGates() to helmvalues package
• Call ClearFeatureGates() before merging cluster config in helm.go
• Add comprehensive unit tests

Result

Feature gates are now set correctly based on cluster configuration:

• Standard: --feature-gates=APIV1MetasHandler=false
• TechPreview: --feature-gates=APIV1MetasHandler=true

Assisted-by: Claude Code

[openshift-ci-robot]

@jianzhangbjz: This pull request references Jira Issue OCPBUGS-63617, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.0) matches configured target version for branch (4.21.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Fix Conflicting Feature Gate Settings in Catalogd

Problem

APIV1MetasHandler was set to both true and false due to helm values
files conflicting with cluster feature gate configuration.

Solution

Clear helm values file feature gates before applying cluster configuration.
This ensures cluster-driven settings take precedence.

Changes

• Add ClearFeatureGates() to helmvalues package
• Call ClearFeatureGates() before merging cluster config in helm.go
• Add comprehensive unit tests

Result

Feature gates are now set correctly based on cluster configuration:

• Standard: --feature-gates=APIV1MetasHandler=false
• TechPreview: --feature-gates=APIV1MetasHandler=true

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]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jianzhangbjz
Once this PR has been reviewed and has the lgtm label, please assign lalatendumohanty for approval. For more information see the 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]

@jianzhangbjz: This pull request references Jira Issue OCPBUGS-63617, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.21.0) matches configured target version for branch (4.21.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

In response to this:

Fix Conflicting Feature Gate Settings in Catalogd

Problem

APIV1MetasHandler was set to both true and false due to helm values
files conflicting with cluster feature gate configuration.

   jiazha-mac:cluster-olm-operator jiazha$ oc get deploy catalogd-controller-manager -o yaml |grep APIV1MetasHandler
       - --feature-gates=APIV1MetasHandler=true
       - --feature-gates=APIV1MetasHandler=false    

Solution

Clear helm values file feature gates before applying cluster configuration.
This ensures cluster-driven settings take precedence.

Changes

• Add ClearFeatureGates() to helmvalues package
• Call ClearFeatureGates() before merging cluster config in helm.go
• Add comprehensive unit tests

Result

Feature gates are now set correctly based on cluster configuration:

• Standard: --feature-gates=APIV1MetasHandler=false
• TechPreview: --feature-gates=APIV1MetasHandler=true

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.

[jianzhangbjz]

Hi @tmshort , could you help take a look when you get a chance? Thanks!

[jianzhangbjz]

Failed to test it since https://redhat-internal.slack.com/archives/CNHC2DK2M/p1761643892932239

[grokspawn]

/retest-required

[jianzhangbjz]

/retest-required

[openshift-ci]

@jianzhangbjz: 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/okd-scos-e2e-aws-ovn	b0ce393	link	false	/test okd-scos-e2e-aws-ovn

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.

[jianzhangbjz]

Test passed, details: https://issues.redhat.com/browse/OCPBUGS-63617
/verified by @jianzhangbjz

[openshift-ci-robot]

@jianzhangbjz: This PR has been marked as verified by @jianzhangbjz.

In response to this:

Test passed, details: https://issues.redhat.com/browse/OCPBUGS-63617
/verified by @jianzhangbjz

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.