Skip to content

Commit bd4f41d

Browse files
committed
fix crd generation to map to cluster API versions
1 parent 51fd0b4 commit bd4f41d

6 files changed

Lines changed: 15 additions & 3 deletions

api/v1alpha1/oxidecluster_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ type OxideClusterInitializationStatus struct {
113113
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
114114
// +kubebuilder:printcolumn:name="Attachment",type="string",JSONPath=".status.conditions[?(@.type=='FloatingIPAttached')].reason"
115115
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
116-
116+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta1=v1alpha1"
117+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta2=v1alpha1"
117118
// OxideCluster is the Schema for the oxideclusters API
118119
type OxideCluster struct {
119120
metav1.TypeMeta `json:",inline"`

api/v1alpha1/oxidemachine_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ type OxideMachineStatus struct {
127127
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
128128
// +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].reason"
129129
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
130-
130+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta1=v1alpha1"
131+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta2=v1alpha1"
131132
// OxideMachine is the Schema for the oxidemachines API
132133
type OxideMachine struct {
133134
metav1.TypeMeta `json:",inline"`

api/v1alpha1/oxidemachinetemplate_types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ type OxideMachineTemplateResource struct {
5757

5858
// +kubebuilder:object:root=true
5959
// +kubebuilder:subresource:status
60-
60+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta1=v1alpha1"
61+
// +kubebuilder:metadata:labels="cluster.x-k8s.io/v1beta2=v1alpha1"
6162
// OxideMachineTemplate is the Schema for the oxidemachinetemplates API
6263
type OxideMachineTemplate struct {
6364
metav1.TypeMeta `json:",inline"`

charts/cluster-api-provider-oxide/crds/infrastructure.cluster.x-k8s.io_oxideclusters.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.21.0
7+
labels:
8+
cluster.x-k8s.io/v1beta1: v1alpha1
9+
cluster.x-k8s.io/v1beta2: v1alpha1
710
name: oxideclusters.infrastructure.cluster.x-k8s.io
811
spec:
912
group: infrastructure.cluster.x-k8s.io

charts/cluster-api-provider-oxide/crds/infrastructure.cluster.x-k8s.io_oxidemachines.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.21.0
7+
labels:
8+
cluster.x-k8s.io/v1beta1: v1alpha1
9+
cluster.x-k8s.io/v1beta2: v1alpha1
710
name: oxidemachines.infrastructure.cluster.x-k8s.io
811
spec:
912
group: infrastructure.cluster.x-k8s.io

charts/cluster-api-provider-oxide/crds/infrastructure.cluster.x-k8s.io_oxidemachinetemplates.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.21.0
7+
labels:
8+
cluster.x-k8s.io/v1beta1: v1alpha1
9+
cluster.x-k8s.io/v1beta2: v1alpha1
710
name: oxidemachinetemplates.infrastructure.cluster.x-k8s.io
811
spec:
912
group: infrastructure.cluster.x-k8s.io

0 commit comments

Comments
 (0)