Skip to content

fix(hypershift/gcp): unpin CAPG image override (GCP-426)#80123

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
cristianoveiga:feat/gcp-426-unpin-capg-image
Jun 5, 2026
Merged

fix(hypershift/gcp): unpin CAPG image override (GCP-426)#80123
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
cristianoveiga:feat/gcp-426-unpin-capg-image

Conversation

@cristianoveiga
Copy link
Copy Markdown
Contributor

@cristianoveiga cristianoveiga commented Jun 4, 2026

Summary

Removes the pinned CAPG image override (`hypershift.openshift.io/capi-provider-gcp-image`) from the `hypershift-gcp-create` chain.

Root Cause

The OCP payload CAPG image is built against CAPI v1.11+, which watches `cluster.x-k8s.io/v1beta2` core resources (Machines, Clusters, MachineSets). Before openshift/hypershift#8594 (CAPI 1.11 upgrade), HyperShift's core CAPI CRDs only served `v1beta1`, causing the CAPG controller to CrashLoopBackOff. The image was pinned to an older build as a workaround.

PR #8594 has since merged, and the core CAPI CRDs now serve both `v1beta1` and `v1beta2` via a conversion webhook. The pin is no longer needed.

Test plan

  • Rehearsal job `e2e-v2-gke` passed without the pinned image (run)

Closes https://redhat.atlassian.net/browse/GCP-426

HyperShift's CAPI CRDs now serve v1beta2, so the pinned CAPG image
override is no longer needed.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 4, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 4, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jun 4, 2026

Walkthrough

This PR removes the CAPG image override configuration from the HyperShift GCP cluster creation step. It eliminates the CAPG_IMAGE environment variable definition and the corresponding annotation argument, allowing the cluster creation to use default CAPG image selection instead of an explicitly pinned digest.

Changes

CAPG image override removal

Layer / File(s) Summary
CAPG image override removal from cluster creation
ci-operator/step-registry/hypershift/gcp/create/hypershift-gcp-create-chain.yaml
Removes the CAPG_IMAGE variable definition (lines 43–48) and the hypershift.openshift.io/capi-provider-gcp-image annotation argument (line 77) from the HyperShift GCP cluster creation command, delegating image selection to default behavior.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately reflects the main change: removing a pinned CAPG image override in the HyperShift GCP configuration. It is concise, specific, and includes a reference to the issue (GCP-426).
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 PR only modifies a YAML CI step configuration file, not test code. No Ginkgo tests are present in the changes, making the test name stability check inapplicable.
Test Structure And Quality ✅ Passed PR contains no Ginkgo test code. The custom check requiring Ginkgo test review is not applicable - the test files use standard Go testing.T patterns, not Ginkgo BDD-style tests.
Microshift Test Compatibility ✅ Passed This PR does not add new Ginkgo e2e tests. It only modifies YAML step registry configuration to remove a CAPG image override from HyperShift GCP cluster creation workflow.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR; only YAML CI configuration is modified. The SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed CI step configuration file with no Kubernetes scheduling constraints. Check not applicable to this type of change.
Ote Binary Stdout Contract ✅ Passed No OTE test binaries modified. PR changes YAML config and utility tools (gotest2junit, junitreport), not OTE test implementations.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only modifies YAML step-registry configuration (hypershift-gcp-create-chain.yaml); no Ginkgo e2e test code was added, so the IPv6/disconnected compatibility check does not apply.
No-Weak-Crypto ✅ Passed PR modifies only YAML infrastructure configuration; no weak crypto patterns (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB) found in file or changes.
Container-Privileges ✅ Passed PR removes CAPG image override; no privileged container settings found in any modified files.
No-Sensitive-Data-In-Logs ✅ Passed PR removes a CAPG_IMAGE variable containing an internal container image digest that would be logged due to set -x, reducing sensitive data exposure in CI logs.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2026
@cristianoveiga
Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-hypershift-main-e2e-v2-gke

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@cristianoveiga
Copy link
Copy Markdown
Contributor Author

/pj-rehearse pull-ci-openshift-hypershift-main-e2e-v2-gke

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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

@cristianoveiga cristianoveiga marked this pull request as ready for review June 4, 2026 23:41
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 4, 2026
@openshift-ci openshift-ci Bot requested review from cblecker and muraee June 4, 2026 23:42
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 4, 2026

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

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, cristianoveiga

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

@cblecker
Copy link
Copy Markdown
Member

cblecker commented Jun 4, 2026

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@cblecker: 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 Jun 4, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 163f2b5 into openshift:main Jun 5, 2026
12 checks passed
TimurMP pushed a commit to TimurMP/release that referenced this pull request Jun 7, 2026
…0123)

HyperShift's CAPI CRDs now serve v1beta2, so the pinned CAPG image
override is no longer needed.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
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.

2 participants