Merge pull request #12029 from rifelpet/keypair-scenario

Assert the correct number of kubeconfig CAs during keypair rotation
This commit is contained in:
Kubernetes Prow Robot 2021-07-19 21:31:32 -07:00 committed by GitHub
commit 39b91c2ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions

View File

@ -40,17 +40,8 @@ ${KOPS} promote keypair all
${KOPS} update cluster --yes
${KOPS} rolling-update cluster --yes --validate-count=10
KUBECFG_PROMOTE=$(mktemp -t kubeconfig.XXXXXXXXX)
${KOPS} export kubecfg --admin --kubeconfig="${KUBECFG_PROMOTE}"
kubectl --kubeconfig="${KUBECFG_PROMOTE}" config view > "${REPORT_DIR}/promote.kubeconfig"
${KOPS} validate cluster --wait=10m --count=3
CA=$(kubectl --kubeconfig="${KUBECFG_PROMOTE}" config view --raw -o jsonpath="{.clusters[0].cluster.certificate-authority-data}" | base64 --decode)
if [ "$(echo "${CA}" | grep -c "BEGIN CERTIFICATE")" != "1" ]; then
>&2 echo unexpected number of CA certificates in kubeconfig
exit 1
fi
export KUBECONFIG="${KUBECFG_PROMOTE}"
${KOPS} distrust keypair all
${KOPS} update cluster --yes
${KOPS} rolling-update cluster --yes --validate-count=10
@ -59,5 +50,11 @@ KUBECFG_DISTRUST=$(mktemp -t kubeconfig.XXXXXXXXX)
${KOPS} export kubecfg --admin --kubeconfig="${KUBECFG_DISTRUST}"
kubectl --kubeconfig="${KUBECFG_DISTRUST}" config view > "${REPORT_DIR}/distrust.kubeconfig"
CA=$(kubectl --kubeconfig="${KUBECFG_DISTRUST}" config view --raw -o jsonpath="{.clusters[0].cluster.certificate-authority-data}" | base64 --decode)
if [ "$(echo "${CA}" | grep -c "BEGIN CERTIFICATE")" != "1" ]; then
>&2 echo unexpected number of CA certificates in kubeconfig
exit 1
fi
export KUBECONFIG="${KUBECFG_DISTRUST}"
${KOPS} validate cluster --wait=10m --count=3

View File

@ -118,8 +118,8 @@ function kops-up() {
create_args="${create_args} --zones=${ZONES}"
fi
${KUBETEST2} \
--up \
--kops-binary-path="${KOPS}" \
--kubernetes-version="1.21.0" \
--create-args="${create_args}"
--up \
--kops-binary-path="${KOPS}" \
--kubernetes-version="1.21.0" \
--create-args="${create_args}"
}