Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 79bce14

Browse files
authored
Merge pull request #466 from aaronlevy/v1.6.2
Bump k8s manifests to v1.6.2
2 parents 20cf8b9 + 0795fd6 commit 79bce14

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

hack/multi-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--mount volume=var-lib-cni,target=/var/lib/cni"

hack/quickstart/kubelet.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/run/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/quickstart/kubelet.worker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Service]
22
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
3-
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
3+
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
44
Environment="RKT_RUN_ARGS=\
55
--uuid-file-save=/var/run/kubelet-pod.uuid \
66
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

hack/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ coreos:
99
[Service]
1010
EnvironmentFile=/etc/environment
1111
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
12-
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
1313
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
1414
--volume var-lib-cni,kind=host,source=/var/lib/cni \
1515
--mount volume=var-lib-cni,target=/var/lib/cni"

hack/tests/conformance-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
5-
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.6.1+coreos.0}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.6.2+coreos.0}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/internal/templates.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
spec:
5353
containers:
5454
- name: kubelet
55-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
55+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
5656
command:
5757
- ./hyperkube
5858
- kubelet
@@ -153,7 +153,7 @@ spec:
153153
spec:
154154
containers:
155155
- name: kube-apiserver
156-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
156+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
157157
command:
158158
- /usr/bin/flock
159159
- --exclusive
@@ -229,7 +229,7 @@ metadata:
229229
spec:
230230
containers:
231231
- name: kube-apiserver
232-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
232+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
233233
command:
234234
- /usr/bin/flock
235235
- --exclusive
@@ -432,7 +432,7 @@ spec:
432432
topologyKey: kubernetes.io/hostname
433433
containers:
434434
- name: kube-controller-manager
435-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
435+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
436436
command:
437437
- ./hyperkube
438438
- controller-manager
@@ -482,7 +482,7 @@ metadata:
482482
spec:
483483
containers:
484484
- name: kube-controller-manager
485-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
485+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
486486
command:
487487
- ./hyperkube
488488
- controller-manager
@@ -557,7 +557,7 @@ spec:
557557
topologyKey: kubernetes.io/hostname
558558
containers:
559559
- name: kube-scheduler
560-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
560+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
561561
command:
562562
- ./hyperkube
563563
- scheduler
@@ -586,7 +586,7 @@ metadata:
586586
spec:
587587
containers:
588588
- name: kube-scheduler
589-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
589+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
590590
command:
591591
- ./hyperkube
592592
- scheduler
@@ -633,7 +633,7 @@ spec:
633633
spec:
634634
containers:
635635
- name: kube-proxy
636-
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
636+
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
637637
command:
638638
- /hyperkube
639639
- proxy

0 commit comments

Comments
 (0)