Merge pull request #471 from hippogriffin/470-k8s-1.19

470 - Update k8s to 1.23
geerlingguy · Jun 18, 2023 · 7b243a0 · 7b243a0
2 parents 6c753ca + f5006ee
commit 7b243a0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/kubernetes/examples/files/tiller-rbac.yml b/kubernetes/examples/files/tiller-rbac.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: tiller

diff --git a/kubernetes/files/manifests/kube-system/kube-flannel-vagrant.yml b/kubernetes/files/manifests/kube-system/kube-flannel-vagrant.yml
@@ -3,7 +3,7 @@
 # kube-flannel container in the 'kube-flannel-ds-amd64' DaemonSet.
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
 rules:
@@ -28,7 +28,7 @@ rules:
       - patch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
 roleRef:
@@ -82,7 +82,7 @@ data:
       }
     }
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-flannel-ds-amd64
@@ -91,6 +91,9 @@ metadata:
     tier: node
     app: flannel
 spec:
+  selector:
+    matchLabels:
+      app: flannel
   template:
     metadata:
       labels:
@@ -161,7 +164,7 @@ spec:
           configMap:
             name: kube-flannel-cfg
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-flannel-ds-arm64
@@ -170,6 +173,9 @@ metadata:
     tier: node
     app: flannel
 spec:
+  selector:
+    matchLabels:
+      app: flannel
   template:
     metadata:
       labels:
@@ -239,7 +245,7 @@ spec:
           configMap:
             name: kube-flannel-cfg
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-flannel-ds-arm
@@ -248,6 +254,9 @@ metadata:
     tier: node
     app: flannel
 spec:
+  selector:
+    matchLabels:
+      app: flannel
   template:
     metadata:
       labels:
@@ -317,7 +326,7 @@ spec:
           configMap:
             name: kube-flannel-cfg
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-flannel-ds-ppc64le
@@ -326,6 +335,9 @@ metadata:
     tier: node
     app: flannel
 spec:
+  selector:
+    matchLabels:
+      app: flannel
   template:
     metadata:
       labels:
@@ -395,7 +407,7 @@ spec:
           configMap:
             name: kube-flannel-cfg
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-flannel-ds-s390x
@@ -404,6 +416,9 @@ metadata:
     tier: node
     app: flannel
 spec:
+  selector:
+    matchLabels:
+      app: flannel
   template:
     metadata:
       labels:

diff --git a/kubernetes/vars/main.yml b/kubernetes/vars/main.yml
@@ -6,15 +6,15 @@ docker_packages:
   - docker-ce=5:18.09.0~3-0~debian-stretch
 docker_install_compose: False
 
-kubernetes_version: '1.13'
+kubernetes_version: '1.23'
 kubernetes_allow_pods_on_master: False
 kubernetes_pod_network_cidr: '10.244.0.0/16'
 kubernetes_packages:
-  - name: kubelet=1.13.8-00
+  - name: kubelet=1.23.5-00
     state: present
-  - name: kubectl=1.13.8-00
+  - name: kubectl=1.23.5-00
     state: present
-  - name: kubeadm=1.13.8-00
+  - name: kubeadm=1.23.5-00
     state: present
   - name: kubernetes-cni
     state: present