Skip to content

Commit 4c79b74

Browse files
sivcharisivchari
committed
replace v1beta1 with v1beta2
Signed-off-by: sivchari <shibuuuu5@gmail.com>
1 parent 482e500 commit 4c79b74

35 files changed

+66
-64
lines changed

‎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
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2"
3434
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3535
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
36-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
37-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
36+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
37+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
3838
)
3939

4040
var (

‎test/extension/handlers/topologymutation/testdata/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
workers:
@@ -33,7 +33,7 @@ spec:
3333
name: quick-start-default-worker-bootstraptemplate
3434
infrastructure:
3535
ref:
36-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
36+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
3737
kind: DockerMachineTemplate
3838
name: quick-start-default-worker-machinetemplate
3939
machinePools:
@@ -48,7 +48,7 @@ spec:
4848
name: quick-start-default-worker-bootstraptemplate
4949
infrastructure:
5050
ref:
51-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
51+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
5252
kind: DockerMachinePoolTemplate
5353
name: quick-start-default-worker-machinepooltemplate
5454
patches:
@@ -58,7 +58,7 @@ spec:
5858
validateExtension: validate-topology.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
5959
discoverVariablesExtension: discover-variables.${EXTENSION_CONFIG_NAME:-"k8s-upgrade-with-runtimesdk"}
6060
---
61-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
61+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
6262
kind: DockerClusterTemplate
6363
metadata:
6464
name: quick-start-cluster
@@ -103,7 +103,7 @@ spec:
103103
joinConfiguration:
104104
nodeRegistration: {} # node registration parameters are automatically injected by CAPD according to the kindest/node image in use.
105105
---
106-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
106+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
107107
kind: DockerMachineTemplate
108108
metadata:
109109
name: quick-start-control-plane
@@ -114,7 +114,7 @@ spec:
114114
- containerPath: "/var/run/docker.sock"
115115
hostPath: "/var/run/docker.sock"
116116
---
117-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
117+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
118118
kind: DockerMachineTemplate
119119
metadata:
120120
name: quick-start-default-worker-machinetemplate
@@ -125,7 +125,7 @@ spec:
125125
- containerPath: "/var/run/docker.sock"
126126
hostPath: "/var/run/docker.sock"
127127
---
128-
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
128+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
129129
kind: DockerMachinePoolTemplate
130130
metadata:
131131
name: quick-start-default-worker-machinepooltemplate

‎test/framework/finalizers_helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster"
3636
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
3737
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
38-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
39-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
38+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
39+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
4040
"sigs.k8s.io/cluster-api/util/patch"
4141
)
4242

‎test/framework/ownerreference_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster"
4141
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
4242
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
43-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
43+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
4444
"sigs.k8s.io/cluster-api/util/patch"
4545
)
4646

‎test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ import (
4343
utilexp "sigs.k8s.io/cluster-api/exp/util"
4444
"sigs.k8s.io/cluster-api/internal/util/ssa"
4545
"sigs.k8s.io/cluster-api/test/infrastructure/container"
46-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
47-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
46+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
47+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
4848
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker"
4949
"sigs.k8s.io/cluster-api/util"
5050
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"

‎test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3535
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
3636
"sigs.k8s.io/cluster-api/internal/util/ssa"
37-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
38-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
37+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
38+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
3939
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker"
4040
"sigs.k8s.io/cluster-api/test/infrastructure/kind"
4141
"sigs.k8s.io/cluster-api/util"

‎test/infrastructure/docker/exp/internal/webhooks/dockermachinepool_webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package webhooks
1919
import (
2020
ctrl "sigs.k8s.io/controller-runtime"
2121

22-
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1"
22+
infraexpv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta2"
2323
)
2424

2525
// DockerMachinePool implements a validating and defaulting webhook for DockerMachinePool.

‎test/infrastructure/docker/internal/controllers/backends/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
ctrl "sigs.k8s.io/controller-runtime"
2323

2424
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
25-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
25+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
2626
"sigs.k8s.io/cluster-api/util/patch"
2727
)
2828

