Remove remaining hyperkube references
This change eliminates all remaining references to hyperkube, as it is no longer supported. Change-Id: Id0a4c142b1dc76561f7d2c18fb76edfc5a60267a
This commit is contained in:
parent
5323ca2710
commit
e2324e7db8
|
@ -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: ""
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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': {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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: ""
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue