kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11679 from olemarkus/e2e-ab-export-kubeconfig 

Use release markers instead of releases
This commit is contained in:
Kubernetes Prow Robot 2021-06-03 06:09:38 -07:00 committed by GitHub
parent 0c61bcaca4 ae8d8be192
commit bc49d9958d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/e2e/scenarios/lib/common.sh
View File

@ -63,4 +63,12 @@ function kops-download-from-base() {
wget -qO "${kops}" "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops" wget -qO "${kops}" "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops"
chmod +x "${kops}" chmod +x "${kops}"
echo "${kops}" echo "${kops}"
}
function kops-base-from-marker() {
if [[ "${1}" == "latest" ]]; then
curl -s "https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt"
else
curl -s "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-${1}/latest-ci.txt"
fi
} }

18
tests/e2e/scenarios/upgrade-ab/run-test.sh
View File

@ -22,7 +22,9 @@ if [ -z "$KOPS_VERSION_A" ] || [ -z "$K8S_VERSION_A" ] || [ -z "$KOPS_VERSION_B"
exit 1 exit 1
fi fi
KOPS_A=$(kops-download-release "${KOPS_VERSION_A}") export KOPS_BASE_URL
KOPS_BASE_URL=$(kops-base-from-marker "${KOPS_VERSION_A}")
KOPS_A=$(kops-download-from-base)
KOPS="${KOPS_A}" KOPS="${KOPS_A}"
${KUBETEST2} \ ${KUBETEST2} \
@ -33,18 +35,13 @@ ${KUBETEST2} \
# Export kubeconfig-a # Export kubeconfig-a
KUBECONFIG_A=$(mktemp -t kops.XXXXXXXXX) KUBECONFIG_A=$(mktemp -t kops.XXXXXXXXX)
"{KOPS_A}" export kubecfg --name "${CLUSTER_NAME}" --admin --kubeconfig "{KUBECONFIG_A}" "${KOPS_A}" export kubecfg --name "${CLUSTER_NAME}" --admin --kubeconfig "${KUBECONFIG_A}"
# Verify kubeconfig-a # Verify kubeconfig-a
kubectl get nodes -owide --kubeconfig="${KUBECONFIG_A}" kubectl get nodes -owide --kubeconfig="${KUBECONFIG_A}"
if [[ "${KOPS_VERSION_B}" == "source" ]]; then KOPS_BASE_URL=$(kops-base-from-marker "${KOPS_VERSION_B}")
export KOPS_BASE_URL KOPS_B=$(kops-download-from-base)
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
KOPS_B=$(kops-download-from-base)
else
KOPS_B=$(kops-download-release "${KOPS_VERSION_B}")
fi
KOPS="${KOPS_B}" KOPS="${KOPS_B}"
@ -55,7 +52,6 @@ KOPS="${KOPS_B}"
# Verify no additional changes # Verify no additional changes
"${KOPS_B}" update cluster "${KOPS_B}" update cluster
sleep 300
# Verify kubeconfig-a still works # Verify kubeconfig-a still works
kubectl get nodes -owide --kubeconfig "${KUBECONFIG_A}" kubectl get nodes -owide --kubeconfig "${KUBECONFIG_A}"
@ -69,7 +65,7 @@ kubectl get nodes -owide --kubeconfig="${KUBECONFIG_A}"
cp "${KOPS_B}" "${WORKSPACE}/kops" cp "${KOPS_B}" "${WORKSPACE}/kops"
"{KOPS_B}" export kubecfg --name "${CLUSTER_NAME}" --admin "${KOPS_B}" export kubecfg --name "${CLUSTER_NAME}" --admin
${KUBETEST2} \ ${KUBETEST2} \
--cloud-provider="${CLOUD_PROVIDER}" \ --cloud-provider="${CLOUD_PROVIDER}" \