Skip to content

OCPBUGS-93868: Add missing labels - #8858

Closed
stephenfin wants to merge 1 commit into
openshift:release-4.22from
shiftstack:fix-openstack-4.22
Closed

OCPBUGS-93868: Add missing labels#8858
stephenfin wants to merge 1 commit into
openshift:release-4.22from
shiftstack:fix-openstack-4.22

Conversation

@stephenfin

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

EnsureAppLabel (added in 5ddb58a, OCPBUGS-60064) requires every pod in the HCP namespace to carry an app label for per-component metrics tracking. The OpenStack CCM deployment appears to have been missed in that fix.

All other platform CCMs (aws-, azure-, gcp-, kubevirt-, powervs-) set app: cloud-controller-manager on their pod template; align OpenStack with the same convention.

Note that this is taken from the stack of patches in #8687 and seems to be the only one needed in 4.22 :fingers_crossed:

Which issue(s) this PR fixes:

Fixes OCPBUGS-93868

Special notes for your reviewer:

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

EnsureAppLabel (added in 5ddb58a, OCPBUGS-60064) requires every pod in
the HCP namespace to carry an app label for per-component metrics
tracking. The OpenStack CCM deployment appears to have been missed in
that fix.

All other platform CCMs (aws-, azure-, gcp-, kubevirt-, powervs-) set
app: cloud-controller-manager on their pod template; align OpenStack
with the same convention.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Assisted-By: Claude Sonnet 4.6 <noreply@anthropic.com>
(cherry picked from commit fbaa732)
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 29, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@stephenfin: This pull request references Jira Issue OCPBUGS-93868, 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.

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

Details

In response to this:

What this PR does / why we need it:

EnsureAppLabel (added in 5ddb58a, OCPBUGS-60064) requires every pod in the HCP namespace to carry an app label for per-component metrics tracking. The OpenStack CCM deployment appears to have been missed in that fix.

All other platform CCMs (aws-, azure-, gcp-, kubevirt-, powervs-) set app: cloud-controller-manager on their pod template; align OpenStack with the same convention.

Note that this is taken from the stack of patches in #8687 and seems to be the only one needed in 4.22 :fingers_crossed:

Which issue(s) this PR fixes:

Fixes OCPBUGS-93868

Special notes for your reviewer:

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 29, 2026
@coderabbitai

coderabbitai Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

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 YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a17b2fc9-6bb3-495f-b852-fe6a15a83490

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.

@openshift-ci
openshift-ci Bot requested review from devguyio and gryf June 29, 2026 12:54
@openshift-ci openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stephenfin

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:

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

@openshift-ci openshift-ci Bot added area/platform/openstack PR/issue for OpenStack (OpenStackPlatform) platform approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Jun 29, 2026
@stephenfin

Copy link
Copy Markdown
Contributor Author

/test e2e-openstack-aws

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@stephenfin: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aks
/test e2e-aks-4-21
/test e2e-aks-override
/test e2e-aws
/test e2e-aws-4-21
/test e2e-aws-override
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws
/test images
/test security
/test verify-deps

The following commands are available to trigger optional jobs:

/test address-review-comments
/test agentic-qe-aws
/test e2e-agent-connected-ovn-ipv4-metal-backuprestore
/test e2e-aws-autonode
/test e2e-aws-metrics
/test e2e-aws-minimal
/test e2e-aws-techpreview
/test e2e-azure-aks-ovn-conformance
/test e2e-azure-kubevirt-ovn
/test e2e-conformance
/test e2e-kubevirt-aws-ovn
/test e2e-kubevirt-azure-ovn
/test e2e-kubevirt-metal-ovn-backuprestore
/test e2e-v2-aws-backuprestore
/test reqserving-e2e-aws

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-hypershift-release-4.22-images
pull-ci-openshift-hypershift-release-4.22-security
pull-ci-openshift-hypershift-release-4.22-verify-deps
Details

In response to this:

/test e2e-openstack-aws

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.

@stephenfin

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 29, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@stephenfin: This pull request references Jira Issue OCPBUGS-93868, 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 type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-84114 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-84114 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
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-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@stephenfin: 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.

@codecov

codecov Bot commented Jun 29, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 35.79%. Comparing base (4b28599) to head (6563e29).

Additional details and impacted files
@@              Coverage Diff              @@
##           release-4.22    #8858   +/-   ##
=============================================
  Coverage         35.79%   35.79%           
=============================================
  Files               774      774           
  Lines             94720    94720           
=============================================
  Hits              33904    33904           
  Misses            58051    58051           
  Partials           2765     2765           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@stephenfin

Copy link
Copy Markdown
Contributor Author

/test e2e-openstack-aws

Ah, yes, we removed these in openshift/release#80481 😅

@stephenfin

Copy link
Copy Markdown
Contributor Author

/close Let's not invest the effort in fixing this and focus on 4.23 and later instead

@stephenfin stephenfin closed this Jun 29, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@stephenfin: This pull request references Jira Issue OCPBUGS-93868. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

Details

In response to this:

What this PR does / why we need it:

EnsureAppLabel (added in 5ddb58a, OCPBUGS-60064) requires every pod in the HCP namespace to carry an app label for per-component metrics tracking. The OpenStack CCM deployment appears to have been missed in that fix.

All other platform CCMs (aws-, azure-, gcp-, kubevirt-, powervs-) set app: cloud-controller-manager on their pod template; align OpenStack with the same convention.

Note that this is taken from the stack of patches in #8687 and seems to be the only one needed in 4.22 :fingers_crossed:

Which issue(s) this PR fixes:

Fixes OCPBUGS-93868

Special notes for your reviewer:

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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.

@stephenfin
stephenfin deleted the fix-openstack-4.22 branch June 29, 2026 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/platform/openstack PR/issue for OpenStack (OpenStackPlatform) platform jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants