diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2498d791..a0470ee9 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -22,7 +22,6 @@ jobs: # service mesh - istio - linkerd - - osm - kuma # ingress controllers - contour diff --git a/test/osm/init-pre-test.sh b/test/osm/init-pre-test.sh deleted file mode 100755 index 3dade4b4..00000000 --- a/test/osm/init-pre-test.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit - -REPO_ROOT=$(git rev-parse --show-toplevel) - -${REPO_ROOT}/bin/linux-amd64/osm namespace add test -${REPO_ROOT}/bin/linux-amd64/osm metrics enable --namespace test - -kubectl patch deployment flagger-loadtester -n test -p '{"spec": {"template": {"metadata": {"annotations": {"openservicemesh.io/inbound-port-exclusion-list": "80, 8080"}}}}}' --type=merge -kubectl -n test rollout restart deploy/flagger-loadtester -kubectl -n test rollout status deploy/flagger-loadtester diff --git a/test/osm/install.sh b/test/osm/install.sh deleted file mode 100755 index 8a8f7cf6..00000000 --- a/test/osm/install.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit - -OSM_VER="v1.1.1" -REPO_ROOT=$(git rev-parse --show-toplevel) - -mkdir -p ${REPO_ROOT}/bin - -cd ${REPO_ROOT}/bin && curl -sL "https://github.com/openservicemesh/osm/releases/download/${OSM_VER}/osm-${OSM_VER}-linux-amd64.tar.gz" | tar xz -chmod +x ${REPO_ROOT}/bin/linux-amd64/osm - -echo ">>> Installing Open Service Mesh ${OSM_VER}" -${REPO_ROOT}/bin/linux-amd64/osm install \ ---set=osm.deployPrometheus=true \ ---set=osm.enablePermissiveTrafficPolicy=true \ ---set=osm.osmController.resource.limits.cpu=250m \ ---set=osm.osmController.resource.requests.cpu=250m \ ---set=osm.prometheus.resources.limits.cpu=250m \ ---set=osm.prometheus.resources.requests.cpu=250m \ ---set=osm.injector.resource.limits.cpu=250m \ ---set=osm.injector.resource.requests.cpu=250m \ ---set=osm.osmBootstrap.resource.limits.cpu=250m \ ---set=osm.osmBootstrap.resource.requests.cpu=250m - -${REPO_ROOT}/bin/linux-amd64/osm version - -echo '>>> Installing Flagger' -kubectl apply -k ${REPO_ROOT}/kustomize/osm - -kubectl -n osm-system set image deployment/flagger flagger=test/flagger:latest -kubectl -n osm-system rollout status deployment/flagger diff --git a/test/osm/run.sh b/test/osm/run.sh deleted file mode 100755 index 321fb67b..00000000 --- a/test/osm/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit - -REPO_ROOT=$(git rev-parse --show-toplevel) -DIR="$(cd "$(dirname "$0")" && pwd)" - -"$DIR"/install.sh - -${REPO_ROOT}/test/workloads/init.sh -"$DIR"/init-pre-test.sh -"$DIR"/test-canary.sh - -${REPO_ROOT}/test/workloads/init.sh -"$DIR"/init-pre-test.sh -"$DIR"/test-steps.sh diff --git a/test/osm/test-canary.sh b/test/osm/test-canary.sh deleted file mode 100755 index 89de1a29..00000000 --- a/test/osm/test-canary.sh +++ /dev/null @@ -1,226 +0,0 @@ -#!/usr/bin/env bash - -# This script runs OSM e2e tests for Canary initialization, analysis and promotion - -set -o errexit - -echo '>>> Create latency metric template' -cat <>> Initialising canary' -cat <>> Waiting for primary to be ready' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Initialized' && ok=true || ok=false - sleep 5 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary initialization test passed' - -passed=$(kubectl -n test get svc/podinfo -o jsonpath='{.spec.selector.app}' 2>&1 | { grep podinfo-primary || true; }) -if [ -z "$passed" ]; then - echo -e '\u2716 podinfo selector test failed' - exit 1 -fi - -echo '✔ Canary service custom metadata test passed' - -echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=ghcr.io/stefanprodan/podinfo:6.0.1 - -echo '>>> Waiting for canary promotion' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '6.0.1' && ok=true || ok=false - sleep 10 - kubectl -n osm-system logs deployment/flagger --tail 1 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - echo ">>> kubectl -n osm-system logs deployment/flagger" - kubectl -n osm-system logs deployment/flagger - echo ">>> kubectl -n test logs pod/$(kubectl get pods -n test | grep flagger-loadtester | awk '{print $1}') loadtester" - kubectl -n test logs pod/$(kubectl get pods -n test | grep flagger-loadtester | awk '{print $1}') loadtester - echo "No more retries left" - exit 1 - fi -done - -echo '>>> Waiting for canary finalization' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Succeeded' && ok=true || ok=false - sleep 5 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary promotion test passed' - -echo '>>> Initialising canary for canary rollback test' -cat <>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=ghcr.io/stefanprodan/podinfo:6.0.2 - -echo '>>> Waiting for canary rollback' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Failed' && ok=true || ok=false - sleep 10 - kubectl -n osm-system logs deployment/flagger --tail 1 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary rollback test passed' diff --git a/test/osm/test-steps.sh b/test/osm/test-steps.sh deleted file mode 100755 index 9857a987..00000000 --- a/test/osm/test-steps.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/env bash - -# This script runs OSM e2e tests for Canary initialization, analysis and promotion - -set -o errexit - -echo '>>> Initialising canary' -cat <>> Waiting for primary to be ready' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Initialized' && ok=true || ok=false - sleep 5 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary initialization test passed' - -echo '>>> Triggering canary deployment' -kubectl -n test set image deployment/podinfo podinfod=ghcr.io/stefanprodan/podinfo:6.0.1 - -echo '>>> Waiting for canary promotion' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test describe deployment/podinfo-primary | grep '6.0.1' && ok=true || ok=false - sleep 10 - kubectl -n osm-system logs deployment/flagger --tail 1 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '>>> Waiting for canary finalization' -retries=50 -count=0 -ok=false -until ${ok}; do - kubectl -n test get canary/podinfo | grep 'Succeeded' && ok=true || ok=false - sleep 5 - count=$(($count + 1)) - if [[ ${count} -eq ${retries} ]]; then - kubectl -n osm-system logs deployment/flagger - echo "No more retries left" - exit 1 - fi -done - -echo '✔ Canary promotion test passed'