Skip to content

[ROSAENG-66312] Fix rosa-sts-e2e readiness check for managed-cluster-validating-webhooks - #86104

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
diakovnec:fix-mcvw-e2e-daemonset
Sep 29, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
diakovnec:fix-mcvw-e2e-daemonset

Conversation

@diakovnec

@diakovnec diakovnec commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

What

Set OPERATOR_RESOURCE_KIND: daemonset on the rosa-sts-e2e presubmit for openshift/managed-cluster-validating-webhooks.

Why

The rosa-operator-e2e step's readiness check falls back to deployment when OPERATOR_RESOURCE_KIND is unset:

DEPLOY_KIND="${OPERATOR_RESOURCE_KIND:-deployment}"
${KUBE} get "${DEPLOY_KIND}" "${DEPLOY_NAME}" -n "${DEPLOY_NS}"

managed-cluster-validating-webhooks ships as a DaemonSet on OSD/ROSA Classic, so the check waits for a deployment/validation-webhook that never exists and fails after the 120s timeout — even though the DaemonSet pods are healthy:

Waiting up to 120s for deployment/validation-webhook in openshift-validation-webhook
ERROR: deployment validation-webhook not found in openshift-validation-webhook after 120s
Diagnostic: resources in openshift-validation-webhook:
NAME                           READY   STATUS    RESTARTS   AGE
pod/validation-webhook-8cmwf   1/1     Running   0          2m48s
pod/validation-webhook-cz272   1/1     Running   0          2m47s
...
daemonset/validation-webhook   SuccessfulCreate: Created pod: validation-webhook-h9p7j

The sibling tests rosa-sts-e2e-promotion-int and rosa-sts-e2e-promotion-stage already set OPERATOR_RESOURCE_KIND: daemonset; the presubmit was missed.

Impact

rosa-sts-e2e has run_if_changed: ^(test/e2e/.*|go\.mod|go\.sum)$, so this fires on any dependency-bump PR. Currently failing on at least openshift/managed-cluster-validating-webhooks#642 and #637.

Notes

No job regeneration required — the generated presubmit/periodic files do not embed these env vars, so make jobs is a no-op for this change.

🤖 Generated with Claude Code

Summary by CodeRabbit

The rosa-sts-e2e presubmit for openshift/managed-cluster-validating-webhooks now sets OPERATOR_RESOURCE_KIND to daemonset. This makes the readiness check target the operator’s DaemonSet instead of defaulting to a Deployment.

The rosa-sts-e2e presubmit omits OPERATOR_RESOURCE_KIND, so the
rosa-operator-e2e readiness check falls back to its "deployment"
default. managed-cluster-validating-webhooks ships as a DaemonSet on
OSD/ROSA Classic, so the check never finds deployment/validation-webhook
and the job fails after the 120s timeout even though the DaemonSet pods
are Running 1/1.

Set OPERATOR_RESOURCE_KIND: daemonset to match the existing
rosa-sts-e2e-promotion-int and rosa-sts-e2e-promotion-stage tests, which
already set it.

The job has run_if_changed on go.mod/go.sum/test/e2e, so this surfaces
on any dependency-bump PR.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Advanced

Run ID: d27f2168-f073-4233-9717-fcc54a34b00b

📥 Commits

Reviewing files that changed from the base of the PR and between 2b86b11 and 98083de.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml

Included review availability: This review used your included allowance. Your plan provides up to 2 included reviews per hour; 1 remain after this review.


Walkthrough

The rosa-sts-e2e job now sets OPERATOR_RESOURCE_KIND to daemonset.

Changes

rosa-sts-e2e job configuration

Layer / File(s) Summary
Set operator resource kind
ci-operator/config/openshift/managed-cluster-validating-webhooks/openshift-managed-cluster-validating-webhooks-master.yaml
The job environment adds OPERATOR_RESOURCE_KIND=daemonset.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~2 minutes

Change: Bug fix

Merge Risk: ⚪ Minimal · up to 98083

The presubmit now checks the operator using its configured DaemonSet resource kind.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The pull request changes only the rosa-sts-e2e YAML environment. It adds OPERATOR_RESOURCE_KIND: daemonset. It does not add or modify any Ginkgo test title, so it introduces no unstable test name.
Test Structure And Quality ✅ Passed PASS: The pull request changes only a CI YAML environment setting, adding OPERATOR_RESOURCE_KIND: daemonset. It does not add or modify Ginkgo It blocks, setup or cleanup, cluster waits, or asserti…
Microshift Test Compatibility ✅ Passed The pull request changes only one YAML configuration file. It adds OPERATOR_RESOURCE_KIND: daemonset to the existing rosa-sts-e2e job and adds no Ginkgo tests or test code. The MicroShift test com…
Single Node Openshift (Sno) Test Compatibility ✅ Passed The pull request changes only one CI YAML file by adding OPERATOR_RESOURCE_KIND: daemonset to the existing rosa-sts-e2e job. It adds no Ginkgo tests and introduces no SNO or multi-node assumptions…
Topology-Aware Scheduling Compatibility ✅ Passed The pull request changes only a CI configuration file. It adds OPERATOR_RESOURCE_KIND: daemonset to the rosa-sts-e2e test and does not add or modify deployment manifests, operator code, controller…
Ote Binary Stdout Contract ✅ Passed PASS: The pull request changes only one YAML configuration file. The sole added line sets OPERATOR_RESOURCE_KIND: daemonset; no Go files or process-level OTE code changed. Therefore, the pull reques…
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The pull request changes one CI YAML file. It adds OPERATOR_RESOURCE_KIND: daemonset to an existing job and adds no Ginkgo e2e tests or networking code. The IPv6 and disconnected-network test compat…
No-Weak-Crypto ✅ Passed The pull request changes only one YAML environment variable: OPERATOR_RESOURCE_KIND: daemonset. The diff introduces no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB mode, custom cryptography, or secret/t…
Container-Privileges ✅ Passed The pull request adds only OPERATOR_RESOURCE_KIND: daemonset to the rosa-sts-e2e environment. The changed manifest contains no privileged: true, hostPID, hostNetwork, hostIPC, SYS_ADMIN,…
No-Sensitive-Data-In-Logs ✅ Passed PASS: The pull request changes only one YAML environment variable, OPERATOR_RESOURCE_KIND: daemonset. It adds no logging, credentials, identifiers, hostnames, or customer data. The changed-line scan…
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the readiness-check fix for the rosa-sts-e2e job and names the affected component.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@diakovnec: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-managed-cluster-validating-webhooks-master-rosa-sts-e2e openshift/managed-cluster-validating-webhooks presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

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

@diakovnec diakovnec changed the title Fix rosa-sts-e2e readiness check for managed-cluster-validating-webhooks [ROSAENG-66312] Fix rosa-sts-e2e readiness check for managed-cluster-validating-webhooks Sep 29, 2026
@feichashao

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2026
@openshift-ci

openshift-ci Bot commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: diakovnec, feichashao

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

@krishvoor

Copy link
Copy Markdown
Member

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@krishvoor: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 29, 2026
@openshift-merge-bot
openshift-merge-bot Bot merged commit edf2c27 into openshift:main Sep 29, 2026
14 checks passed
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants