Merge pull request #1423 from fluxcd/remove-osm-e2e

e2e: Remove OSM tests

.github/workflows/e2e.yaml

@@ -22,7 +22,6 @@ jobs:
           # service mesh
           - istio
           - linkerd
-          - osm
           - kuma
           # ingress controllers
           - contour

test/osm/init-pre-test.sh

@@ -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

test/osm/install.sh

@@ -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

test/osm/run.sh

@@ -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

test/osm/test-canary.sh

@@ -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 <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1beta1
-kind: MetricTemplate
-metadata:
-  name: latency
-  namespace: osm-system
-spec:
-  provider:
-    type: prometheus
-    address: http://osm-prometheus.osm-system.svc:7070
-  query: |
-    histogram_quantile(
-        0.99,
-        sum(
-            rate(
-                osm_request_duration_ms_bucket{
-                    destination_namespace="{{ namespace }}",
-                    destination_kind="{{ variables.destination_kind }}",
-                    destination_name=~"{{ target }}"
-                }[{{ interval }}]
-            )
-        ) by (le)
-    )
-EOF
-
-echo '>>> Initialising canary'
-cat <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1beta1
-kind: Canary
-metadata:
-  name: podinfo
-  namespace: test
-spec:
-  provider: osm
-  targetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: podinfo
-  progressDeadlineSeconds: 60
-  service:
-    port: 9898
-    targetPort: 9898
-  analysis:
-    interval: 15s
-    threshold: 15
-    maxWeight: 50
-    stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: request-duration
-      thresholdRange:
-        max: 500
-      interval: 30s
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: osm-system
-      threshold: 300
-      interval: 1m
-      templateVariables:
-        destination_kind: Deployment
-    webhooks:
-      - name: acceptance-test
-        type: pre-rollout
-        url: http://flagger-loadtester.test/
-        timeout: 15s
-        metadata:
-          type: bash
-          cmd: "curl -sd 'test' http://podinfo-canary.test:9898/token | grep token"
-      - name: load-test
-        type: rollout
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo-canary.test:9898/"
-EOF
-
-echo '>>> 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 <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1beta1
-kind: Canary
-metadata:
-  name: podinfo
-  namespace: test
-spec:
-  provider: osm
-  targetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: podinfo
-  progressDeadlineSeconds: 60
-  service:
-    port: 9898
-    targetPort: 9898
-  analysis:
-    interval: 15s
-    threshold: 15
-    maxWeight: 50
-    stepWeight: 10
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: request-duration
-      thresholdRange:
-        max: 500
-      interval: 30s
-    - name: latency
-      templateRef:
-        name: latency
-        namespace: osm-system
-      threshold: 300
-      interval: 1m
-      templateVariables:
-        destination_kind: Deployment
-    webhooks:
-      - name: acceptance-test
-        type: pre-rollout
-        url: http://flagger-loadtester.test/
-        timeout: 15s
-        metadata:
-          type: bash
-          cmd: "curl -sd 'test' http://podinfo-canary.test:9898/token | grep token"
-      - name: load-test
-        type: rollout
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo-canary.test:9898/status/500"
-EOF
-
-echo '>>> 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'

test/osm/test-steps.sh

@@ -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 <<EOF | kubectl apply -f -
-apiVersion: flagger.app/v1beta1
-kind: Canary
-metadata:
-  name: podinfo
-  namespace: test
-spec:
-  provider: osm
-  targetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: podinfo
-  progressDeadlineSeconds: 600
-  service:
-    port: 9898
-    targetPort: 9898
-  analysis:
-    interval: 15s
-    threshold: 15
-    stepWeights: [10, 20, 30, 40, 50, 60]
-    metrics:
-    - name: request-success-rate
-      thresholdRange:
-        min: 99
-      interval: 1m
-    - name: request-duration
-      thresholdRange:
-        max: 500
-      interval: 30s
-    webhooks:
-      - name: acceptance-test
-        type: pre-rollout
-        url: http://flagger-loadtester.test/
-        timeout: 15s
-        metadata:
-          type: bash
-          cmd: "curl -sd 'test' http://podinfo-canary.test:9898/token | grep token"
-      - name: load-test
-        type: rollout
-        url: http://flagger-loadtester.test/
-        timeout: 5s
-        metadata:
-          cmd: "hey -z 10m -q 10 -c 2 http://podinfo-canary.test:9898/"
-EOF
-
-echo '>>> 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'