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

Wait for KinD nodes to be ready in CI (#4488) 

* Wait for all nodes to be ready in CI

Signed-off-by: Kevin Leimkuhler <kevin@kleimkuhler.com>
This commit is contained in:
Kevin Leimkuhler 2020-05-28 13:56:09 -07:00 committed by GitHub
parent 9a02e0d300
commit 8f5ff8d973
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/kind_integration.yml vendored
View File

@ -127,10 +127,10 @@ jobs:
[[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]] [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
- name: Setup default KinD cluster - name: Setup default KinD cluster
if: matrix.integration_test != 'custom_domain' if: matrix.integration_test != 'custom_domain'
run: bin/kind create cluster run: bin/kind create cluster --wait 300s
- name: Setup custom_domain KinD cluster - name: Setup custom_domain KinD cluster
if: matrix.integration_test == 'custom_domain' if: matrix.integration_test == 'custom_domain'
run: bin/kind create cluster --config test/testdata/custom_cluster_domain_config.yaml run: bin/kind create cluster --wait 300s --config test/testdata/custom_cluster_domain_config.yaml
- name: Load image archives into the local KinD cluster - name: Load image archives into the local KinD cluster
if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork
env: env:

4
.github/workflows/release.yml vendored
View File

@ -126,10 +126,10 @@ jobs:
[[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]] [[ "$TAG" == "$($HOME/.linkerd version --short --client)" ]]
- name: Setup default KinD cluster - name: Setup default KinD cluster
if: matrix.integration_test != 'custom_domain' if: matrix.integration_test != 'custom_domain'
run: bin/kind create cluster run: bin/kind create cluster --wait 300s
- name: Setup custom_domain KinD cluster - name: Setup custom_domain KinD cluster
if: matrix.integration_test == 'custom_domain' if: matrix.integration_test == 'custom_domain'
run: bin/kind create cluster --config test/testdata/custom_cluster_domain_config.yaml run: bin/kind create cluster --wait 300s --config test/testdata/custom_cluster_domain_config.yaml
- name: Load image archives into the local KinD cluster - name: Load image archives into the local KinD cluster
env: env:
PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1 PROXY_INIT_IMAGE_NAME: gcr.io/linkerd-io/proxy-init:v1.3.1

12
bin/_test-run.sh
View File

@ -173,13 +173,19 @@ install_stable() {
local linkerd_path=$tmp/.linkerd2/bin/linkerd local linkerd_path=$tmp/.linkerd2/bin/linkerd
local stable_namespace=$1 local stable_namespace=$1
local test_app_namespace=$stable_namespace-upgrade-test local test_app_namespace=$stable_namespace-upgrade-test
$linkerd_path install --linkerd-namespace="$stable_namespace" | kubectl --context=$k8s_context apply -f - > /dev/null 2>&1 (
$linkerd_path check --linkerd-namespace="$stable_namespace" > /dev/null 2>&1 set -x
"$linkerd_path" install --linkerd-namespace="$stable_namespace" | kubectl --context="$k8s_context" apply -f - 2>&1
"$linkerd_path" check --linkerd-namespace="$stable_namespace" 2>&1
)
#Now we need to install the app that will be used to verify that upgrade does not break anything #Now we need to install the app that will be used to verify that upgrade does not break anything
kubectl --context=$k8s_context create namespace "$test_app_namespace" > /dev/null 2>&1 kubectl --context=$k8s_context create namespace "$test_app_namespace" > /dev/null 2>&1
kubectl --context=$k8s_context label namespaces "$test_app_namespace" 'linkerd.io/is-test-data-plane'='true' > /dev/null 2>&1 kubectl --context=$k8s_context label namespaces "$test_app_namespace" 'linkerd.io/is-test-data-plane'='true' > /dev/null 2>&1
$linkerd_path inject --linkerd-namespace="$stable_namespace" "$test_directory/testdata/upgrade_test.yaml" | kubectl --context=$k8s_context apply --namespace="$test_app_namespace" -f - > /dev/null 2>&1 (
set -x
"$linkerd_path" inject --linkerd-namespace="$stable_namespace" "$test_directory/testdata/upgrade_test.yaml" | kubectl --context="$k8s_context" apply --namespace="$test_app_namespace" -f - 2>&1
)
} }
# Run the upgrade test by upgrading the most-recent stable release to the HEAD of # Run the upgrade test by upgrading the most-recent stable release to the HEAD of