Skip to content

Commit 1b0013c

Browse files
sivcharisivchari
committed
replace v1beta1 with v1beta2
Signed-off-by: sivchari <[email protected]>
1 parent 7cef409 commit 1b0013c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+105
-148
lines changed

‎test/e2e/config/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ providers:
352352
- sourcePath: "../data/infrastructure-docker/main/clusterclass-quick-start-kcp-only.yaml"
353353
- sourcePath: "../data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml"
354354
- sourcePath: "../data/infrastructure-docker/main/clusterclass-in-memory.yaml"
355-
- sourcePath: "../data/shared/main/docker/metadata.yaml"
355+
- sourcePath: "../data/shared/main/metadata.yaml"
356356

357357
- name: test-extension
358358
type: RuntimeExtensionProvider

‎test/e2e/data/infrastructure-docker/main/bases/cluster-with-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# DockerCluster object referenced by the Cluster object
3-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
44
kind: DockerCluster
55
metadata:
66
name: '${CLUSTER_NAME}'
@@ -40,7 +40,7 @@ spec:
4040
cidrBlocks: ['${DOCKER_POD_CIDRS}']
4141
serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
4242
infrastructureRef:
43-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
43+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4444
kind: DockerCluster
4545
name: '${CLUSTER_NAME}'
4646
controlPlaneRef:

‎test/e2e/data/infrastructure-docker/main/bases/md.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# DockerMachineTemplate referenced by the MachineDeployment and with
33
# - extraMounts for the docker sock, thus allowing self-hosting test
4-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
4+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
55
kind: DockerMachineTemplate
66
metadata:
77
name: "${CLUSTER_NAME}-md-0"
@@ -46,6 +46,6 @@ spec:
4646
kind: KubeadmConfigTemplate
4747
infrastructureRef:
4848
name: "${CLUSTER_NAME}-md-0"
49-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
49+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
5050
kind: DockerMachineTemplate
5151
failureDomain: fd4

‎test/e2e/data/infrastructure-docker/main/bases/mp.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# MachinePool which references the DockerMachinePool and KubeadmConfigTemplate below
3-
apiVersion: cluster.x-k8s.io/v1beta1
3+
apiVersion: cluster.x-k8s.io/v1beta2
44
kind: MachinePool
55
metadata:
66
name: "${CLUSTER_NAME}-mp-0"
@@ -16,7 +16,7 @@ spec:
1616
name: "${CLUSTER_NAME}-mp-0-config"
1717
clusterName: '${CLUSTER_NAME}'
1818
infrastructureRef:
19-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
19+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2020
kind: DockerMachinePool
2121
name: "${CLUSTER_NAME}-dmp-0"
2222
version: "${KUBERNETES_VERSION}"
@@ -28,7 +28,7 @@ spec:
2828
- fd8
2929
---
3030
# DockerMachinePool using default values referenced by the MachinePool
31-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
31+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3232
kind: DockerMachinePool
3333
metadata:
3434
name: "${CLUSTER_NAME}-dmp-0"

‎test/e2e/data/infrastructure-docker/main/cluster-template-ipv6/cluster-ipv6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
pods:
1111
cidrBlocks: ['${DOCKER_POD_IPV6_CIDRS}']
1212
---
13-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
13+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1414
kind: DockerCluster
1515
metadata:
1616
name: '${CLUSTER_NAME}'

‎test/e2e/data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# DockerCluster object referenced by the Cluster object
3-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
44
kind: DockerCluster
55
metadata:
66
name: '${CLUSTER_NAME}'
@@ -22,12 +22,12 @@ spec:
2222
cidrBlocks: ['${DOCKER_POD_CIDRS}']
2323
serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
2424
infrastructureRef:
25-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2626
kind: DockerCluster
2727
name: '${CLUSTER_NAME}'
2828
---
2929
# DockerMachine referenced by the Machine cp0
30-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
30+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3131
kind: DockerMachine
3232
metadata:
3333
name: "${CLUSTER_NAME}-control-plane-0"
@@ -64,5 +64,5 @@ spec:
6464
kind: KubeadmConfig
6565
infrastructureRef:
6666
name: "${ CLUSTER_NAME }-control-plane-0"
67-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
67+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6868
kind: DockerMachine

