From e2324e7db849b22b80f66ef184f22469a2ba05fd Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Fri, 15 Jan 2021 05:53:32 +0000 Subject: [PATCH] Remove remaining hyperkube references This change eliminates all remaining references to hyperkube, as it is no longer supported. Change-Id: Id0a4c142b1dc76561f7d2c18fb76edfc5a60267a --- doc/source/configuration/genesis.rst | 6 +++--- doc/source/configuration/host-system.rst | 6 ++---- promenade/templates/include/up.sh | 8 -------- tests/unit/api/test_validatedesign.py | 15 ++++++++------- tests/unit/builder_data/simple/Genesis.yaml | 6 +++--- .../builder_data/simple/armada-resources.yaml | 16 ++++++++-------- tools/g2/stages/genesis.sh | 2 +- .../bootstrap-armada-config.yaml | 16 ++++++++-------- tools/gate/config-templates/genesis-config.yaml | 6 +++--- tools/gate/config-templates/site-config.yaml | 3 --- tools/gate/default-config-env | 6 +++++- 11 files changed, 41 insertions(+), 49 deletions(-) diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index b3f1b89d..fc8b8fd0 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: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 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 ac480818..4a7714eb 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -23,8 +23,7 @@ Sample Document to run containers in Docker runtime haproxy: haproxy:1.8.3 helm: helm: lachlanevenson/k8s-helm:v2.14.0 - kubernetes: - kubectl: k8s.gcr.io/hyperkube-amd64:v1.18.6 + monitoring_image: busybox:1.28.3 packages: repositories: - deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable @@ -123,8 +122,7 @@ Sample Document to run containers in Containerd runtime haproxy: haproxy:1.8.3 helm: helm: lachlanevenson/k8s-helm:v2.14.0 - kubernetes: - kubectl: k8s.gcr.io/hyperkube-amd64:v1.18.6 + monitoring_image: busybox:1.28.3 packages: additional: - curl diff --git a/promenade/templates/include/up.sh b/promenade/templates/include/up.sh index 75473214..6bf51cb2 100644 --- a/promenade/templates/include/up.sh +++ b/promenade/templates/include/up.sh @@ -147,13 +147,5 @@ fi if systemctl -q is-enabled containerd > /dev/null 2>&1; then systemctl restart containerd || true fi -# Pull the hyperkube image prior to restarting kubelet, this is -# needed for more reliable image pull in an environment with slow -# network connectivity to avoid image pull timeouts and retries by -# kubelet. -# The || true is added to let the deployment continue, evenif the -# $IMAGE_HYPERKUBE is not defined in the environment, and the image -# pull doesn't happen. -docker image pull "${IMAGE_HYPERKUBE}" || true systemctl enable kubelet systemctl restart kubelet diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index c419997d..11767750 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -106,10 +106,14 @@ VALID_DOCS = [ 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.16.1' }, 'kubernetes': { - 'apiserver': 'k8s.gcr.io/hyperkube-amd64:v1.18.6', - 'controller-manager': 'k8s.gcr.io/hyperkube-amd64:v1.18.6', - 'etcd': 'quay.io/coreos/etcd:v3.4.3', - 'scheduler': 'k8s.gcr.io/hyperkube-amd64:v1.18.6' + 'apiserver': + 'k8s.gcr.io/kube-apiserver-amd64:v1.18.6', + 'controller-manager': + 'k8s.gcr.io/kube-controller-manager-amd64:v1.18.6', + 'etcd': + 'quay.io/coreos/etcd:v3.4.3', + 'scheduler': + 'k8s.gcr.io/kube-scheduler-amd64:v1.18.6' } }, 'ip': @@ -159,9 +163,6 @@ VALID_DOCS = [ 'haproxy': 'haproxy:1.8.3', 'helm': { 'helm': 'lachlanevenson/k8s-helm:v2.14.0' - }, - 'kubernetes': { - 'kubectl': 'k8s.gcr.io/hyperkube-amd64:v1.18.6' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 8a2548b9..3d193971 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: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index fe34d9e2..4503712c 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: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -537,7 +537,7 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -629,8 +629,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 secrets: service_account: public_key: placeholder @@ -706,8 +706,8 @@ data: values: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 secrets: service_account: private_key: placeholder @@ -779,8 +779,8 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 source: type: local diff --git a/tools/g2/stages/genesis.sh b/tools/g2/stages/genesis.sh index 1bb20c90..cc04fe2b 100755 --- a/tools/g2/stages/genesis.sh +++ b/tools/g2/stages/genesis.sh @@ -7,7 +7,7 @@ source "${GATE_UTILS}" rsync_cmd "${TEMP_DIR}/scripts"/*genesis* "${GENESIS_NAME}:/root/promenade/" set -o pipefail -ssh_cmd "${GENESIS_NAME}" env "IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE}" \ +ssh_cmd "${GENESIS_NAME}" \ env "PROMENADE_ENCRYPTION_KEY=${PROMENADE_ENCRYPTION_KEY}" \ /root/promenade/genesis.sh 2>&1 | tee -a "${LOG_FILE}" ssh_cmd "${GENESIS_NAME}" /root/promenade/validate-genesis.sh 2>&1 | tee -a "${LOG_FILE}" diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml index c730e6aa..c8e2667b 100644 --- a/tools/gate/config-templates/bootstrap-armada-config.yaml +++ b/tools/gate/config-templates/bootstrap-armada-config.yaml @@ -129,7 +129,7 @@ data: values: images: tags: - proxy: ${IMAGE_HYPERKUBE} + proxy: ${IMAGE_PROXY} network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -558,7 +558,7 @@ data: images: tags: - anchor: ${IMAGE_HYPERKUBE} + anchor: ${IMAGE_ANCHOR} haproxy: ${IMAGE_HAPROXY} source: @@ -642,8 +642,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: ${IMAGE_HYPERKUBE} - apiserver: ${IMAGE_HYPERKUBE} + anchor: ${IMAGE_ANCHOR} + apiserver: ${IMAGE_APISERVER} secrets: service_account: public_key: placeholder @@ -718,8 +718,8 @@ data: values: images: tags: - anchor: ${IMAGE_HYPERKUBE} - controller_manager: ${IMAGE_HYPERKUBE} + anchor: ${IMAGE_ANCHOR} + controller_manager: ${IMAGE_CONTROLLER_MANAGER} secrets: service_account: private_key: placeholder @@ -790,8 +790,8 @@ data: images: tags: - anchor: ${IMAGE_HYPERKUBE} - scheduler: ${IMAGE_HYPERKUBE} + anchor: ${IMAGE_ANCHOR} + scheduler: ${IMAGE_SCHEDULER} source: type: local diff --git a/tools/gate/config-templates/genesis-config.yaml b/tools/gate/config-templates/genesis-config.yaml index 96e41d76..14931624 100644 --- a/tools/gate/config-templates/genesis-config.yaml +++ b/tools/gate/config-templates/genesis-config.yaml @@ -34,10 +34,10 @@ data: helm: tiller: ${IMAGE_TILLER} kubernetes: - apiserver: ${IMAGE_HYPERKUBE} - controller-manager: ${IMAGE_HYPERKUBE} + apiserver: ${IMAGE_APISERVER} + controller-manager: ${IMAGE_CONTROLLER_MANAGER} etcd: ${IMAGE_ETCD} - scheduler: ${IMAGE_HYPERKUBE} + scheduler: ${IMAGE_SCHEDULER} files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "" diff --git a/tools/gate/config-templates/site-config.yaml b/tools/gate/config-templates/site-config.yaml index e3e3c61b..953de315 100644 --- a/tools/gate/config-templates/site-config.yaml +++ b/tools/gate/config-templates/site-config.yaml @@ -73,10 +73,7 @@ data: haproxy: ${IMAGE_HAPROXY} helm: helm: ${IMAGE_HELM} - kubernetes: - kubectl: ${IMAGE_HYPERKUBE} packages: - repositories: repositories: - deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable keys: diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 425e5016..2f2b1081 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,6 +8,10 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.3 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 -IMAGE_HYPERKUBE=k8s.gcr.io/hyperkube-amd64:v1.18.6 +IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.18.6 +IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 +IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.18.6 +IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.18.6 +IMAGE_ANCHOR=cwedgwood/kubectl:v1.18.6-4 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 KUBELET_URL=https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz