Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to v1.14.6 #2432

Merged
merged 1 commit into from
Aug 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ cluster_dns: "coredns"
coredns_log_svc_names: "true"

coreos_image: "ami-0d1579b60bb706fb7" # Container Linux 2079.6.0 (HVM, eu-central-1)
kuberuntu_image: {{ amiID "zalando-ubuntu-kubernetes-production-v1.14.5-master-51" "861068367966" }}
kuberuntu_image: {{ amiID "zalando-ubuntu-kubernetes-production-v1.14.6-master-52" "861068367966" }}

# Feature toggle to allow gradual decommissioning of ingress-template-controller
enable_ingress_template_controller: "false"
Expand Down
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.14.4
version: v1.14.6
spec:
selector:
matchLabels:
Expand All @@ -17,7 +17,7 @@ spec:
name: kube-proxy
labels:
application: kube-proxy
version: v1.14.4
version: v1.14.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.14.4
image: registry.opensource.zalan.do/teapot/kube-proxy:v1.14.6
args:
- --hostname-override=$(HOSTNAME_OVERRIDE)
- --config=/config/kube-proxy.yaml
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 @@ -180,7 +180,7 @@ systemd:
After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service

[Service]
Environment=KUBELET_IMAGE_TAG=v1.14.4
Environment=KUBELET_IMAGE_TAG=v1.14.6
Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet
Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
Environment="RKT_RUN_ARGS=--insecure-options=image \
Expand Down Expand Up @@ -361,7 +361,7 @@ storage:
namespace: kube-system
labels:
application: kube-apiserver
version: v1.14.4
version: v1.14.6
annotations:
kubernetes-log-watcher/scalyr-parser: |
[{"container": "webhook", "parser": "json-structured-log"}]
Expand All @@ -373,7 +373,7 @@ storage:
hostNetwork: true
containers:
- name: kube-apiserver
image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.14.4
image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.14.6
args:
- --apiserver-count={{ .Values.apiserver_count }}
- --bind-address=0.0.0.0
Expand Down Expand Up @@ -711,15 +711,15 @@ storage:
namespace: kube-system
labels:
application: kube-controller-manager
version: v1.14.4
version: v1.14.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.14.4
image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.14.6
args:
- --kubeconfig=/etc/kubernetes/controller-kubeconfig
- --leader-elect=true
Expand Down Expand Up @@ -780,7 +780,7 @@ storage:
namespace: kube-system
labels:
application: kube-scheduler
version: v1.14.4
version: v1.14.6
spec:
priorityClassName: system-node-critical
tolerations:
Expand All @@ -789,7 +789,7 @@ storage:
hostNetwork: true
containers:
- name: kube-scheduler
image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.14.4
image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.14.6
args:
- --master=http://127.0.0.1:8080
- --leader-elect=true
Expand Down Expand Up @@ -1248,7 +1248,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.14.4 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \
--exec=/kubectl -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
label node "$(hostname)" \
Expand All @@ -1261,7 +1261,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.14.4 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \
--exec=/kubectl -- \
--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 @@ -179,7 +179,7 @@ systemd:
After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service collect-instance-metadata.service

[Service]
Environment=KUBELET_IMAGE_TAG=v1.14.4
Environment=KUBELET_IMAGE_TAG=v1.14.6
Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet
Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet
Environment="RKT_RUN_ARGS=--insecure-options=image \
Expand Down Expand Up @@ -488,7 +488,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.14.4 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \
--exec=/kubectl -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
label node "$(hostname)" \
Expand All @@ -501,7 +501,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.14.4 \
docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \
--exec=/kubectl -- \
--kubeconfig=/etc/kubernetes/kubeconfig \
drain "$(hostname)" \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BINARY ?= kubernetes-on-aws-e2e
VERSION ?= $(shell git describe --tags --always --dirty)
KUBE_VERSION ?= v1.14.4
KUBE_VERSION ?= v1.14.6
IMAGE ?= registry-write.opensource.zalan.do/teapot/$(BINARY)
TAG ?= $(VERSION)
DOCKERFILE ?= Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ require (
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect
k8s.io/kube-proxy v0.0.0-20190301175851-ddc76f82d22d // indirect
k8s.io/kubelet v0.0.0-20190301175949-303923139e95 // indirect
k8s.io/kubernetes v1.14.5-beta.0.0.20190729145756-df8cd112a736
k8s.io/kubernetes v1.14.6
k8s.io/metrics v0.0.0-20170703180439-8efbc8e22d00 // indirect
k8s.io/sample-apiserver v0.0.0-20181121072341-dbb2709fc5ec // indirect
k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0 // indirect
Expand Down