Skip to content

Commit f87f1f3

Browse files
authored
Merge pull request #6590 from jsturtevant/update-kubeadm-script-registry.k8s.io
🌱 Remove CI image pull and tagging for kubeadm injection script
2 parents 7859f47 + 30ba31a commit f87f1f3

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh.tpl

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
6565
CI_DIR=/tmp/k8s-ci
6666
mkdir -p "$${CI_DIR}"
6767
declare -a PACKAGES_TO_TEST=("kubectl" "kubelet" "kubeadm")
68-
{{- if .IsControlPlaneMachine }}
69-
declare -a CONTAINERS_TO_TEST=("kube-apiserver" "kube-controller-manager" "kube-proxy" "kube-scheduler")
70-
{{- else }}
71-
declare -a CONTAINERS_TO_TEST=("kube-proxy")
72-
{{- end }}
73-
CONTAINER_EXT="tar"
7468
echo "* testing CI version $${KUBERNETES_VERSION}"
7569
# Check for semver
7670
if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
@@ -102,17 +96,6 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
10296
done
10397
systemctl restart kubelet
10498
fi
105-
for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
106-
# Redirect: https://dl.k8s.io/release/{path}
107-
# e.g. https://dl.k8s.io/release/v1.20.4/bin/linux/amd64/kube-apiserver.tar
108-
# Browser: https://gcsweb.k8s.io/gcs/kubernetes-release/
109-
# e.g. https://gcsweb.k8s.io/gcs/kubernetes-release/release/v1.20.4/bin/linux/amd64
110-
echo "* downloading package: $${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
111-
wget "$${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}" -O "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
112-
$${SUDO} ctr -n k8s.io images import "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" || echo "* ignoring expected 'ctr images import' result"
113-
$${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "k8s.gcr.io/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
114-
$${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
115-
done
11699
fi
117100
echo "* checking binary versions"
118101
echo "ctr version: " "$(ctr version)"

0 commit comments

Comments
 (0)