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

Commit 5853643

Browse files
authored
Merge pull request #317 from pbx0/bump
hack/quickstart: bump bootkube image to v0.3.8
2 parents b754f32 + 8df14e3 commit 5853643

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

RELEASING.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
- Update on-host kubelet versions (`KUBELET_VERSION`)
1212
- hack/multi-node/user-data.sample
1313
- hack/single-node/user-data.sample
14+
- hack/quickstart/kubelet.master
15+
- hack/quickstart/kubelet.worker
1416

1517
### Update conformance test k8s version
1618

@@ -59,11 +61,6 @@ PUSH_IMAGE=true ./build/build-image.sh
5961

6062
Note: the quickstart guides use the release images, so we should not update them until after building/pushing new release.
6163

62-
Update on-host kubelet version (`KUBELET_VERSION`)
63-
64-
- hack/quickstart/kubelet.master
65-
- hack/quickstart/kubelet.worker
66-
6764
Update the bootkube image version (to latest release)
6865

6966
- hack/quickstart/init-master.sh (`BOOTKUBE_VERSION`)

hack/quickstart/init-master.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IDENT=${IDENT:-${HOME}/.ssh/id_rsa}
88
SSH_OPTS=${SSH_OPTS:-}
99

1010
BOOTKUBE_REPO=${BOOTKUBE_REPO:-quay.io/coreos/bootkube}
11-
BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-v0.3.7}
11+
BOOTKUBE_VERSION=${BOOTKUBE_VERSION:-v0.3.8}
1212

1313
function usage() {
1414
echo "USAGE:"

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_ACI=quay.io/coreos/hyperkube
3-
Environment=KUBELET_VERSION=v1.5.2_coreos.2
3+
Environment=KUBELET_VERSION=v1.5.3_coreos.0
44
Environment="RKT_OPTS=\
55
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
66
--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"

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_ACI=quay.io/coreos/hyperkube
3-
Environment=KUBELET_VERSION=v1.5.2_coreos.2
3+
Environment=KUBELET_VERSION=v1.5.3_coreos.0
44
Environment="RKT_OPTS=\
55
--volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \
66
--volume var-lib-cni,kind=host,source=/var/lib/cni --mount volume=var-lib-cni,target=/var/lib/cni"

0 commit comments

Comments
 (0)