Skip to content

Commit d442968

Browse files
fabriziopandinifabriziopandini
committed
Cleanup unnecessary v1beta1 usage
1 parent 6ff76ad commit d442968

File tree

19 files changed

+119
-62
lines changed

19 files changed

+119
-62
lines changed

‎bootstrap/kubeadm/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
"sigs.k8s.io/controller-runtime/pkg/webhook"
4848

4949
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
50+
bootstrapv1beta1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
5051
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta2"
5152
kubeadmbootstrapcontrollers "sigs.k8s.io/cluster-api/bootstrap/kubeadm/controllers"
5253
"sigs.k8s.io/cluster-api/bootstrap/kubeadm/internal/webhooks"
@@ -103,6 +104,7 @@ func init() {
103104
_ = expv1.AddToScheme(scheme)
104105
_ = bootstrapv1alpha3.AddToScheme(scheme)
105106
_ = bootstrapv1alpha4.AddToScheme(scheme)
107+
_ = bootstrapv1beta1.AddToScheme(scheme)
106108
_ = bootstrapv1.AddToScheme(scheme)
107109
}
108110

‎cmd/clusterctl/client/clusterclass_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func TestAddClusterClassIfMissing(t *testing.T) {
196196
ObjectMeta: metav1.ObjectMeta{
197197
Name: fmt.Sprintf("clusters.%s", clusterv1.GroupVersion.Group),
198198
Labels: map[string]string{
199-
clusterv1.GroupVersion.String(): "v1beta1",
199+
clusterv1.GroupVersion.String(): clusterv1.GroupVersion.Version,
200200
},
201201
},
202202
Spec: apiextensionsv1.CustomResourceDefinitionSpec{

‎controlplane/kubeadm/main.go

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import (
5454
"sigs.k8s.io/cluster-api/controllers/clustercache"
5555
"sigs.k8s.io/cluster-api/controllers/crdmigrator"
5656
"sigs.k8s.io/cluster-api/controllers/remote"
57+
controlplanev1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
5758
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta2"
5859
kubeadmcontrolplanecontrollers "sigs.k8s.io/cluster-api/controlplane/kubeadm/controllers"
5960
"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/etcd"
@@ -108,6 +109,7 @@ func init() {
108109
_ = expv1.AddToScheme(scheme)
109110
_ = controlplanev1alpha3.AddToScheme(scheme)
110111
_ = controlplanev1alpha4.AddToScheme(scheme)
112+
_ = controlplanev1beta1.AddToScheme(scheme)
111113
_ = controlplanev1.AddToScheme(scheme)
112114
_ = bootstrapv1.AddToScheme(scheme)
113115
_ = apiextensionsv1.AddToScheme(scheme)

‎exp/runtime/topologymutation/walker_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func Test_WalkTemplates(t *testing.T) {
106106
{
107107
UID: types.UID("1"),
108108
Object: runtime.RawExtension{
109-
Raw: []byte("{\"kind\":\"Unknown\",\"apiVersion\":\"controlplane.cluster.x-k8s.io/v1beta1\"}"),
109+
Raw: []byte("{\"kind\":\"Unknown\",\"apiVersion\":\"controlplane.cluster.x-k8s.io/v1beta2\"}"),
110110
},
111111
},
112112
},
@@ -122,15 +122,15 @@ func Test_WalkTemplates(t *testing.T) {
122122
{
123123
UID: types.UID("1"),
124124
Object: runtime.RawExtension{
125-
Raw: []byte("{\"kind\":\"Unknown\",\"apiVersion\":\"controlplane.cluster.x-k8s.io/v1beta1\"}"),
125+
Raw: []byte("{\"kind\":\"Unknown\",\"apiVersion\":\"controlplane.cluster.x-k8s.io/v1beta2\"}"),
126126
},
127127
},
128128
},
129129
expectedResponse: &runtimehooksv1.GeneratePatchesResponse{
130130
CommonResponse: runtimehooksv1.CommonResponse{
131131
Status: runtimehooksv1.ResponseStatusFailure,
132132
Message: "no kind \"Unknown\" is registered for version \"controlplane.cluster.x-k8s." +
133-
"io/v1beta1\" in scheme",
133+
"io/v1beta2\" in scheme",
134134
},
135135
},
136136
options: []WalkTemplatesOption{
@@ -146,16 +146,16 @@ func Test_WalkTemplates(t *testing.T) {
146146
Raw: toJSON(kubeadmConfigTemplate),
147147
},
148148
HolderReference: runtimehooksv1.HolderReference{
149-
APIVersion: "invalid/cluster.x-k8s.io/v1beta1",
149+
APIVersion: "invalid/cluster.x-k8s.io/vx",
150150
},
151151
},
152152
},
153153
expectedResponse: &runtimehooksv1.GeneratePatchesResponse{
154154
CommonResponse: runtimehooksv1.CommonResponse{
155155
Status: runtimehooksv1.ResponseStatusFailure,
156156
Message: "error generating patches - HolderReference apiVersion \"invalid/cluster.x-k8s." +
157-
"io/v1beta1\" is not in valid format: unexpected GroupVersion string: invalid/cluster.x-k8s." +
158-
"io/v1beta1",
157+
"io/vx\" is not in valid format: unexpected GroupVersion string: invalid/cluster.x-k8s." +
158+
"io/vx",
159159
},
160160
},
161161
options: []WalkTemplatesOption{

‎internal/controllers/machineset/machineset_preflight_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ func TestMachineSetReconciler_runPreflightChecks(t *testing.T) {
588588
Spec: clusterv1.MachineSpec{
589589
Version: ptr.To("v1.26.2"),
590590
Bootstrap: clusterv1.Bootstrap{ConfigRef: &corev1.ObjectReference{
591-
APIVersion: "bootstrap.cluster.x-k8s.io/v1beta1/invalid",
591+
APIVersion: "bootstrap.cluster.x-k8s.io/vx/invalid",
592592
Kind: "KubeadmConfigTemplate",
593593
}},
594594
},

‎internal/controllers/topology/cluster/current_state_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
corev1 "k8s.io/api/core/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
30+
"k8s.io/apimachinery/pkg/runtime/schema"
3031
"k8s.io/utils/ptr"
3132
"sigs.k8s.io/controller-runtime/pkg/client"
3233
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -1247,8 +1248,11 @@ func TestAlignRefAPIVersion(t *testing.T) {
12471248
{
12481249
name: "Use apiVersion from currentRef: group is different",
12491250
templateFromClusterClass: &unstructured.Unstructured{Object: map[string]interface{}{
1250-
"apiVersion": "bootstrap2.cluster.x-k8s.io/v1beta1",
1251-
"kind": "KubeadmConfigTemplate",
1251+
"apiVersion": schema.GroupVersion{
1252+
Group: "foo",
1253+
Version: clusterv1.GroupVersionBootstrap.String(),
1254+
}.String(),
1255+
"kind": "KubeadmConfigTemplate",
12521256
}},
12531257
currentRef: &corev1.ObjectReference{
12541258
APIVersion: clusterv1.GroupVersionBootstrap.String(),

‎internal/controllers/topology/cluster/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
func TestGetReference(t *testing.T) {
3636
fakeControlPlaneTemplateCRDv99 := builder.GenericControlPlaneTemplateCRD.DeepCopy()
3737
fakeControlPlaneTemplateCRDv99.Labels = map[string]string{
38-
clusterv1.GroupVersion.String(): "v1beta1_v99",
38+
clusterv1.GroupVersion.String(): "v99",
3939
}
4040
crds := []client.Object{
4141
fakeControlPlaneTemplateCRDv99,

‎internal/topology/check/compatibility_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ var referencedObjectsCompatibilityTestCases = []referencedObjectsCompatibilityTe
4141
name: "Fails if group changes",
4242
current: &unstructured.Unstructured{
4343
Object: map[string]interface{}{
44-
"apiVersion": "foo/v1beta1",
44+
"apiVersion": "foo/vx",
4545
},
4646
},
4747
desired: &unstructured.Unstructured{
4848
Object: map[string]interface{}{
49-
"apiVersion": "bar/v1beta1",
49+
"apiVersion": "bar/vx",
5050
},
5151
},
5252
wantErr: true,

‎internal/webhooks/patch_validation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ func Test_validateSelectors(t *testing.T) {
15781578
WithInfrastructureClusterTemplate(
15791579
refToUnstructured(
15801580
&corev1.ObjectReference{
1581-
APIVersion: "nonmatchinginfrastructure.cluster.x-k8s.io/v1beta1",
1581+
APIVersion: "nonmatchinginfrastructure.cluster.x-k8s.io/vx",
15821582
Kind: "InfrastructureClusterTemplate",
15831583
}),
15841584
).

‎main.go

+6
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,16 @@ import (
5353
"sigs.k8s.io/controller-runtime/pkg/controller"
5454
"sigs.k8s.io/controller-runtime/pkg/webhook"
5555

56+
addonsv1beta1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
5657
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
58+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
5759
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
5860
"sigs.k8s.io/cluster-api/api/v1beta2/index"
5961
"sigs.k8s.io/cluster-api/controllers"
6062
"sigs.k8s.io/cluster-api/controllers/clustercache"
6163
"sigs.k8s.io/cluster-api/controllers/crdmigrator"
6264
"sigs.k8s.io/cluster-api/controllers/remote"
65+
expv1beta1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
6366
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta2"
6467
expcontrollers "sigs.k8s.io/cluster-api/exp/controllers"
6568
ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta2"
@@ -140,14 +143,17 @@ func init() {
140143

141144
_ = clusterv1alpha3.AddToScheme(scheme)
142145
_ = clusterv1alpha4.AddToScheme(scheme)
146+
_ = clusterv1beta1.AddToScheme(scheme)
143147
_ = clusterv1.AddToScheme(scheme)
144148

145149
_ = addonsv1alpha3.AddToScheme(scheme)
146150
_ = addonsv1alpha4.AddToScheme(scheme)
151+
_ = addonsv1beta1.AddToScheme(scheme)
147152
_ = addonsv1.AddToScheme(scheme)
148153

149154
_ = expv1alpha3.AddToScheme(scheme)
150155
_ = expv1alpha4.AddToScheme(scheme)
156+
_ = expv1beta1.AddToScheme(scheme)
151157
_ = expv1.AddToScheme(scheme)
152158

153159
_ = runtimev1.AddToScheme(scheme)

‎metadata.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kind: Metadata
88
releaseSeries:
99
- major: 1
1010
minor: 11
11-
contract: v1beta1
11+
contract: v1beta2
1212
- major: 1
1313
minor: 10
1414
contract: v1beta1

‎test/e2e/clusterctl_upgrade.go

+8-10
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ type ClusterctlUpgradeSpecInput struct {
129129
WorkloadKubernetesVersion string
130130

131131
// Upgrades allows to define upgrade sequences.
132-
// If not set, the test will upgrade once to the v1beta1 contract.
132+
// If not set, the test will upgrade once to the latest contract.
133133
// For some examples see clusterctl_upgrade_test.go
134134
Upgrades []ClusterctlUpgradeSpecInputUpgrade
135135

@@ -161,7 +161,7 @@ type ClusterctlUpgradeSpecInputUpgrade struct {
161161

162162
// ClusterctlUpgradeSpec implements a test that verifies clusterctl upgrade of a management cluster.
163163
//
164-
// NOTE: this test is designed to test older versions of Cluster API --> v1beta1 upgrades.
164+
// NOTE: this test is designed to test older versions of Cluster API --> latest contract version upgrades.
165165
// This spec will create a workload cluster, which will be converted into a new management cluster (henceforth called secondary
166166
// managemnet cluster)
167167
// with the older version of Cluster API and infrastructure provider. It will then create an additional
@@ -231,7 +231,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
231231
initClusterctlBinaryURL = clusterctlBinaryURLReplacer.Replace(clusterctlBinaryURLTemplate)
232232

233233
// NOTE: by default we are considering all the providers, no matter of the contract.
234-
// However, given that we want to test both v1alpha3 --> v1beta1 and v1alpha4 --> v1beta1,
234+
// However, given that we want to test both v1alpha3 --> v1beta1, v1alpha4 --> v1beta1, v1beta1 --> v1beta2,
235235
// InitWithProvidersContract can be used to select versions with a specific contract.
236236
initContract = "*"
237237
if input.InitWithProvidersContract != "" {
@@ -241,7 +241,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
241241
initKubernetesVersion = input.InitWithKubernetesVersion
242242

243243
if len(input.Upgrades) == 0 {
244-
// Upgrade once to v1beta1 if no upgrades are specified.
244+
// Upgrade once to latest contract version if no upgrades are specified.
245245
input.Upgrades = []ClusterctlUpgradeSpecInputUpgrade{
246246
{
247247
Contract: clusterv1.GroupVersion.Version,
@@ -467,7 +467,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
467467

468468
coreCAPIStorageVersion := getCoreCAPIStorageVersion(ctx, managementClusterProxy.GetClient())
469469

470-
// Note: We have to use unstructured here as the Cluster could be e.g. v1alpha3 / v1alpha4 / v1beta1.
470+
// Note: We have to use unstructured here as the Cluster could use also old API versions.
471471
workloadClusterUnstructured := discoveryAndWaitForCluster(ctx, discoveryAndWaitForClusterInput{
472472
Client: managementClusterProxy.GetClient(),
473473
CoreCAPIStorageVersion: coreCAPIStorageVersion,
@@ -609,7 +609,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
609609
// We have to get the core CAPI storage version again as the upgrade might have stopped serving v1alpha3/v1alpha4.
610610
coreCAPIStorageVersion = getCoreCAPIStorageVersion(ctx, managementClusterProxy.GetClient())
611611

612-
// Note: Currently we only support v1beta1 core CAPI apiVersion after upgrades.
612+
// Note: Currently we only support v1beta2 core CAPI apiVersion after upgrades.
613613
// This seems a reasonable simplification as we don't want to test upgrades to v1alpha3 / v1alpha4.
614614
workloadCluster := framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
615615
Getter: managementClusterProxy.GetClient(),
@@ -891,8 +891,7 @@ func discoveryAndWaitForCluster(ctx context.Context, input discoveryAndWaitForCl
891891
func calculateExpectedMachineDeploymentMachineCount(ctx context.Context, c client.Client, unstructuredCluster *unstructured.Unstructured, coreCAPIStorageVersion string) int64 {
892892
var expectedMachineDeploymentWorkerCount int64
893893

894-
// Convert v1beta1 unstructured Cluster to clusterv1.Cluster
895-
// Only v1beta1 Cluster support ClusterClass (i.e. have cluster.spec.topology).
894+
// Convert unstructured Cluster to Cluster.
896895
if unstructuredCluster.GroupVersionKind().Version == clusterv1.GroupVersion.Version {
897896
cluster := &clusterv1.Cluster{}
898897
Expect(apiruntime.DefaultUnstructuredConverter.FromUnstructured(unstructuredCluster.Object, cluster)).To(Succeed())
@@ -968,8 +967,7 @@ func calculateExpectedMachinePoolMachineCount(ctx context.Context, c client.Clie
968967
func calculateExpectedMachinePoolNodeCount(ctx context.Context, c client.Client, unstructuredCluster *unstructured.Unstructured, coreCAPIStorageVersion string) int64 {
969968
var expectedMachinePoolWorkerCount int64
970969

971-
// Convert v1beta1 unstructured Cluster to clusterv1.Cluster
972-
// Only v1beta1 Cluster support ClusterClass (i.e. have cluster.spec.topology).
970+
// Convert unstructured Cluster to Cluster
973971
if unstructuredCluster.GroupVersionKind().Version == clusterv1.GroupVersion.Version {
974972
cluster := &clusterv1.Cluster{}
975973
Expect(apiruntime.DefaultUnstructuredConverter.FromUnstructured(unstructuredCluster.Object, cluster)).To(Succeed())

‎test/e2e/clusterctl_upgrade_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ var _ = Describe("When testing clusterctl upgrades (v0.3=>v1.5=>current)", Flake
9797
ControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease15)},
9898
InfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease15)},
9999
},
100-
{ // Upgrade to latest v1beta1.
100+
{ // Upgrade to latest contract version.
101101
Contract: clusterv1.GroupVersion.Version,
102102
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
103103
framework.ValidateCRDMigration(ctx, proxy, namespace, clusterName,
@@ -182,7 +182,7 @@ var _ = Describe("When testing clusterctl upgrades (v0.4=>v1.6=>current)", Flake
182182
ControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, stableRelease16)},
183183
InfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease16)},
184184
},
185-
{ // Upgrade to latest v1beta1.
185+
{ // Upgrade to latest contract version.
186186
Contract: clusterv1.GroupVersion.Version,
187187
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
188188
framework.ValidateCRDMigration(ctx, proxy, namespace, clusterName,
@@ -255,7 +255,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur
255255
InitWithInfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease)},
256256
InitWithProvidersContract: "v1beta1",
257257
Upgrades: []ClusterctlUpgradeSpecInputUpgrade{
258-
{ // Upgrade to latest v1beta1.
258+
{ // Upgrade to latest contract version.
259259
Contract: clusterv1.GroupVersion.Version,
260260
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
261261
framework.ValidateCRDMigration(ctx, proxy, namespace, clusterName,
@@ -290,7 +290,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
290290
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
291291
InitWithProvidersContract: "v1beta1",
292292
Upgrades: []ClusterctlUpgradeSpecInputUpgrade{
293-
{ // Upgrade to latest v1beta1.
293+
{ // Upgrade to latest contract version.
294294
Contract: clusterv1.GroupVersion.Version,
295295
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
296296
framework.ValidateCRDMigration(ctx, proxy, namespace, clusterName,
@@ -327,7 +327,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
327327
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease),
328328
InitWithProvidersContract: "v1beta1",
329329
Upgrades: []ClusterctlUpgradeSpecInputUpgrade{
330-
{ // Upgrade to latest v1beta1.
330+
{ // Upgrade to latest contract version.
331331
Contract: clusterv1.GroupVersion.Version,
332332
PostUpgrade: func(proxy framework.ClusterProxy, namespace, clusterName string) {
333333
framework.ValidateCRDMigration(ctx, proxy, namespace, clusterName,

‎test/e2e/config/docker.yaml

+1-1
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/metadata.yaml"
355+
- sourcePath: "../data/shared/main/metadata-docker.yaml"
356356

357357
- name: test-extension
358358
type: RuntimeExtensionProvider

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

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
2+
kind: Metadata
3+
releaseSeries:
4+
- major: 1
5+
minor: 11
6+
contract: v1beta1
7+
- major: 1
8+
minor: 10
9+
contract: v1beta1
10+
- major: 1
11+
minor: 9
12+
contract: v1beta1
13+
- major: 1
14+
minor: 8
15+
contract: v1beta1
16+
- major: 1
17+
minor: 7
18+
contract: v1beta1
19+
- major: 1
20+
minor: 6
21+
contract: v1beta1
22+
- major: 1
23+
minor: 5
24+
contract: v1beta1
25+
- major: 1
26+
minor: 4
27+
contract: v1beta1
28+
- major: 1
29+
minor: 3
30+
contract: v1beta1
31+
- major: 1
32+
minor: 2
33+
contract: v1beta1
34+
- major: 1
35+
minor: 1
36+
contract: v1beta1
37+
- major: 1
38+
minor: 0
39+
contract: v1beta1
40+
- major: 0
41+
minor: 4
42+
contract: v1alpha4
43+
- major: 0
44+
minor: 3
45+
contract: v1alpha3

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Metadata
33
releaseSeries:
44
- major: 1
55
minor: 11
6-
contract: v1beta1
6+
contract: v1beta2
77
- major: 1
88
minor: 10
99
contract: v1beta1

‎test/framework/kubernetesversions/data/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ patches:
99
group: controlplane.cluster.x-k8s.io
1010
kind: KubeadmControlPlane
1111
name: .*-control-plane
12-
version: v1beta1
12+
version: v1beta2
1313
- path: kubeadmconfigtemplate-patch.yaml
1414
target:
1515
group: bootstrap.cluster.x-k8s.io
1616
kind: KubeadmConfigTemplate
1717
name: .*-md-0
18-
version: v1beta1
18+
version: v1beta2
1919
- path: platform-kustomization.yaml

0 commit comments

Comments
 (0)