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

Bump k8s manifests to v1.6.2 #466

Merged
merged 1 commit into from
Apr 24, 2017
Merged

Bump k8s manifests to v1.6.2 #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 hack/multi-node/user-data.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume var-lib-cni,kind=host,source=/var/lib/cni \
--mount volume=var-lib-cni,target=/var/lib/cni"
Expand Down
2 changes: 1 addition & 1 deletion hack/quickstart/kubelet.master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Service]
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
Environment="RKT_RUN_ARGS=\
--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
Expand Down
2 changes: 1 addition & 1 deletion hack/quickstart/kubelet.worker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Service]
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
Environment="RKT_RUN_ARGS=\
--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
Expand Down
2 changes: 1 addition & 1 deletion hack/single-node/user-data.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ coreos:
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
Environment=KUBELET_IMAGE_TAG=v1.6.1_coreos.0
Environment=KUBELET_IMAGE_TAG=v1.6.2_coreos.0
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
--volume var-lib-cni,kind=host,source=/var/lib/cni \
--mount volume=var-lib-cni,target=/var/lib/cni"
Expand Down
2 changes: 1 addition & 1 deletion hack/tests/conformance-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail

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

usage() {
echo "USAGE:"
Expand Down
16 changes: 8 additions & 8 deletions pkg/asset/internal/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
spec:
containers:
- name: kubelet
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- ./hyperkube
- kubelet
Expand Down Expand Up @@ -153,7 +153,7 @@ spec:
spec:
containers:
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- /usr/bin/flock
- --exclusive
Expand Down Expand Up @@ -229,7 +229,7 @@ metadata:
spec:
containers:
- name: kube-apiserver
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- /usr/bin/flock
- --exclusive
Expand Down Expand Up @@ -432,7 +432,7 @@ spec:
topologyKey: kubernetes.io/hostname
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- ./hyperkube
- controller-manager
Expand Down Expand Up @@ -482,7 +482,7 @@ metadata:
spec:
containers:
- name: kube-controller-manager
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- ./hyperkube
- controller-manager
Expand Down Expand Up @@ -557,7 +557,7 @@ spec:
topologyKey: kubernetes.io/hostname
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- ./hyperkube
- scheduler
Expand Down Expand Up @@ -586,7 +586,7 @@ metadata:
spec:
containers:
- name: kube-scheduler
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- ./hyperkube
- scheduler
Expand Down Expand Up @@ -633,7 +633,7 @@ spec:
spec:
containers:
- name: kube-proxy
image: quay.io/coreos/hyperkube:v1.6.1_coreos.0
image: quay.io/coreos/hyperkube:v1.6.2_coreos.0
command:
- /hyperkube
- proxy
Expand Down