Skip to content

Commit 380161b

Browse files
Fix CI
1 parent c7c97df commit 380161b

File tree

8 files changed

+8
-36
lines changed

8 files changed

+8
-36
lines changed

api/addons/v1beta1/.import-restrictions

-5
This file was deleted.

api/v1beta1/.import-restrictions

-5
This file was deleted.

bootstrap/kubeadm/api/v1beta1/.import-restrictions

-5
This file was deleted.

controlplane/kubeadm/api/v1beta1/.import-restrictions

-5
This file was deleted.

exp/api/v1beta1/.import-restrictions

-5
This file was deleted.

exp/ipam/api/v1beta1/.import-restrictions

-5
This file was deleted.

hack/tools/runtime-openapi-gen/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"k8s.io/klog/v2"
2727
"sigs.k8s.io/yaml"
2828

29+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
2930
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3031
runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog"
3132
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
@@ -55,6 +56,7 @@ func main() {
5556
_ = runtimehooksv1.AddToCatalog(c)
5657

5758
c.AddOpenAPIDefinitions(clusterv1.GetOpenAPIDefinitions)
59+
c.AddOpenAPIDefinitions(clusterv1beta1.GetOpenAPIDefinitions)
5860
c.AddOpenAPIDefinitions(GetOpenAPIDefinitions)
5961

6062
openAPI, err := c.OpenAPI(*version)

test/extension/handlers/topologymutation/testdata/clusterclass-quick-start-runtimesdk.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
apiVersion: cluster.x-k8s.io/v1beta1
1+
apiVersion: cluster.x-k8s.io/v1beta2
22
kind: ClusterClass
33
metadata:
44
name: quick-start-runtimesdk
55
spec:
66
controlPlane:
77
ref:
8-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
8+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
99
kind: KubeadmControlPlaneTemplate
1010
name: quick-start-control-plane
1111
machineInfrastructure:
@@ -28,7 +28,7 @@ spec:
2828
template:
2929
bootstrap:
3030
ref:
31-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
31+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
3232
kind: KubeadmConfigTemplate
3333
name: quick-start-default-worker-bootstraptemplate
3434
infrastructure:
@@ -43,7 +43,7 @@ spec:
4343
template:
4444
bootstrap:
4545
ref:
46-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
46+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
4747
kind: KubeadmConfigTemplate
4848
name: quick-start-default-worker-bootstraptemplate
4949
infrastructure:
@@ -85,7 +85,7 @@ spec:
8585
loadBalancer: {}
8686
---
8787
kind: KubeadmControlPlaneTemplate
88-
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
88+
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
8989
metadata:
9090
name: quick-start-control-plane
9191
spec:
@@ -137,7 +137,7 @@ spec:
137137
- containerPath: "/var/run/docker.sock"
138138
hostPath: "/var/run/docker.sock"
139139
---
140-
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
140+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
141141
kind: KubeadmConfigTemplate
142142
metadata:
143143
name: quick-start-default-worker-bootstraptemplate

0 commit comments

Comments
 (0)