[release-4.22] OCPBUGS-90550: Fix node label matching in triggerReconciliation

[openshift-cherrypick-robot]

This is an automated cherry-pick of #719

/assign smulje

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: d98a913a-9f17-457a-8807-16f3edc29c8d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-86839 has been cloned as Jira Issue OCPBUGS-90550. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-90550: Fix node label matching in triggerReconciliation

Details

In response to this:

This is an automated cherry-pick of #719

/assign smulje

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18

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]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-90550, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
• expected dependent Jira Issue OCPBUGS-86839 to target a version in 5.0.0, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

This is an automated cherry-pick of #719

/assign smulje

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18

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.

[smulje]

/jira refresh

[openshift-ci-robot]

@smulje: This pull request references Jira Issue OCPBUGS-90550, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

[smulje]

/jira refresh

[openshift-ci-robot]

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

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-86839 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
• dependent Jira Issue OCPBUGS-86839 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
• bug has dependents

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

Details

In response to this:

/jira refresh

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]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

[danwinship]

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, openshift-cherrypick-robot

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [danwinship]

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

[smulje]

Testing Done

1. Created vanilla cluster with cluster-bot

Launched a 4.22 cluster using cluster-bot.

2. Patched to use custom image with fix

Prevent CVO from managing the operator deployment:

oc patch clusterversion version --type='merge' -p '{"spec":{"overrides":[{"kind":"Deployment","group":"apps","name":"ingress-node-firewall-controller-manager","namespace":"openshift-ingress-node-firewall","unmanaged":true}]}}'
# clusterversion.config.openshift.io/version patched

Scale down CVO to prevent reversion:
oc scale --replicas=0 deployment/cluster-version-operator -n openshift-cluster-version
# deployment.apps/cluster-version-operator scaled

Get the CSV name:
oc get csv -n openshift-ingress-node-firewall
# NAME                                         DISPLAY                          VERSION               PHASE
# ingress-node-firewall.v4.22.0-202606081046   Ingress Node Firewall Operator   4.22.0-202606081046   Succeeded

Patch CSV to use custom image with the fix:
oc patch csv ingress-node-firewall.v4.22.0-202606081046 \
    -n openshift-ingress-node-firewall \
    --type='json' \
    -p='[{"op": "replace", "path": "/spec/install/spec/deployments/0/spec/template/spec/containers/0/image", "value":"quay.io/smulje/ingress-node-firewall-operator:fix-node-matching"}]'
# clusterserviceversion.operators.coreos.com/ingress-node-firewall.v4.22.0-202606081046 patched

3. Verified pod is using the custom image

oc get pod -l control-plane=controller-manager \
    -n openshift-ingress-node-firewall \
    -o jsonpath='{.items[0].spec.containers[0].image}' && echo
# quay.io/smulje/ingress-node-firewall-operator:fix-node-matching

**Confirmed operator is running with the patched image containing the node label matching fix.**

4. Scaled nodes and verified IngressNodeFirewallNodeState creation

Scaled up worker nodes and verified that IngressNodeFirewallNodeState objects are correctly created for nodes added after the operator starts.

**Fix verified - nodes added post-operator startup now correctly trigger IngressNodeFirewallNodeState creation.**

/verified by @smulje

[openshift-ci-robot]

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

Details

In response to this:

Testing Done

1. Created vanilla cluster with cluster-bot

Launched a 4.22 cluster using cluster-bot.

2. Patched to use custom image with fix

Prevent CVO from managing the operator deployment:

oc patch clusterversion version --type='merge' -p '{"spec":{"overrides":[{"kind":"Deployment","group":"apps","name":"ingress-node-firewall-controller-manager","namespace":"openshift-ingress-node-firewall","unmanaged":true}]}}'
# clusterversion.config.openshift.io/version patched

Scale down CVO to prevent reversion:
oc scale --replicas=0 deployment/cluster-version-operator -n openshift-cluster-version
# deployment.apps/cluster-version-operator scaled

Get the CSV name:
oc get csv -n openshift-ingress-node-firewall
# NAME                                         DISPLAY                          VERSION               PHASE
# ingress-node-firewall.v4.22.0-202606081046   Ingress Node Firewall Operator   4.22.0-202606081046   Succeeded

Patch CSV to use custom image with the fix:
oc patch csv ingress-node-firewall.v4.22.0-202606081046 \
    -n openshift-ingress-node-firewall \
    --type='json' \
    -p='[{"op": "replace", "path": "/spec/install/spec/deployments/0/spec/template/spec/containers/0/image", "value":"quay.io/smulje/ingress-node-firewall-operator:fix-node-matching"}]'
# clusterserviceversion.operators.coreos.com/ingress-node-firewall.v4.22.0-202606081046 patched

3. Verified pod is using the custom image

oc get pod -l control-plane=controller-manager \
    -n openshift-ingress-node-firewall \
    -o jsonpath='{.items[0].spec.containers[0].image}' && echo
# quay.io/smulje/ingress-node-firewall-operator:fix-node-matching

**Confirmed operator is running with the patched image containing the node label matching fix.**

4. Scaled nodes and verified IngressNodeFirewallNodeState creation

Scaled up worker nodes and verified that IngressNodeFirewallNodeState objects are correctly created for nodes added after the operator starts.

**Fix verified - nodes added post-operator startup now correctly trigger IngressNodeFirewallNodeState creation.**

/verified by @smulje

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]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-90550: All pull requests linked via external trackers have merged:

• openshift/ingress-node-firewall#721

All linked pull requests have the verified tag. Jira Issue OCPBUGS-90550 has been moved to the VERIFIED state.

Details

In response to this:

This is an automated cherry-pick of #719

/assign smulje

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18

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-cherrypick-robot]

@openshift-cherrypick-robot: new pull request created: #724

Details

In response to this:

This is an automated cherry-pick of #719

/assign smulje

/cherrypick release-4.21 release-4.20 release-4.19 release-4.18

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.