‎test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3333
"sigs.k8s.io/cluster-api/test/infrastructure/container"
34-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
34+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3535
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker"
3636
"sigs.k8s.io/cluster-api/util/conditions"
3737
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"

‎test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"sigs.k8s.io/cluster-api/controllers/clustercache"
3838
utilexp "sigs.k8s.io/cluster-api/exp/util"
3939
"sigs.k8s.io/cluster-api/test/infrastructure/container"
40-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
40+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
4141
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker"
4242
"sigs.k8s.io/cluster-api/util"
4343
"sigs.k8s.io/cluster-api/util/conditions"

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorycluster_backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3131

3232
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
33-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
33+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3434
inmemoryruntime "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/runtime"
3535
inmemoryserver "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/server"
3636
"sigs.k8s.io/cluster-api/util/patch"

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
4040

4141
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
42-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
42+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
4343
cloudv1 "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/cloud/api/v1alpha1"
4444
inmemoryruntime "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/runtime"
4545
inmemoryserver "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/server"

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"sigs.k8s.io/controller-runtime/pkg/client/fake"
4040

4141
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
42-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
42+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
4343
cloudv1 "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/cloud/api/v1alpha1"
4444
inmemoryruntime "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/runtime"
4545
inmemoryserver "sigs.k8s.io/cluster-api/test/infrastructure/inmemory/pkg/server"

‎test/infrastructure/docker/internal/controllers/backends/machine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
ctrl "sigs.k8s.io/controller-runtime"
2323

2424
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
25-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
25+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
2626
"sigs.k8s.io/cluster-api/util/patch"
2727
)
2828

‎test/infrastructure/docker/internal/controllers/devcluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333

3434
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3535
"sigs.k8s.io/cluster-api/test/infrastructure/container"
36-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
36+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3737
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends"
3838
dockerbackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/docker"
3939
inmemorybackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/inmemory"

‎test/infrastructure/docker/internal/controllers/devmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3434
"sigs.k8s.io/cluster-api/controllers/clustercache"
3535
"sigs.k8s.io/cluster-api/test/infrastructure/container"
36-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
36+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3737
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends"
3838
dockerbackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/docker"
3939
inmemorybackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/inmemory"

‎test/infrastructure/docker/internal/controllers/dockercluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3333
"sigs.k8s.io/cluster-api/test/infrastructure/container"
34-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
34+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3535
dockerbackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/docker"
3636
"sigs.k8s.io/cluster-api/util"
3737
"sigs.k8s.io/cluster-api/util/conditions"

‎test/infrastructure/docker/internal/controllers/dockermachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
3434
"sigs.k8s.io/cluster-api/controllers/clustercache"
3535
"sigs.k8s.io/cluster-api/test/infrastructure/container"
36-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
36+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3737
dockerbackend "sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/controllers/backends/docker"
3838
"sigs.k8s.io/cluster-api/util"
3939
"sigs.k8s.io/cluster-api/util/conditions"

‎test/infrastructure/docker/internal/controllers/dockermachine_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2828

2929
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
30-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
30+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3131
)
3232

3333
var (

‎test/infrastructure/docker/internal/controllers/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"k8s.io/client-go/kubernetes/scheme"
2222

2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
24-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
24+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
2525
)
2626

2727
func init() {

‎test/infrastructure/docker/internal/docker/machine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2"
4242
"sigs.k8s.io/cluster-api/internal/util/taints"
4343
"sigs.k8s.io/cluster-api/test/infrastructure/container"
44-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
44+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
4545
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker/types"
4646
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning"
4747
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/provisioning/cloudinit"

‎test/infrastructure/docker/internal/webhooks/devcluster_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/webhook"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2929

30-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
30+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3131
)
3232

3333
// DevCluster implements a validating and defaulting webhook for DevCluster.
@@ -41,7 +41,7 @@ func (webhook *DevCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
4141
Complete()
4242
}
4343

44-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-devcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devclusters,versions=v1beta1,name=default.devcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
44+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-devcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devclusters,versions=v1beta2,name=default.devcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2
4545

