Skip to content

Commit 7b243a0

Browse files
authored
Merge pull request #471 from hippogriffin/470-k8s-1.19
470 - Update k8s to 1.23
2 parents 6c753ca + f5006ee commit 7b243a0

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

kubernetes/examples/files/tiller-rbac.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: rbac.authorization.k8s.io/v1beta1
2+
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: tiller

kubernetes/files/manifests/kube-system/kube-flannel-vagrant.yml

+22-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# kube-flannel container in the 'kube-flannel-ds-amd64' DaemonSet.
44
---
55
kind: ClusterRole
6-
apiVersion: rbac.authorization.k8s.io/v1beta1
6+
apiVersion: rbac.authorization.k8s.io/v1
77
metadata:
88
name: flannel
99
rules:
@@ -28,7 +28,7 @@ rules:
2828
- patch
2929
---
3030
kind: ClusterRoleBinding
31-
apiVersion: rbac.authorization.k8s.io/v1beta1
31+
apiVersion: rbac.authorization.k8s.io/v1
3232
metadata:
3333
name: flannel
3434
roleRef:
@@ -82,7 +82,7 @@ data:
8282
}
8383
}
8484
---
85-
apiVersion: extensions/v1beta1
85+
apiVersion: apps/v1
8686
kind: DaemonSet
8787
metadata:
8888
name: kube-flannel-ds-amd64
@@ -91,6 +91,9 @@ metadata:
9191
tier: node
9292
app: flannel
9393
spec:
94+
selector:
95+
matchLabels:
96+
app: flannel
9497
template:
9598
metadata:
9699
labels:
@@ -161,7 +164,7 @@ spec:
161164
configMap:
162165
name: kube-flannel-cfg
163166
---
164-
apiVersion: extensions/v1beta1
167+
apiVersion: apps/v1
165168
kind: DaemonSet
166169
metadata:
167170
name: kube-flannel-ds-arm64
@@ -170,6 +173,9 @@ metadata:
170173
tier: node
171174
app: flannel
172175
spec:
176+
selector:
177+
matchLabels:
178+
app: flannel
173179
template:
174180
metadata:
175181
labels:
@@ -239,7 +245,7 @@ spec:
239245
configMap:
240246
name: kube-flannel-cfg
241247
---
242-
apiVersion: extensions/v1beta1
248+
apiVersion: apps/v1
243249
kind: DaemonSet
244250
metadata:
245251
name: kube-flannel-ds-arm
@@ -248,6 +254,9 @@ metadata:
248254
tier: node
249255
app: flannel
250256
spec:
257+
selector:
258+
matchLabels:
259+
app: flannel
251260
template:
252261
metadata:
253262
labels:
@@ -317,7 +326,7 @@ spec:
317326
configMap:
318327
name: kube-flannel-cfg
319328
---
320-
apiVersion: extensions/v1beta1
329+
apiVersion: apps/v1
321330
kind: DaemonSet
322331
metadata:
323332
name: kube-flannel-ds-ppc64le
@@ -326,6 +335,9 @@ metadata:
326335
tier: node
327336
app: flannel
328337
spec:
338+
selector:
339+
matchLabels:
340+
app: flannel
329341
template:
330342
metadata:
331343
labels:
@@ -395,7 +407,7 @@ spec:
395407
configMap:
396408
name: kube-flannel-cfg
397409
---
398-
apiVersion: extensions/v1beta1
410+
apiVersion: apps/v1
399411
kind: DaemonSet
400412
metadata:
401413
name: kube-flannel-ds-s390x
@@ -404,6 +416,9 @@ metadata:
404416
tier: node
405417
app: flannel
406418
spec:
419+
selector:
420+
matchLabels:
421+
app: flannel
407422
template:
408423
metadata:
409424
labels:

kubernetes/vars/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ docker_packages:
66
- docker-ce=5:18.09.0~3-0~debian-stretch
77
docker_install_compose: False
88

9-
kubernetes_version: '1.13'
9+
kubernetes_version: '1.23'
1010
kubernetes_allow_pods_on_master: False
1111
kubernetes_pod_network_cidr: '10.244.0.0/16'
1212
kubernetes_packages:
13-
- name: kubelet=1.13.8-00
13+
- name: kubelet=1.23.5-00
1414
state: present
15-
- name: kubectl=1.13.8-00
15+
- name: kubectl=1.23.5-00
1616
state: present
17-
- name: kubeadm=1.13.8-00
17+
- name: kubeadm=1.23.5-00
1818
state: present
1919
- name: kubernetes-cni
2020
state: present

0 commit comments

Comments
 (0)