Skip to content

Commit

Permalink
Update to Kubernetes v1.12.6
Browse files Browse the repository at this point in the history
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
  • Loading branch information
mikkeloscar committed Feb 28, 2019
1 parent 95ed067 commit 011b71a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions cluster/manifests/kube-proxy/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
labels:
application: kube-proxy
version: v1.12.5
version: v1.12.6
spec:
selector:
matchLabels:
Expand All @@ -17,7 +17,7 @@ spec:
name: kube-proxy
labels:
application: kube-proxy
version: v1.12.5
version: v1.12.6
annotations:
config/hash: {{"configmap.yaml" | manifestHash}}
spec:
Expand All @@ -31,7 +31,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: registry.opensource.zalan.do/teapot/kube-proxy:v1.12.5-1
image: registry.opensource.zalan.do/teapot/kube-proxy:v1.12.6
args:
- --config=/config/kube-proxy.yaml
- --v=2
Expand Down
18 changes: 9 additions & 9 deletions cluster/node-pools/master-default/userdata.clc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ systemd:
After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service
[Service]
Environment=KUBELET_IMAGE_TAG=v1.12.5-1
Environment=KUBELET_IMAGE_TAG=v1.12.6
Environment=KUBELET_IMAGE_ARGS=--exec=/kube-component
Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
Environment="RKT_RUN_ARGS=--insecure-options=image \
Expand Down Expand Up @@ -303,7 +303,7 @@ storage:
namespace: kube-system
labels:
application: kube-apiserver
version: v1.12.5
version: v1.12.6
annotations:
kubernetes-log-watcher/scalyr-parser: |
[{"container": "webhook", "parser": "json-structured-log"}]
Expand All @@ -315,7 +315,7 @@ storage:
hostNetwork: true
containers:
- name: kube-apiserver
image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.12.5-1
image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.12.6
args:
- --apiserver-count={{ .Values.apiserver_count }}
- --bind-address=0.0.0.0
Expand Down Expand Up @@ -520,15 +520,15 @@ storage:
namespace: kube-system
labels:
application: kube-controller-manager
version: v1.12.5
version: v1.12.6
spec:
priorityClassName: system-node-critical
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
containers:
- name: kube-controller-manager
image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.12.5-1
image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.12.6
args:
- --kubeconfig=/etc/kubernetes/controller-kubeconfig
- --leader-elect=true
Expand Down Expand Up @@ -591,7 +591,7 @@ storage:
namespace: kube-system
labels:
application: kube-scheduler
version: v1.12.5
version: v1.12.6
spec:
priorityClassName: system-node-critical
tolerations:
Expand All @@ -600,7 +600,7 @@ storage:
hostNetwork: true
containers:
- name: kube-scheduler
image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.12.5-1
image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.12.6
args:
- --master=http://127.0.0.1:8080
- --leader-elect=true
Expand Down Expand Up @@ -1032,7 +1032,7 @@ storage:
--volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
--mount volume=dns,target=/etc/resolv.conf \
--net=host \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.6 \
--exec=/kube-component -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
label node "$(hostname)" \
Expand All @@ -1045,7 +1045,7 @@ storage:
--net=host \
--volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
--mount volume=dns,target=/etc/resolv.conf \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.6 \
--exec=/kube-component -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
drain "$(hostname)" \
Expand Down
6 changes: 3 additions & 3 deletions cluster/node-pools/worker-default/userdata.clc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ systemd:
After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service collect-instance-metadata.service
[Service]
Environment=KUBELET_IMAGE_TAG=v1.12.5-1
Environment=KUBELET_IMAGE_TAG=v1.12.6
Environment=KUBELET_IMAGE_ARGS=--exec=/kube-component
Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
Environment="RKT_RUN_ARGS=--insecure-options=image \
Expand Down Expand Up @@ -435,7 +435,7 @@ storage:
--volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
--mount volume=dns,target=/etc/resolv.conf \
--net=host \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.6 \
--exec=/kubectl -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
label node "$(hostname)" \
Expand All @@ -448,7 +448,7 @@ storage:
--net=host \
--volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \
--mount volume=dns,target=/etc/resolv.conf \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.5-1 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.12.6 \
--exec=/kubectl -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
drain "$(hostname)" \
Expand Down

0 comments on commit 011b71a

Please sign in to comment.