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

Commit ac02efc

Browse files
committed
Bump k8s version v1.5.5
1 parent a1bcf5f commit ac02efc

File tree

8 files changed

+16
-18
lines changed

8 files changed

+16
-18
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ conformance-%: clean all
5454
#TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
5555
# This will naively try and create a vendor dir from a k8s release
5656
# USE: make vendor VENDOR_VERSION=vX.Y.Z
57-
VENDOR_VERSION = v1.5.4+coreos.0
57+
VENDOR_VERSION = v1.5.5+coreos.0
5858
ETCD_OPERATOR_VERSION = v0.2.1
5959
vendor:
6060
@echo "Creating k8s vendor for: $(VENDOR_VERSION)"

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.5.4_coreos.0
12+
Environment=KUBELET_IMAGE_TAG=v1.5.5_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/single-node/user-data.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ coreos:
1717
[Service]
1818
EnvironmentFile=/etc/environment
1919
Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
20-
Environment=KUBELET_IMAGE_TAG=v1.5.4_coreos.0
20+
Environment=KUBELET_IMAGE_TAG=v1.5.5_coreos.0
2121
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \
2222
--volume var-lib-cni,kind=host,source=/var/lib/cni \
2323
--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.5.4+coreos.0}
5+
CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.5.5+coreos.0}
66

77
usage() {
88
echo "USAGE:"

pkg/asset/internal/templates.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
spec:
5151
containers:
5252
- name: kubelet
53-
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
53+
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
5454
command:
5555
- ./hyperkube
5656
- kubelet
@@ -147,7 +147,7 @@ spec:
147147
hostNetwork: true
148148
containers:
149149
- name: kube-apiserver
150-
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
150+
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
151151
command:
152152
- /usr/bin/flock
153153
- --exclusive
@@ -291,7 +291,7 @@ spec:
291291
master: "true"
292292
containers:
293293
- name: kube-controller-manager
294-
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
294+
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
295295
command:
296296
- ./hyperkube
297297
- controller-manager
@@ -347,7 +347,7 @@ spec:
347347
master: "true"
348348
containers:
349349
- name: kube-scheduler
350-
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
350+
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
351351
command:
352352
- ./hyperkube
353353
- scheduler
@@ -380,7 +380,7 @@ spec:
380380
hostNetwork: true
381381
containers:
382382
- name: kube-proxy
383-
image: quay.io/coreos/hyperkube:v1.5.4_coreos.0
383+
image: quay.io/coreos/hyperkube:v1.5.5_coreos.0
384384
command:
385385
- /hyperkube
386386
- proxy

vendor/k8s.io/kubernetes/pkg/version/base.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy/admission.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)