Skip to content

Commit d79d954

Browse files
committed
Issue #108: Upgrade Kubernetes example to 1.13.
1 parent 6befa75 commit d79d954

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ spec:
101101
nodeSelector:
102102
beta.kubernetes.io/arch: amd64
103103
tolerations:
104-
- key: node-role.kubernetes.io/master
105-
operator: Exists
104+
- operator: Exists
106105
effect: NoSchedule
107106
serviceAccountName: flannel
108107
initContainers:
@@ -181,8 +180,7 @@ spec:
181180
nodeSelector:
182181
beta.kubernetes.io/arch: arm64
183182
tolerations:
184-
- key: node-role.kubernetes.io/master
185-
operator: Exists
183+
- operator: Exists
186184
effect: NoSchedule
187185
serviceAccountName: flannel
188186
initContainers:
@@ -260,8 +258,7 @@ spec:
260258
nodeSelector:
261259
beta.kubernetes.io/arch: arm
262260
tolerations:
263-
- key: node-role.kubernetes.io/master
264-
operator: Exists
261+
- operator: Exists
265262
effect: NoSchedule
266263
serviceAccountName: flannel
267264
initContainers:
@@ -339,8 +336,7 @@ spec:
339336
nodeSelector:
340337
beta.kubernetes.io/arch: ppc64le
341338
tolerations:
342-
- key: node-role.kubernetes.io/master
343-
operator: Exists
339+
- operator: Exists
344340
effect: NoSchedule
345341
serviceAccountName: flannel
346342
initContainers:
@@ -418,8 +414,7 @@ spec:
418414
nodeSelector:
419415
beta.kubernetes.io/arch: s390x
420416
tolerations:
421-
- key: node-role.kubernetes.io/master
422-
operator: Exists
417+
- operator: Exists
423418
effect: NoSchedule
424419
serviceAccountName: flannel
425420
initContainers:

kubernetes/vars/main.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@
22
swap_file_state: absent
33
swap_file_path: /dev/mapper/packer--debian--9--amd64--vg-swap_1
44

5-
docker_package: docker-ce=18.06.1~ce~3-0~debian
5+
docker_package: docker-ce=5:18.09.0~3-0~debian-stretch
66
docker_install_compose: False
77

8-
kubernetes_version: 'stable-1.11'
8+
kubernetes_version: '1.13'
99
kubernetes_allow_pods_on_master: False
1010
kubernetes_pod_network_cidr: '10.244.0.0/16'
11+
kubernetes_packages:
12+
- name: kubelet=1.13.1-00
13+
state: present
14+
- name: kubectl=1.13.1-00
15+
state: present
16+
- name: kubeadm=1.13.1-00
17+
state: present
18+
- name: kubernetes-cni
19+
state: present
1120

1221
kubernetes_apiserver_advertise_address: "192.168.84.2"
1322
kubernetes_flannel_manifest_file: "~/kube-flannel-vagrant.yml"

0 commit comments

Comments
 (0)