diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index 7e285f65..3753ac26 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -17,7 +17,7 @@ release_uuid: null images: tags: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest scripted_test: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index afdaef93..58ac004f 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -58,9 +58,9 @@ const: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - key_rotate: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + key_rotate: gcr.io/google_containers/hyperkube-amd64:v1.17.3 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index c2e9be9a..8181c4ff 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -16,8 +16,8 @@ release_group: null images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index 6130435c..a7699828 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.19 test: python:3.6 pull_policy: "IfNotPresent" diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml index d06096ad..bc935bfa 100644 --- a/charts/promenade/values.yaml +++ b/charts/promenade/values.yaml @@ -49,7 +49,7 @@ conf: images: tags: monitoring_image: busybox:1.28.3 - hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.17.3 promenade: quay.io/airshipit/promenade:latest ks_user: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index 339bf9d7..00ac6c36 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -50,7 +50,7 @@ pod: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 07810589..69698233 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -81,8 +81,8 @@ secrets: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index 9e49bdeb..3ff6321d 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -48,10 +48,10 @@ Here is a complete sample document: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "" diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index 75674d7b..d12a8321 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -16,7 +16,7 @@ Sample Document to run containers in Docker runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: @@ -24,7 +24,7 @@ Sample Document to run containers in Docker runtime helm: helm: lachlanevenson/k8s-helm:v2.14.0 kubernetes: - kubectl: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + kubectl: gcr.io/google_containers/hyperkube-amd64:v1.17.3 packages: repositories: - deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable @@ -116,7 +116,7 @@ Sample Document to run containers in Containerd runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: @@ -124,7 +124,7 @@ Sample Document to run containers in Containerd runtime helm: helm: lachlanevenson/k8s-helm:v2.14.0 kubernetes: - kubectl: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + kubectl: gcr.io/google_containers/hyperkube-amd64:v1.17.3 packages: additional: - curl diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index ff1072d3..4c59f5f3 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index 59a0edc2..7a04dd85 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -12,15 +12,13 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/hyperkube - docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - file_path: /hyperkube - mode: 0555 - path: /opt/kubernetes/bin/kubelet - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service content: | diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 435c2572..bebb1290 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -627,7 +627,7 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.3 test: python:3.6 @@ -728,8 +728,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -794,8 +794,8 @@ data: values: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: private_key: placeholder @@ -868,8 +868,8 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 9489cd7c..3c7bd1cc 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -39,10 +39,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index 94cfa378..5bd71501 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -9,15 +9,13 @@ metadata: storagePolicy: cleartext data: files: - - path: /opt/kubernetes/bin/hyperkube - docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - file_path: /hyperkube - mode: 0555 - path: /opt/kubernetes/bin/kubelet - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/logrotate.d/json-logrotate mode: 0444 diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 4ec08017..46dd8d68 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -201,7 +201,7 @@ data: values: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -644,7 +644,7 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.3 test: python:3.6 @@ -730,8 +730,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: public_key: placeholder @@ -807,8 +807,8 @@ data: values: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: private_key: placeholder @@ -880,8 +880,8 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index d9afba6a..debfca59 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index e2443861..80490b87 100644 --- a/examples/containerd/HostSystem.yaml +++ b/examples/containerd/HostSystem.yaml @@ -12,15 +12,13 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/hyperkube - docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - file_path: /hyperkube - mode: 0555 - path: /opt/kubernetes/bin/kubelet - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service content: | diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 0cea57e3..cbe20648 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -524,7 +524,7 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.3 test: python:3.6 @@ -626,8 +626,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -692,8 +692,8 @@ data: values: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: private_key: placeholder @@ -766,8 +766,8 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index d9afba6a..debfca59 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index 41b43cf7..05bd43a9 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -12,15 +12,13 @@ data: kube-cgroup: enable: true files: - - path: /opt/kubernetes/bin/hyperkube - docker_image: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - file_path: /hyperkube - mode: 0555 - path: /opt/kubernetes/bin/kubelet - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - symlink: /opt/kubernetes/bin/hyperkube + tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service content: | diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index 8ffaed03..10e0cf4b 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -530,7 +530,7 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.3 test: python:3.6 @@ -632,8 +632,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -698,8 +698,8 @@ data: values: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: private_key: placeholder @@ -772,8 +772,8 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 source: type: local diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index bf19d60a..075e6c31 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -107,13 +107,13 @@ VALID_DOCS = [ }, 'kubernetes': { 'apiserver': - 'gcr.io/google_containers/hyperkube-amd64:v1.16.2', + 'gcr.io/google_containers/hyperkube-amd64:v1.17.3', 'controller-manager': - 'gcr.io/google_containers/hyperkube-amd64:v1.16.2', + 'gcr.io/google_containers/hyperkube-amd64:v1.17.3', 'etcd': 'quay.io/coreos/etcd:v3.4.2', 'scheduler': - 'gcr.io/google_containers/hyperkube-amd64:v1.16.2' + 'gcr.io/google_containers/hyperkube-amd64:v1.17.3' } }, 'ip': @@ -149,7 +149,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz' }, { 'content': @@ -166,7 +166,7 @@ VALID_DOCS = [ }, 'kubernetes': { 'kubectl': - 'gcr.io/google_containers/hyperkube-amd64:v1.16.2' + 'gcr.io/google_containers/hyperkube-amd64:v1.17.3' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index a7f04f5b..2d177fc6 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -36,10 +36,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller-manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 etcd: quay.io/coreos/etcd:v3.4.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index c20a9827..19c7017b 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -14,7 +14,7 @@ data: # attempt to actually run Kubernetes, only to construct the genesis and # join scripts. # - path: /opt/kubernetes/bin/kubelet - # tar_url: https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 - path: /etc/logrotate.d/json-logrotate diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index 2a9e5f8c..e8d20806 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -161,7 +161,7 @@ data: values: images: tags: - proxy: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + proxy: gcr.io/google_containers/hyperkube-amd64:v1.17.3 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -537,7 +537,7 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 haproxy: haproxy:1.8.3 test: python:3.6 @@ -629,8 +629,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - apiserver: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: public_key: placeholder @@ -706,8 +706,8 @@ data: values: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.17.3 secrets: service_account: private_key: placeholder @@ -779,8 +779,8 @@ data: images: tags: - anchor: gcr.io/google_containers/hyperkube-amd64:v1.16.2 - scheduler: gcr.io/google_containers/hyperkube-amd64:v1.16.2 + anchor: gcr.io/google_containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google_containers/hyperkube-amd64:v1.17.3 source: type: local diff --git a/tools/g2/lib/config.sh b/tools/g2/lib/config.sh index adf573e6..a5544044 100644 --- a/tools/g2/lib/config.sh +++ b/tools/g2/lib/config.sh @@ -2,7 +2,7 @@ export TEMP_DIR=${TEMP_DIR:-$(mktemp -d)} export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master} -export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.16.2} +export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.17.3} export NGINX_DIR="${TEMP_DIR}/nginx" export NGINX_URL="http://192.168.77.1:7777" export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local" diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index e410ddca..0c06bfdb 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,6 +8,6 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.2 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 -IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.16.2 +IMAGE_HYPERKUBE=gcr.io/google_containers/hyperkube-amd64:v1.17.3 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 -KUBELET_URL=https://dl.k8s.io/v1.16.2/kubernetes-node-linux-amd64.tar.gz +KUBELET_URL=https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 3d2dfae6..84abafc6 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,6 +1,6 @@ # source_name, tag, cache_name coredns/coredns,0.9.9,coredns -gcr.io/google_containers/hyperkube-amd64,v1.16.2,hyperkube +gcr.io/google_containers/hyperkube-amd64,v1.17.3,hyperkube gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 diff --git a/tools/simple-deployment.sh b/tools/simple-deployment.sh index e0ce09a6..ec642539 100755 --- a/tools/simple-deployment.sh +++ b/tools/simple-deployment.sh @@ -3,7 +3,7 @@ set -eux IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master} -IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.16.2} +IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.17.3} PROMENADE_DEBUG=${PROMENADE_DEBUG:-0} SCRIPT_DIR=$(realpath $(dirname $0)) @@ -60,8 +60,9 @@ if [[ -z $1 ]] || [[ $1 = build-all ]]; then echo === Prepare hyperkube === docker run --rm -t \ -v "${PROMENADE_TMP}:/tmp/${PROMENADE_TMP_LOCAL}" \ + --entrypoint 'cp' \ "${IMAGE_HYPERKUBE}" \ - cp /hyperkube "/tmp/${PROMENADE_TMP_LOCAL}" + /hyperkube "/tmp/${PROMENADE_TMP_LOCAL}" echo === Building bootstrap scripts === docker run --rm -t \