Skip to content

Commit c080701

Browse files
spowelljrspowelljr
authored
Merge pull request #19790 from fbyrne/feature/19788
Adds support for kubeadm.k8s.io/v1beta4 available since k8s v1.31
2 parents c090344 + b9d2e2c commit c080701

20 files changed

+349
-133
lines changed

‎hack/update/kubernetes_version/templates/v1beta3/containerd-api-port.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/containerd-api-port.yaml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,30 +14,36 @@ nodeRegistration:
1414
criSocket: unix:///run/containerd/containerd.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
28-
allocate-node-cidrs: "true"
29-
leader-elect: "false"
30+
- name: "allocate-node-cidrs"
31+
value: "true"
32+
- name: "leader-elect"
33+
value: "false"
3034
scheduler:
3135
extraArgs:
32-
leader-elect: "false"
36+
- name: "leader-elect"
37+
value: "false"
3338
certificatesDir: /var/lib/minikube/certs
3439
clusterName: mk
3540
controlPlaneEndpoint: control-plane.minikube.internal:12345
3641
etcd:
3742
local:
3843
dataDir: /var/lib/minikube/etcd
3944
extraArgs:
40-
proxy-refresh-interval: "70000"
45+
- name: "proxy-refresh-interval"
46+
value: "70000"
4147
kubernetesVersion: v1.23.0
4248
networking:
4349
dnsDomain: cluster.local

‎hack/update/kubernetes_version/templates/v1beta3/containerd-pod-network-cidr.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/containerd-pod-network-cidr.yaml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,30 +14,36 @@ nodeRegistration:
1414
criSocket: unix:///run/containerd/containerd.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
28-
allocate-node-cidrs: "true"
29-
leader-elect: "false"
30+
- name: "allocate-node-cidrs"
31+
value: "true"
32+
- name: "leader-elect"
33+
value: "false"
3034
scheduler:
3135
extraArgs:
32-
leader-elect: "false"
36+
- name: "leader-elect"
37+
value: "false"
3338
certificatesDir: /var/lib/minikube/certs
3439
clusterName: mk
3540
controlPlaneEndpoint: control-plane.minikube.internal:8443
3641
etcd:
3742
local:
3843
dataDir: /var/lib/minikube/etcd
3944
extraArgs:
40-
proxy-refresh-interval: "70000"
45+
- name: "proxy-refresh-interval"
46+
value: "70000"
4147
kubernetesVersion: v1.23.0
4248
networking:
4349
dnsDomain: cluster.local

‎hack/update/kubernetes_version/templates/v1beta3/containerd.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/containerd.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
1414
criSocket: unix:///run/containerd/containerd.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
2830
allocate-node-cidrs: "true"

‎hack/update/kubernetes_version/templates/v1beta3/crio-options-gates.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/crio-options-gates.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
1414
criSocket: unix:///var/run/crio/crio.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
fail-no-swap: "true"
2729
feature-gates: "a=b"
2830
controllerManager:

‎hack/update/kubernetes_version/templates/v1beta3/crio.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/crio.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
1414
criSocket: unix:///var/run/crio/crio.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
2830
allocate-node-cidrs: "true"

‎hack/update/kubernetes_version/templates/v1beta3/default.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/default.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
1414
criSocket: unix:///var/run/dockershim.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
2830
allocate-node-cidrs: "true"

‎hack/update/kubernetes_version/templates/v1beta3/dns.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/dns.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
1414
criSocket: unix:///var/run/dockershim.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2628
controllerManager:
2729
extraArgs:
2830
allocate-node-cidrs: "true"

‎hack/update/kubernetes_version/templates/v1beta3/image-repository.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/image-repository.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,16 +14,18 @@ nodeRegistration:
1414
criSocket: unix:///var/run/dockershim.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
imageRepository: test/repo
2324
apiServer:
2425
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2526
extraArgs:
26-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
27+
- name: "enable-admission-plugins"
28+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
2729
controllerManager:
2830
extraArgs:
2931
allocate-node-cidrs: "true"

‎hack/update/kubernetes_version/templates/v1beta3/options.yaml‎ renamed to ‎hack/update/kubernetes_version/templates/v1beta4/options.yaml‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kubeadm.k8s.io/v1beta3
1+
apiVersion: kubeadm.k8s.io/v1beta4
22
kind: InitConfiguration
33
localAPIEndpoint:
44
advertiseAddress: 1.1.1.1
@@ -14,33 +14,42 @@ nodeRegistration:
1414
criSocket: unix:///var/run/dockershim.sock
1515
name: "mk"
1616
kubeletExtraArgs:
17-
node-ip: 1.1.1.1
17+
- name: "node-ip"
18+
value: "1.1.1.1"
1819
taints: []
1920
---
20-
apiVersion: kubeadm.k8s.io/v1beta3
21+
apiVersion: kubeadm.k8s.io/v1beta4
2122
kind: ClusterConfiguration
2223
apiServer:
2324
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
2425
extraArgs:
25-
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26-
fail-no-swap: "true"
26+
- name: "enable-admission-plugins"
27+
value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
28+
- name: "fail-no-swap"
29+
value: "true"
2730
controllerManager:
2831
extraArgs:
29-
allocate-node-cidrs: "true"
30-
kube-api-burst: "32"
31-
leader-elect: "false"
32+
- name: "allocate-node-cidrs"
33+
value: "true"
34+
- name: "kube-api-burst"
35+
value: "32"
36+
- name: "leader-elect"
37+
value: "false"
3238
scheduler:
3339
extraArgs:
34-
leader-elect: "false"
35-
scheduler-name: "mini-scheduler"
40+
- name: "leader-elect"
41+
value: "false"
42+
- name: "scheduler-name"
43+
value: "mini-scheduler"
3644
certificatesDir: /var/lib/minikube/certs
3745
clusterName: mk
3846
controlPlaneEndpoint: control-plane.minikube.internal:8443
3947
etcd:
4048
local:
4149
dataDir: /var/lib/minikube/etcd
4250
extraArgs:
43-
proxy-refresh-interval: "70000"
51+
- name: "proxy-refresh-interval"
52+
value: "70000"
4453
kubernetesVersion: v1.23.0
4554
networking:
4655
dnsDomain: cluster.local

0 commit comments

Comments
 (0)