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

Merge pull request #13476 from olemarkus/use-latest-lbc-test 

Use latest stable release by default for scenario test
This commit is contained in:
Kubernetes Prow Robot 2022-04-10 07:16:05 -07:00 committed by GitHub
parent 24437366e6 f20547cce6
commit 9f1947d831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/e2e/scenarios/aws-lb-controller/run-test.sh
View File

@ -41,7 +41,7 @@ REPORT_DIR="${ARTIFACTS:-$(pwd)/_artifacts}/aws-lb-controller/"
# shellcheck disable=SC2164 # shellcheck disable=SC2164
cd "$(mktemp -dt kops.XXXXXXXXX)" cd "$(mktemp -dt kops.XXXXXXXXX)"
go get github.com/onsi/ginkgo/ginkgo go install github.com/onsi/ginkgo/ginkgo@latest
git clone https://github.com/kubernetes-sigs/aws-load-balancer-controller . git clone https://github.com/kubernetes-sigs/aws-load-balancer-controller .

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

@ -50,12 +50,6 @@ if [[ -z "${DISCOVERY_STORE-}" ]]; then
DISCOVERY_STORE="${KOPS_STATE_STORE-}" DISCOVERY_STORE="${KOPS_STATE_STORE-}"
fi fi
if [[ ${KOPS_IRSA-} = true ]]; then
OVERRIDES="${OVERRIDES-} --override=cluster.spec.serviceAccountIssuerDiscovery.discoveryStore=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
OVERRIDES="${OVERRIDES} --override=cluster.spec.serviceAccountIssuerDiscovery.enableAWSOIDCProvider=true"
OVERRIDES="${OVERRIDES} --override=cluster.spec.iam.useServiceAccountExternalPermissions=true"
fi
export GO111MODULE=on export GO111MODULE=on
if [[ -z "${AWS_SSH_PRIVATE_KEY_FILE-}" ]]; then if [[ -z "${AWS_SSH_PRIVATE_KEY_FILE-}" ]]; then
@ -117,7 +111,7 @@ function kops-acquire-latest() {
KOPS_BASE_URL="" KOPS_BASE_URL=""
fi fi
$KUBETEST2 --build $KUBETEST2 --build
KOPS="${REPO_ROOT}/.bazelbuild/dist/linux/amd64/kops" KOPS="${REPO_ROOT}/.build/dist/linux/amd64/kops"
KOPS_BASE_URL=$(cat "${REPO_ROOT}/.kubetest2/kops-base-url") KOPS_BASE_URL=$(cat "${REPO_ROOT}/.kubetest2/kops-base-url")
export KOPS_BASE_URL export KOPS_BASE_URL
echo "KOPS_BASE_URL=$KOPS_BASE_URL" echo "KOPS_BASE_URL=$KOPS_BASE_URL"
@ -131,7 +125,11 @@ function kops-up() {
create_args="${create_args} --zones=${ZONES}" create_args="${create_args} --zones=${ZONES}"
fi fi
if [[ -z "${K8S_VERSION-}" ]]; then if [[ -z "${K8S_VERSION-}" ]]; then
K8S_VERSION="v1.22.1" K8S_VERSION="$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)"
fi
if [[ ${KOPS_IRSA-} = true ]]; then
create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
fi fi
${KUBETEST2} \ ${KUBETEST2} \