Merge pull request #2947 from bnallapeta/v1beta2-api-types

⚠️ Add api/v1beta2 types with CAPI v1beta2 contract

Author: k8s-ci-robot

api/v1beta2/conditions_consts.go

@@ -0,0 +1,98 @@
+/*
+Copyright 2026 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2
+
+const (
+	// InstanceReadyCondition reports on current status of the OpenStack instance. Ready indicates the instance is in a Running state.
+	InstanceReadyCondition string = "InstanceReady"
+
+	// WaitingForClusterInfrastructureReason used when machine is waiting for cluster infrastructure to be ready before proceeding.
+	WaitingForClusterInfrastructureReason = "WaitingForClusterInfrastructure"
+	// WaitingForBootstrapDataReason used when machine is waiting for bootstrap data to be ready before proceeding.
+	WaitingForBootstrapDataReason = "WaitingForBootstrapData"
+	// InvalidMachineSpecReason used when the machine spec is invalid.
+	InvalidMachineSpecReason = "InvalidMachineSpec"
+	// InstanceCreateFailedReason used when creating the instance failed.
+	InstanceCreateFailedReason = "InstanceCreateFailed"
+	// InstanceNotFoundReason used when the instance couldn't be retrieved.
+	InstanceNotFoundReason = "InstanceNotFound"
+	// InstanceStateErrorReason used when the instance is in error state.
+	InstanceStateErrorReason = "InstanceStateError"
+	// InstanceDeletedReason used when the instance is in a deleted state.
+	InstanceDeletedReason = "InstanceDeleted"
+	// InstanceNotReadyReason used when the instance is in a pending state.
+	InstanceNotReadyReason = "InstanceNotReady"
+	// InstanceDeleteFailedReason used when deleting the instance failed.
+	InstanceDeleteFailedReason = "InstanceDeleteFailed"
+	// OpenstackErrorReason used when there is an error communicating with OpenStack.
+	OpenStackErrorReason = "OpenStackError"
+	// DependencyFailedReason indicates that a dependent object failed.
+	DependencyFailedReason = "DependencyFailed"
+
+	// ServerUnexpectedDeletedMessage is the message used when the server is unexpectedly deleted via an external agent.
+	ServerUnexpectedDeletedMessage = "The server was unexpectedly deleted"
+)
+
+const (
+	// APIServerIngressReadyCondition reports on the current status of the network ingress (Loadbalancer, Floating IP) for Control Plane machines. Ready indicates that the instance can receive requests.
+	APIServerIngressReadyCondition string = "APIServerIngressReadyCondition"
+
+	// LoadBalancerMemberErrorReason used when the instance could not be added as a loadbalancer member.
+	LoadBalancerMemberErrorReason = "LoadBalancerMemberError"
+	// FloatingIPErrorReason used when the floating ip could not be created or attached.
+	FloatingIPErrorReason = "FloatingIPError"
+)
+
+const (
+	// FloatingAddressFromPoolReadyCondition reports on the current status of the Floating IPs from ipam pool.
+	FloatingAddressFromPoolReadyCondition string = "FloatingAddressFromPoolReady"
+	// WaitingForIpamProviderReason used when machine is waiting for ipam provider to be ready before proceeding.
+	FloatingAddressFromPoolWaitingForIpamProviderReason = "WaitingForIPAMProvider"
+	// FloatingAddressFromPoolErrorReason is used when there is an error attaching an IP from the pool to an machine.
+	FloatingAddressFromPoolErrorReason = "FloatingIPError"
+	// UnableToFindFloatingIPNetworkReason is used when the floating ip network is not found.
+	UnableToFindFloatingIPNetworkReason = "UnableToFindFloatingIPNetwork"
+)
+
+const (
+	// NetworkReadyCondition reports on the current status of the cluster network infrastructure.
+	// Ready indicates that the network, subnets, and related resources have been successfully provisioned.
+	NetworkReadyCondition string = "NetworkReady"
+
+	// RouterReadyCondition reports on the current status of the cluster router infrastructure.
+	// Ready indicates that the router and its interfaces have been successfully provisioned.
+	RouterReadyCondition string = "RouterReady"
+
+	// SecurityGroupsReadyCondition reports on the current status of the cluster security groups.
+	// Ready indicates that all required security groups have been successfully provisioned.
+	SecurityGroupsReadyCondition string = "SecurityGroupsReady"
+
+	// APIEndpointReadyCondition reports on the current status of the cluster API endpoint.
+	// Ready indicates that the control plane endpoint has been successfully configured.
+	APIEndpointReadyCondition string = "APIEndpointReady"
+
+	// NetworkReconcileFailedReason is used when network reconciliation fails.
+	NetworkReconcileFailedReason = "NetworkCreateFailed"
+	// SubnetReconcileFailedReason is used when subnet reconciliation fails.
+	SubnetReconcileFailedReason = "SubnetCreateFailed"
+	// RouterReconcileFailedReason is used when router reconciliation fails.
+	RouterReconcileFailedReason = "RouterCreateFailed"
+	// SecurityGroupReconcileFailedReason is used when security group reconciliation fails.
+	SecurityGroupReconcileFailedReason = "SecurityGroupCreateFailed"
+	// APIEndpointConfigFailedReason is used when API endpoint configuration fails.
+	APIEndpointConfigFailedReason = "APIEndpointConfigFailed"
+)

api/v1beta2/conversion.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2026 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2
+
+// NOTE: v1beta2 will become the Hub in a future PR.
+// For now, v1beta1 remains the Hub to avoid breaking changes.
+// Conversion webhooks will be implemented in PR #2.

api/v1beta2/doc.go

@@ -0,0 +1,21 @@
+/*
+Copyright 2026 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group.
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
+// +k8s:openapi-gen=true
+package v1beta2

api/v1beta2/groupversion_info.go

@@ -0,0 +1,53 @@
+/*
+Copyright 2026 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// package v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
+package v1beta2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// GroupName is the group name use in this package.
+const GroupName = "infrastructure.cluster.x-k8s.io"
+
+// SchemeGroupVersion is group version used to register these objects.
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta2"}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource.
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = schemeBuilder.AddToScheme
+
+	objectTypes = []runtime.Object{}
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}

api/v1beta2/identity_types.go

@@ -0,0 +1,54 @@
+/*
+Copyright 2026 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2
+
+// OpenStackIdentityReference is a reference to an infrastructure
+// provider identity to be used to provision cluster resources.
+// +kubebuilder:validation:XValidation:rule="(!has(self.region) && !has(oldSelf.region)) || self.region == oldSelf.region",message="region is immutable"
+type OpenStackIdentityReference struct {
+	// Type specifies the identity reference type. Defaults to Secret for backward compatibility.
+	// +kubebuilder:validation:Enum=Secret;ClusterIdentity
+	// +kubebuilder:default=Secret
+	// +kubebuilder:validation:Required
+	Type string `json:"type,omitempty"`
+
+	// Name is the name of a Secret (type=Secret) in the same namespace as the resource being provisioned,
+	// or the name of an OpenStackClusterIdentity (type=ClusterIdentity).
+	// The Secret must contain a key named `clouds.yaml` which contains an OpenStack clouds.yaml file.
+	// The Secret may optionally contain a key named `cacert` containing a PEM-encoded CA certificate.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength=1
+	Name string `json:"name"`
+
+	// CloudName specifies the name of the entry in the clouds.yaml file to use.
+	// +kubebuilder:validation:Required
+	// +kubebuilder:validation:MinLength=1
+	CloudName string `json:"cloudName"`
+
+	// Region specifies an OpenStack region to use. If specified, it overrides
+	// any value in clouds.yaml. If specified for an OpenStackMachine, its
+	// value will be included in providerID.
+	// +optional
+	Region string `json:"region,omitempty"`
+}
+
+// IdentityRefProvider is an interface for obtaining OpenStack credentials from an API object
+// +kubebuilder:object:generate:=false
+type IdentityRefProvider interface {
+	// GetIdentifyRef returns the object's namespace and IdentityRef if it has an IdentityRef, or nulls if it does not
+	GetIdentityRef() (*string, *OpenStackIdentityReference)
+}