Merge pull request #19790 from fbyrne/feature/19788

Adds support for kubeadm.k8s.io/v1beta4 available since k8s v1.31
kubernetes · Oct 14, 2024 · c080701 · c080701
2 parents c090344 + b9d2e2c
commit c080701
Show file tree

Hide file tree

Showing 20 changed files with 349 additions and 133 deletions.
diff --git a/...emplates/v1beta3/containerd-api-port.yaml → ...emplates/v1beta4/containerd-api-port.yaml b/...emplates/v1beta3/containerd-api-port.yaml → ...emplates/v1beta4/containerd-api-port.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,30 +14,36 @@ nodeRegistration:
  criSocket: unix:///run/containerd/containerd.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
- allocate-node-cidrs: "true"
- leader-elect: "false"
+ - name: "allocate-node-cidrs"
+ value: "true"
+ - name: "leader-elect"
+ value: "false"
 scheduler:
  extraArgs:
- leader-elect: "false"
+ - name: "leader-elect"
+ value: "false"
 certificatesDir: /var/lib/minikube/certs
 clusterName: mk
 controlPlaneEndpoint: control-plane.minikube.internal:12345
 etcd:
  local:
  dataDir: /var/lib/minikube/etcd
  extraArgs:
- proxy-refresh-interval: "70000"
+ - name: "proxy-refresh-interval"
+ value: "70000"
 kubernetesVersion: v1.23.0
 networking:
  dnsDomain: cluster.local

diff --git a/.../v1beta3/containerd-pod-network-cidr.yaml → .../v1beta4/containerd-pod-network-cidr.yaml b/.../v1beta3/containerd-pod-network-cidr.yaml → .../v1beta4/containerd-pod-network-cidr.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,30 +14,36 @@ nodeRegistration:
  criSocket: unix:///run/containerd/containerd.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
- allocate-node-cidrs: "true"
- leader-elect: "false"
+ - name: "allocate-node-cidrs"
+ value: "true"
+ - name: "leader-elect"
+ value: "false"
 scheduler:
  extraArgs:
- leader-elect: "false"
+ - name: "leader-elect"
+ value: "false"
 certificatesDir: /var/lib/minikube/certs
 clusterName: mk
 controlPlaneEndpoint: control-plane.minikube.internal:8443
 etcd:
  local:
  dataDir: /var/lib/minikube/etcd
  extraArgs:
- proxy-refresh-interval: "70000"
+ - name: "proxy-refresh-interval"
+ value: "70000"
 kubernetesVersion: v1.23.0
 networking:
  dnsDomain: cluster.local

diff --git a/...version/templates/v1beta3/containerd.yaml → ...version/templates/v1beta4/containerd.yaml b/...version/templates/v1beta3/containerd.yaml → ...version/templates/v1beta4/containerd.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
  criSocket: unix:///run/containerd/containerd.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
  allocate-node-cidrs: "true"

diff --git a/...templates/v1beta3/crio-options-gates.yaml → ...templates/v1beta4/crio-options-gates.yaml b/...templates/v1beta3/crio-options-gates.yaml → ...templates/v1beta4/crio-options-gates.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
  criSocket: unix:///var/run/crio/crio.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
  fail-no-swap: "true"
  feature-gates: "a=b"
 controllerManager:

diff --git a/...netes_version/templates/v1beta3/crio.yaml → ...netes_version/templates/v1beta4/crio.yaml b/...netes_version/templates/v1beta3/crio.yaml → ...netes_version/templates/v1beta4/crio.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
  criSocket: unix:///var/run/crio/crio.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
  allocate-node-cidrs: "true"

diff --git a/...es_version/templates/v1beta3/default.yaml → ...es_version/templates/v1beta4/default.yaml b/...es_version/templates/v1beta3/default.yaml → ...es_version/templates/v1beta4/default.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
  criSocket: unix:///var/run/dockershim.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
  allocate-node-cidrs: "true"

diff --git a/...rnetes_version/templates/v1beta3/dns.yaml → ...rnetes_version/templates/v1beta4/dns.yaml b/...rnetes_version/templates/v1beta3/dns.yaml → ...rnetes_version/templates/v1beta4/dns.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,15 +14,17 @@ nodeRegistration:
  criSocket: unix:///var/run/dockershim.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
  allocate-node-cidrs: "true"

diff --git a/...n/templates/v1beta3/image-repository.yaml → ...n/templates/v1beta4/image-repository.yaml b/...n/templates/v1beta3/image-repository.yaml → ...n/templates/v1beta4/image-repository.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,16 +14,18 @@ nodeRegistration:
  criSocket: unix:///var/run/dockershim.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 imageRepository: test/repo
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 controllerManager:
  extraArgs:
  allocate-node-cidrs: "true"

diff --git a/...es_version/templates/v1beta3/options.yaml → ...es_version/templates/v1beta4/options.yaml b/...es_version/templates/v1beta3/options.yaml → ...es_version/templates/v1beta4/options.yaml
@@ -1,4 +1,4 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
  advertiseAddress: 1.1.1.1
@@ -14,33 +14,42 @@ nodeRegistration:
  criSocket: unix:///var/run/dockershim.sock
  name: "mk"
  kubeletExtraArgs:
- node-ip: 1.1.1.1
+ - name: "node-ip"
+ value: "1.1.1.1"
  taints: []
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 apiServer:
  certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
  extraArgs:
- enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
- fail-no-swap: "true"
+ - name: "enable-admission-plugins"
+ value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
+ - name: "fail-no-swap"
+ value: "true"
 controllerManager:
  extraArgs:
- allocate-node-cidrs: "true"
- kube-api-burst: "32"
- leader-elect: "false"
+ - name: "allocate-node-cidrs"
+ value: "true"
+ - name: "kube-api-burst"
+ value: "32"
+ - name: "leader-elect"
+ value: "false"
 scheduler:
  extraArgs:
- leader-elect: "false"
- scheduler-name: "mini-scheduler"
+ - name: "leader-elect"
+ value: "false"
+ - name: "scheduler-name"
+ value: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
 clusterName: mk
 controlPlaneEndpoint: control-plane.minikube.internal:8443
 etcd:
  local:
  dataDir: /var/lib/minikube/etcd
  extraArgs:
- proxy-refresh-interval: "70000"
+ - name: "proxy-refresh-interval"
+ value: "70000"
 kubernetesVersion: v1.23.0
 networking:
  dnsDomain: cluster.local