4646
var _ webhook.CustomDefaulter = &DevCluster{}
4747

‎test/infrastructure/docker/internal/webhooks/devclustertemplate_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"sigs.k8s.io/cluster-api/feature"
3131
"sigs.k8s.io/cluster-api/internal/util/compare"
32-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
32+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3333
)
3434

3535
// DevClusterTemplate implements a validating and defaulting webhook for DevClusterTemplate.
@@ -43,7 +43,7 @@ func (webhook *DevClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) err
4343
Complete()
4444
}
4545

46-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-devclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devclustertemplates,versions=v1beta1,name=default.devclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
46+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-devclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devclustertemplates,versions=v1beta2,name=default.devclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2
4747

4848
var _ webhook.CustomDefaulter = &DevClusterTemplate{}
4949

‎test/infrastructure/docker/internal/webhooks/devclustertemplate_webhook_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
utilfeature "k8s.io/component-base/featuregate/testing"
2626

27-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
2828
"sigs.k8s.io/cluster-api/feature"
29-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
29+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3030
)
3131

3232
func TestDevClusterTemplateValidationFeatureGateEnabled(t *testing.T) {
@@ -107,7 +107,7 @@ func TestDevClusterTemplateValidationMetadata(t *testing.T) {
107107
},
108108
Spec: infrav1.DevClusterTemplateSpec{
109109
Template: infrav1.DevClusterTemplateResource{
110-
ObjectMeta: clusterv1beta1.ObjectMeta{
110+
ObjectMeta: clusterv1.ObjectMeta{
111111
Labels: map[string]string{
112112
"foo": "$invalid-key",
113113
"bar": strings.Repeat("a", 64) + "too-long-value",

‎test/infrastructure/docker/internal/webhooks/devmachine_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/webhook"
2727
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2828

29-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
29+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3030
)
3131

3232
// DevMachine implements a validating and defaulting webhook for DevMachine.
@@ -40,7 +40,7 @@ func (webhook *DevMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
4040
Complete()
4141
}
4242

43-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-devmachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devmachines,versions=v1beta1,name=default.devmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
43+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-devmachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devmachines,versions=v1beta2,name=default.devmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2
4444

4545
var _ webhook.CustomDefaulter = &DevMachine{}
4646

‎test/infrastructure/docker/internal/webhooks/devmachinetemplate_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2929

3030
"sigs.k8s.io/cluster-api/internal/util/compare"
31-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
31+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3232
"sigs.k8s.io/cluster-api/util/topology"
3333
)
3434

@@ -44,7 +44,7 @@ func (webhook *DevMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) err
4444
Complete()
4545
}
4646

47-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-devmachinetemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devmachinetemplates,versions=v1beta1,name=default.devmachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
47+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-devmachinetemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=devmachinetemplates,versions=v1beta2,name=default.devmachinetemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta2
4848

4949
var _ webhook.CustomDefaulter = &DevMachineTemplate{}
5050

‎test/infrastructure/docker/internal/webhooks/devmachinetemplate_webhook_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ import (
2727
"k8s.io/utils/ptr"
2828
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
2929

30-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
3130
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
32-
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
31+
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
3332
)
3433

3534
func TestDevMachineTemplateInvalid(t *testing.T) {
@@ -52,7 +51,7 @@ func TestDevMachineTemplateInvalid(t *testing.T) {
5251
newTemplateSkipImmutabilityAnnotationSet.SetAnnotations(map[string]string{clusterv1.TopologyDryRunAnnotation: ""})
5352

5453
newTemplateWithInvalidMetadata := newTemplate.DeepCopy()
55-
newTemplateWithInvalidMetadata.Spec.Template.ObjectMeta = clusterv1beta1.ObjectMeta{
54+
newTemplateWithInvalidMetadata.Spec.Template.ObjectMeta = clusterv1.ObjectMeta{
5655
Labels: map[string]string{
5756
"foo": "$invalid-key",
5857
"bar": strings.Repeat("a", 64) + "too-long-value",

0 commit comments

Comments
 (0)