‎test/e2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# DockerCluster object referenced by the Cluster object
3-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
44
kind: DockerCluster
55
metadata:
66
name: '${CLUSTER_NAME}'
@@ -22,7 +22,7 @@ spec:
2222
cidrBlocks: ['${DOCKER_POD_CIDRS}']
2323
serviceDomain: '${DOCKER_SERVICE_DOMAIN}'
2424
infrastructureRef:
25-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
25+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2626
kind: DockerCluster
2727
name: '${CLUSTER_NAME}'
2828
controlPlaneRef:
@@ -31,7 +31,7 @@ spec:
3131
name: "${CLUSTER_NAME}-control-plane"
3232
---
3333
# DockerMachineTemplate object referenced by the KubeadmControlPlane object
34-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
34+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3535
kind: DockerMachineTemplate
3636
metadata:
3737
name: "${CLUSTER_NAME}-control-plane"
@@ -50,7 +50,7 @@ spec:
5050
machineTemplate:
5151
infrastructureRef:
5252
kind: DockerMachineTemplate
53-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
53+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
5454
name: "${CLUSTER_NAME}-control-plane"
5555
kubeadmConfigSpec:
5656
clusterConfiguration:

‎test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ spec:
1111
machineInfrastructure:
1212
ref:
1313
kind: DockerMachineTemplate
14-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
14+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
1515
name: quick-start-control-plane
1616
namingStrategy:
1717
template: "{{ .cluster.name }}-cp-{{ .random }}"
1818
infrastructure:
1919
ref:
20-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
20+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2121
kind: DockerClusterTemplate
2222
name: quick-start-cluster
2323
infrastructureNamingStrategy:
@@ -35,7 +35,7 @@ spec:
3535
name: quick-start-default-worker-bootstraptemplate
3636
infrastructure:
3737
ref:
38-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
38+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3939
kind: DockerMachineTemplate
4040
name: quick-start-default-worker-machinetemplate
4141
machinePools:
@@ -50,7 +50,7 @@ spec:
5050
name: quick-start-default-worker-bootstraptemplate
5151
infrastructure:
5252
ref:
53-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
53+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
5454
kind: DockerMachinePoolTemplate
5555
name: quick-start-default-worker-machinepooltemplate
5656
patches:
@@ -60,7 +60,7 @@ spec:
6060
validateExtension: validate-topology.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
6161
discoverVariablesExtension: discover-variables.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
6262
---
63-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
63+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6464
kind: DockerClusterTemplate
6565
metadata:
6666
name: quick-start-cluster
@@ -104,7 +104,7 @@ spec:
104104
joinConfiguration:
105105
nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
106106
---
107-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
107+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
108108
kind: DockerMachineTemplate
109109
metadata:
110110
name: quick-start-control-plane
@@ -116,7 +116,7 @@ spec:
116116
hostPath: "/var/run/docker.sock"
117117
preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
118118
---
119-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
119+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
120120
kind: DockerMachineTemplate
121121
metadata:
122122
name: quick-start-default-worker-machinetemplate
@@ -128,7 +128,7 @@ spec:
128128
hostPath: "/var/run/docker.sock"
129129
preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
130130
---
131-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
131+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
132132
kind: DockerMachinePoolTemplate
133133
metadata:
134134
name: quick-start-default-worker-machinepooltemplate

