kubeadm v1beta3

ReSearchITEng · Jun 3, 2022 · 191326d · 191326d
1 parent 9737a9a
commit 191326d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/group_vars/all/ClusterConfiguration.yml b/group_vars/all/ClusterConfiguration.yml
@@ -1,7 +1,7 @@
 #https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2?tab=doc#ClusterConfiguration
 #check latest api ver here: https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm?tab=subdirectories
 ClusterConfiguration:
-  apiVersion: kubeadm.k8s.io/v1beta2
+  apiVersion: kubeadm.k8s.io/v1beta3
   apiServer:
     timeoutForControlPlane: 8m0s
     extraArgs: # https://kubernetes.io/docs/admin/kube-apiserver/
@@ -27,14 +27,12 @@ ClusterConfiguration:
   kind: ClusterConfiguration
   kubernetesVersion: "v{{ KUBERNETES_VERSION }}"
   # dns:
-  #   type: CoreDNS
   networking:
   #   dnsDomain: cluster.local
     serviceSubnet: "{{ SERVICE_NETWORK_CIDR }}"
   #   podSubnet: ""
     podSubnet: "{{ POD_NETWORK_CIDR }}"
     ##podSubnet -> Calico is now able to autodetect. If calico is used, this can be commented out.
-  # useHyperKubeImage: True 
   #cloudProvider: 'vsphere' # WE NEED THIS Even after 1.11 (v1alpha2) (due to a bug in ansible on vars with "-"); this is also required: govc vm.change -e="disk.enableUUID=1" -vm=<machines> and requires setup of cloud_config below
   # controllerManager:
   #   controllerManagerExtraArgs: # https://kubernetes.io/docs/admin/kube-controller-manager/

diff --git a/group_vars/all/InitConfiguration.yml b/group_vars/all/InitConfiguration.yml
@@ -5,7 +5,7 @@ InitConfiguration:
   localAPIEndpoint:
   #  advertiseAddress: 1.2.3.4
   #  bindPort: 6443
-  apiVersion: kubeadm.k8s.io/v1beta2
+  apiVersion: kubeadm.k8s.io/v1beta3
   # bootstrapTokens:
   # - groups:
   #   - system:bootstrappers:kubeadm:default-node-token

diff --git a/group_vars/all/JoinConfiguration.yml b/group_vars/all/JoinConfiguration.yml
@@ -1,11 +1,11 @@
-#https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2?tab=doc#JoinConfiguration
+#https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3?tab=doc#JoinConfiguration
 #check latest api ver here: https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm?tab=subdirectories
 JoinConfiguration:
 #  controlPlane: # define controlPlane section only in secondary-masters; not required in minions.
 #    localAPIEndpoint:
 #      advertiseAddress: <your_address>
 #      bindPort: 6443
-  apiVersion: kubeadm.k8s.io/v1beta2
+  apiVersion: kubeadm.k8s.io/v1beta3
   # caCertPath: /etc/kubernetes/pki/ca.crt
   # discovery:
   #   bootstrapToken:
@@ -14,7 +14,10 @@ JoinConfiguration:
   #     unsafeSkipCAVerification: true
   #   timeout: 5m0s
   #   tlsBootstrapToken: abcdef.0123456789abcdef
+  #   file: #either file or tlsBootstrapToken
   kind: JoinConfiguration
   # nodeRegistration:
   #   criSocket: /var/run/dockershim.sock
   #   name: <your_master_node_name>
+  # skipPhases: 
+  # patches: