Skip to content

CNTRLPLANE-3603: Migrate clients from CAPI v1beta1 to v1beta2 #8717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
clebs wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

CNTRLPLANE-3603: Migrate clients from CAPI v1beta1 to v1beta2 #8717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c085b80
build(capi): migrate CAPI core types from v1beta1 to v1beta2
clebs Jun 11, 2026
0dc9741
test(capi): update tests for CAPI v1beta2 type migration
clebs Jun 11, 2026
5e45908
build(vendor): Update vendor
clebs Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/.golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ linters:
- kubeapilinter
path: hypershift/v1beta1/hosted_controlplane.go
text: 'nobools: field HostedControlPlaneStatus.Initialized should not use a bool. Use a string type with meaningful constant values as an enum.'
- linters:
- kubeapilinter
path: hypershift/v1beta1/hosted_controlplane.go
text: 'nobools: field HostedControlPlaneInitializationStatus.ControlPlaneInitialized pointer should not use a bool. Use a string type with meaningful constant values as an enum.'
- linters:
- kubeapilinter
path: hypershift/v1beta1/hosted_controlplane.go
Expand Down
20 changes: 20 additions & 0 deletions api/hypershift/v1beta1/hosted_controlplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,26 @@ type HostedControlPlaneStatus struct {
// configuration contains the cluster configuration status of the HostedCluster
// +optional
Configuration *ConfigurationStatus `json:"configuration,omitempty"`

// initialization contains fields that track the status of the initialization of the HostedControlPlane.
// This satisfies the CAPI v1beta2 ControlPlane provider contract:
// https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
// +optional
Initialization HostedControlPlaneInitializationStatus `json:"initialization,omitzero"`
}

// HostedControlPlaneInitializationStatus provides observations of the HostedControlPlane initialization process.
// This satisfies the CAPI v1beta2 ControlPlane provider contract:
// https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1361-L1379
// +kubebuilder:validation:MinProperties=1
type HostedControlPlaneInitializationStatus struct {
// controlPlaneInitialized is true when the control plane is functional enough to accept requests.
// Once this condition is marked true, its value is never changed. See the Ready condition for an
// indication of the current readiness of the cluster's control plane.
// This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
// +optional
// +default=false
ControlPlaneInitialized *bool `json:"controlPlaneInitialized,omitempty"`
}

// APIEndpoint represents a reachable Kubernetes API endpoint.
Expand Down
21 changes: 21 additions & 0 deletions api/hypershift/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions ...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6746,6 +6746,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...d-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterUpdateAcceptRisks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6729,6 +6729,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...ests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6749,6 +6749,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ....featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7226,6 +7226,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7366,6 +7366,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUpstreamParity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7192,6 +7192,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...d.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/GCPPlatform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7175,6 +7175,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/HCPEtcdBackup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6794,6 +6794,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions .../hostedcontrolplanes.hypershift.openshift.io/HyperShiftOnlyDynamicResourceAllocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6751,6 +6751,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...ated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6758,6 +6758,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
16 changes: 16 additions & 0 deletions ...ated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6805,6 +6805,22 @@ spec:
is managed by an external service.
https://github.com/kubernetes-sigs/cluster-api/blob/65e5385bffd71bf4aad3cf34a537f11b217c7fab/controllers/machine_controller.go#L468
type: boolean
initialization:
description: |-
initialization contains fields that track the status of the initialization of the HostedControlPlane.
This satisfies the CAPI v1beta2 ControlPlane provider contract:
https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
minProperties: 1
properties:
controlPlaneInitialized:
default: false
description: |-
controlPlaneInitialized is true when the control plane is functional enough to accept requests.
Once this condition is marked true, its value is never changed. See the Ready condition for an
indication of the current readiness of the cluster's control plane.
This satisfies CAPI contract https://github.com/kubernetes-sigs/cluster-api/blob/v1.11.5/api/core/v1beta2/cluster_types.go#L1371-L1379
type: boolean
type: object
initialized:
default: false
description: |-
Expand Down
Loading