‎test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
machineInfrastructure:
1717
ref:
1818
kind: DockerMachineTemplate
19-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
19+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
2020
name: quick-start-control-plane
2121
machineHealthCheck:
2222
maxUnhealthy: 100%
@@ -26,7 +26,7 @@ spec:
2626
timeout: 20s
2727
infrastructure:
2828
ref:
29-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
29+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3030
kind: DockerClusterTemplate
3131
name: quick-start-cluster
3232
workers:
@@ -45,7 +45,7 @@ spec:
4545
name: quick-start-md-default-worker-bootstraptemplate
4646
infrastructure:
4747
ref:
48-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
48+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
4949
kind: DockerMachineTemplate
5050
name: quick-start-default-worker-machinetemplate
5151
machineHealthCheck:
@@ -66,7 +66,7 @@ spec:
6666
name: quick-start-mp-default-worker-bootstraptemplate
6767
infrastructure:
6868
ref:
69-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
69+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
7070
kind: DockerMachinePoolTemplate
7171
name: quick-start-default-worker-machinepooltemplate
7272
variables:
@@ -166,7 +166,7 @@ spec:
166166
- name: lbImageRepository
167167
definitions:
168168
- selector:
169-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
169+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
170170
kind: DockerClusterTemplate
171171
matchResources:
172172
infrastructureCluster: true
@@ -211,7 +211,7 @@ spec:
211211
description: "Sets the container image that is used for running dockerMachines for the controlPlane and default-worker machineDeployments."
212212
definitions:
213213
- selector:
214-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
214+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
215215
kind: DockerMachineTemplate
216216
matchResources:
217217
machineDeploymentClass:
@@ -224,7 +224,7 @@ spec:
224224
template: |
225225
kindest/node:{{ .builtin.machineDeployment.version | replace "+" "_" }}
226226
- selector:
227-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
227+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
228228
kind: DockerMachineTemplate
229229
matchResources:
230230
controlPlane: true
@@ -235,7 +235,7 @@ spec:
235235
template: |
236236
kindest/node:{{ .builtin.controlPlane.version | replace "+" "_" }}
237237
- selector:
238-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
238+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
239239
kind: DockerMachinePoolTemplate
240240
matchResources:
241241
machinePoolClass:
@@ -254,7 +254,7 @@ spec:
254254
and reduce load to public registries.
255255
definitions:
256256
- selector:
257-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
257+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
258258
kind: DockerMachineTemplate
259259
matchResources:
260260
controlPlane: true
@@ -273,7 +273,7 @@ spec:
273273
and reduce load to public registries.
274274
definitions:
275275
- selector:
276-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
276+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
277277
kind: DockerMachinePoolTemplate
278278
matchResources:
279279
machinePoolClass:
@@ -483,7 +483,7 @@ spec:
483483
valueFrom:
484484
variable: kubeletLogLevel
485485
---
486-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
486+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
487487
kind: DockerClusterTemplate
488488
metadata:
489489
name: quick-start-cluster
@@ -565,7 +565,7 @@ spec:
565565
kubeletExtraArgs: # having a not empty kubeletExtraArgs is required for the externalCloudProvider patch to work
566566
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
567567
---
568-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
568+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
569569
kind: DockerMachineTemplate
570570
metadata:
571571
name: quick-start-control-plane
@@ -586,7 +586,7 @@ spec:
586586
hostPath: "/var/run/docker.sock"
587587
preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
588588
---
589-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
589+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
590590
kind: DockerMachineTemplate
591591
metadata:
592592
name: quick-start-default-worker-machinetemplate
@@ -607,7 +607,7 @@ spec:
607607
hostPath: "/var/run/docker.sock"
608608
preLoadImages: ${DOCKER_PRELOAD_IMAGES:-[]}
609609
---
610-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
610+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
611611
kind: DockerMachinePoolTemplate
612612
metadata:
613613
name: quick-start-default-worker-machinepooltemplate

‎test/e2e/data/shared/main/docker/metadata.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/extension/handlers/topologymutation/handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import (
3838
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3939
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
4040
"sigs.k8s.io/cluster-api/exp/runtime/topologymutation"
41-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
42-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
41+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
42+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
4343
"sigs.k8s.io/cluster-api/test/infrastructure/kind"
4444
"sigs.k8s.io/cluster-api/util/version"
4545
)

0 commit comments

Comments
 (0)