Skip to content

Upgrade kubernetes to v1.10.0 #68

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Upgrade kubernetes to v1.10.0 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5615aa0
upgrade kubernetes to 1.10.0
pgayvallet Apr 4, 2018
333c811
update hashes
pgayvallet Apr 4, 2018
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 pkg/kube-e2e-test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
# When changing kubernetes_version remember to also update:
# - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
# - pkg/kubelet/Dockerfile
ENV kubernetes_version v1.9.6
ENV kubernetes_version v1.10.0

RUN apk add -U --no-cache \
bash \
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM linuxkit/alpine:8ad3a04b70f1e93e6159143e3792e379a9b0519d AS build
# When changing kubernetes_version remember to also update:
# - scripts/mk-image-cache-lst and run `make refresh-image-caches` from top-level
# - pkg/e2e-test/Dockerfile
ENV kubernetes_version v1.9.6
ENV kubernetes_version v1.10.0
ENV cni_version v0.7.0
ENV critools_version v1.0.0-alpha.0

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubernetes-docker-image-cache-common/images.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# autogenerated by:
# ./scripts/mk-image-cache-lst common
gcr.io/google_containers/kube-proxy-amd64:v1.9.6@sha256:dd647b619b75882f217a21a6e2c473deb77cba1cfb20461da0084ed78d951af1
gcr.io/google_containers/kube-proxy-amd64:v1.10.0@sha256:fc944b06c14cb442916045a630d5e374dfb9c453dfc56d3cb59ac21ea4268875
gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7@sha256:f80f5f9328107dc516d67f7b70054354b9367d31d4946a3bffd3383d83d7efe8
gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7@sha256:f5bddc71efe905f4e4b96f3ca346414be6d733610c1525b98fff808f93966680
gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7@sha256:6cfb9f9c2756979013dbd3074e852c2d8ac99652570c5d17d152e0c0eb3321d6
Expand Down
6 changes: 3 additions & 3 deletions pkg/kubernetes-docker-image-cache-control-plane/images.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# autogenerated by:
# ./scripts/mk-image-cache-lst control-plane
gcr.io/google_containers/kube-apiserver-amd64:v1.9.6@sha256:1bb16ddef9edd8142125ac2443e36986c051b0df808db907648ac9d68e0d5f23
gcr.io/google_containers/kube-controller-manager-amd64:v1.9.6@sha256:c90d1f38999b96405a997e52392b4db2ac68b6d4ea376e2e99ab528c51b88d22
gcr.io/google_containers/kube-scheduler-amd64:v1.9.6@sha256:0bc20f6ee28be19c4c45f2a5d0282e7ae3e89d61789e7a89182f818b37b67e28
gcr.io/google_containers/kube-apiserver-amd64:v1.10.0@sha256:8b7a675c6fdda0469e971e5b1f3e902bb71c36396faf506f1511052705a5b0ee
gcr.io/google_containers/kube-controller-manager-amd64:v1.10.0@sha256:ab637b1f4700e0cc83d3ae3c5368919eb8f6199485adcc126fd306481df56fec
gcr.io/google_containers/kube-scheduler-amd64:v1.10.0@sha256:4670717a1c092680dc0ac018dc36f991e06ffbee6b6bafba9a2968d7bebe7800
gcr.io/google_containers/etcd-amd64:3.1.11@sha256:54889c08665d241e321ca5ce976b2df0f766794b698d53faf6b7dacb95316680
2 changes: 1 addition & 1 deletion scripts/mk-image-cache-lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repo=gcr.io/google_containers
# When changing kubernetes_version remember to also update:
# - pkg/kubelet/Dockerfile
# - pkg/e2e-test/Dockerfile
kubernetes_version=v1.9.6
kubernetes_version=v1.10.0
kube_dns_version=1.14.7
pause_version=3.0
etcd_version=3.1.11
Expand Down
2 changes: 1 addition & 1 deletion yml/docker-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
services:
- name: kubernetes-docker-image-cache-control-plane
image: linuxkit/kubernetes-docker-image-cache-control-plane:be74a54ac117d66f7462cecf6ae8edfa13ec34aa
image: linuxkit/kubernetes-docker-image-cache-control-plane:21b79f198dfa53255ffe34c918a9b80bb924d68a
cgroupsPath: podruntime/control-cache
2 changes: 1 addition & 1 deletion yml/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
cgroupsPath: podruntime/docker
- name: kubernetes-docker-image-cache-common
image: linuxkit/kubernetes-docker-image-cache-common:b58944f17b48e1372b16e4443ddb999c729c84b2
image: linuxkit/kubernetes-docker-image-cache-common:d9a48a48456b30d2eaa332c18610e4e1a53342bf
cgroupsPath: podruntime/common-cache
files:
- path: /etc/kubelet.sh.conf
Expand Down
2 changes: 1 addition & 1 deletion yml/kube.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
image: linuxkit/sshd:4f403fe5ae53dc3e45c8f6972dced9dddf900ae6
cgroupsPath: systemreserved/sshd
- name: kubelet
image: linuxkit/kubelet:6fe8c9a5182667c6dcb3b43279ce001a156730ea
image: linuxkit/kubelet:11bc9ff4ec8ef2cdbfb6e97e832739224d0982b4
cgroupsPath: podruntime/kubelet
files:
- path: etc/linuxkit.yml
Expand Down