diff --git a/Makefile b/Makefile index 02bd7af060a..b8be5ed038a 100644 --- a/Makefile +++ b/Makefile @@ -152,44 +152,25 @@ test: manifests generate fmt vet ## Run unit tests. .PHONY: e2e-tests-ginkgo -e2e-tests-ginkgo: e2e-tests-sequential-ginkgo e2e-tests-parallel-ginkgo ## Runs kuttl e2e sequential and parallel tests +e2e-tests-ginkgo: e2e-tests-sequential-ginkgo e2e-tests-parallel-ginkgo ## Runs Ginkgo e2e sequential and parallel tests .PHONY: e2e-tests-sequential-ginkgo -e2e-tests-sequential-ginkgo: ginkgo ## Runs kuttl e2e sequential tests +e2e-tests-sequential-ginkgo: ginkgo ## Runs Ginkgo e2e sequential tests @echo "Running GitOps Operator sequential Ginkgo E2E tests..." $(GINKGO_CLI) -v --trace --timeout 240m -r ./test/openshift/e2e/ginkgo/sequential -.PHONY: e2e-tests-parallel-ginkgo ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time) +.PHONY: e2e-tests-parallel-ginkgo ## Runs Ginkgo e2e parallel tests, (Defaults to 5 runs at a time) e2e-tests-parallel-ginkgo: ginkgo @echo "Running GitOps Operator parallel Ginkgo E2E tests..." $(GINKGO_CLI) -p -v -procs=5 --trace --timeout 60m -r ./test/openshift/e2e/ginkgo/parallel .PHONY: e2e-tests-sequential e2e-tests-sequential: - CI=prow make e2e-tests-sequential-ginkgo ## Runs kuttl e2e sequentail tests -# @echo "Running GitOps Operator sequential E2E tests..." -# . ./scripts/run-kuttl-tests.sh sequential + CI=prow make e2e-tests-sequential-ginkgo ## Runs Ginkgo e2e sequential tests -.PHONY: e2e-tests-parallel ## Runs kuttl e2e parallel tests, (Defaults to 5 runs at a time) +.PHONY: e2e-tests-parallel ## Runs Ginkgo e2e parallel tests, (Defaults to 5 runs at a time) e2e-tests-parallel: CI=prow make e2e-tests-parallel-ginkgo - # @echo "Running GitOps Operator parallel E2E tests..." - # . ./scripts/run-kuttl-tests.sh parallel - -.PHONY: e2e-non-olm-tests-sequential -e2e-non-olm-tests-sequential: ## Runs kuttl non-olm e2e sequentail tests - @echo "Running Non-OLM GitOps Operator sequential E2E tests..." - . ./hack/scripts/run-non-olm-kuttl-test.sh -t sequential - -.PHONY: e2e-non-olm-tests-parallel ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time) -e2e-non-olm-tests-parallel: - @echo "Running Non-OLM GitOps Operator parallel E2E tests..." - . ./hack/scripts/run-non-olm-kuttl-test.sh -t parallel - -.PHONY: e2e-non-olm-tests-all ## Runs kuttl non-olm e2e parallel tests, (Defaults to 5 runs at a time) -e2e-non-olm-tests-all: - @echo "Running Non-OLM GitOps Operator E2E tests..." - . ./hack/scripts/run-non-olm-kuttl-test.sh -t all ##@ Build diff --git a/hack/scripts/README.md b/hack/scripts/README.md index 42daca4545f..0ef3eb44072 100644 --- a/hack/scripts/README.md +++ b/hack/scripts/README.md @@ -1,18 +1,13 @@ -### Non OLM based operator e2e kuttl test +### Non-OLM operator: Ginkgo E2E tests -`run-non-olm-kuttl-test.sh` is a bash script utility, that can be used to run the end to end test for Openshift GitOps Operator without using the `Operator Lifecycle Manager (OLM)`. +When the operator is installed without OLM (for example via a plain `Deployment` in `openshift-gitops-operator`), run the OpenShift E2E suite with `NON_OLM=true` so tests that require a `Subscription` or productized images are skipped. -### Usage +From the repository root: -The `run-non-olm-kuttl-test.sh` script needs to be run with argument specifying the test suite to be run with . +```bash +NON_OLM=true make e2e-tests-sequential-ginkgo +# and/or +NON_OLM=true make e2e-tests-parallel-ginkgo +``` -run-non-olm-kuttl-test.sh [ -t sequential|parallel|all ] - -Example - -`./run-non-olm-kuttl-test.sh -t parallel` will run the entire parallel test suite. By default it will run all the tests. - -The directories that are not needed for the nightly operator are excluded before running the tests. -If you want to add more excluded tests, you can do so by using an environment variable called `EXCLUDED_TESTS` like so, - -`export EXCLUDED_TESTS="1-031_validate_toolchain 1-085_validate_dynamic_plugin_installation 1-038_validate_productized_images"` \ No newline at end of file +See `test/openshift/e2e/README.md` for full options (`LOCAL_RUN`, `SKIP_HA_TESTS`, and so on). diff --git a/hack/scripts/run-non-olm-kuttl-test.sh b/hack/scripts/run-non-olm-kuttl-test.sh deleted file mode 100755 index 3eefb53ed36..00000000000 --- a/hack/scripts/run-non-olm-kuttl-test.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -export NON_OLM="true" - -set -x - -ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -sequential_suite=$ROOT/../../test/openshift/e2e/sequential/ -parallel_suite=$ROOT/../../test/openshift/e2e/parallel/ - -testsuite="all" - -# Get test suite argument -while getopts ":t:" opt; do - case ${opt} in - t) testsuite=$OPTARG;; - \?) echo "Please provide options sequential/parallel/all -$OPTARG" >&2;; - esac -done - -# these tests will be removed while running non-olm operator test -# 1-031_validate_toolchain -# 1-085_validate_dynamic_plugin_installation -# 1-036_validate_keycloak_resource_reqs -# 1-038_validate_productized_images -# 1-051-validate_csv_permissions -# 1-073_validate_rhsso -# 1-077_validate_disable_dex_removed -# 1-090_validate_permissions - -filenames="1-031_validate_toolchain 1-085_validate_dynamic_plugin_installation 1-036_validate_keycloak_resource_reqs 1-038_validate_productized_images 1-051-validate_csv_permissions 1-073_validate_rhsso 1-077_validate_disable_dex_removed 1-090_validate_permissions" - -if [ -n "$EXCLUDED_TESTS" ]; then - filenames="${filenames} ${EXCLUDED_TESTS}" -fi - -temp_dir=$(mktemp -d "${TMPDIR:-"/tmp"}/kuttl-non-olm-tests-XXXXXXX") - -cp -R "$sequential_suite" "$temp_dir" - -cp -R "$parallel_suite" "$temp_dir" - -for dir in $filenames ; do - if [ -d "$temp_dir/sequential/$dir" ]; then - echo "Deleting directory $dir" - rm -rf "$temp_dir/sequential/$dir" - elif [ -d "$temp_dir/parallel/$dir" ]; then - echo "Deleting directory $dir" - rm -rf "$temp_dir/parallel/$dir" - else - echo "Directory $dir does not exist" - fi -done - -#replace the namespace for assert in test file - -if [ -d "$temp_dir/sequential/1-018_validate_disable_default_instance" ]; then - sed -i 's/openshift-operators/openshift-gitops-operator/g' $temp_dir/sequential/1-018_validate_disable_default_instance/02-assert.yaml -fi - -if [ -d "$temp_dir/sequential/1-035_validate_argocd_secret_repopulate" ]; then - sed -i 's/openshift-operators/openshift-gitops-operator/g' $temp_dir/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml -fi - -cleanup() { - rm -rf "$temp_dir" - echo "Deleted temp test directory $temp_dir" -} - -trap cleanup EXIT INT - -script="$ROOT/../../scripts/run-kuttl-tests.sh" - -# Check if the file exists before executing it -if [ -e "$script" ]; then - chmod +x "$script" -else - echo "ERROR: Script file '$script' not found." -fi - -export TEST_BASE_DIR=$temp_dir - -# Run the specific test suite -case "$testsuite" in -"parallel") - source "$script" parallel - ;; -"sequential") - source "$script" sequential - ;; -"all") - source "$script" all - ;; -*) - echo "USAGE: $0 (parallel|sequential|all)" >&2 - exit 1 -esac \ No newline at end of file diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 5088deb2080..bdc1d89b03b 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -3,17 +3,12 @@ FROM quay.io/devtools_gitops/go-toolset:1.25.5 USER root -ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.35.0 # Install kubectl tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ chmod +x /usr/local/bin/kubectl -# Install kubectl-kuttl tool which is used in e2e-tests -RUN curl -sSL -o /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v${KUBECTL_KUTTL_VERSION}/kubectl-kuttl_${KUBECTL_KUTTL_VERSION}_linux_x86_64 && \ - chmod +x /usr/local/bin/kubectl-kuttl - # Install argocd cli tool which is used in e2e-tests RUN curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 && \ chmod +x /usr/local/bin/argocd diff --git a/scripts/openshiftci-olm-kuttl-tests.sh b/scripts/openshiftci-olm-kuttl-tests.sh old mode 100755 new mode 100644 index c44dd23490f..32c1161cc17 --- a/scripts/openshiftci-olm-kuttl-tests.sh +++ b/scripts/openshiftci-olm-kuttl-tests.sh @@ -83,7 +83,7 @@ if [ "$E2E_SKIP_OPERATOR_INSTALLATION" = false ]; then install_operator_resources fi -header "Running kuttl e2e tests" +header "Running Ginkgo e2e tests" make e2e-tests-sequential || failed=1 if [[ "$IGNORE_PARALLEL_TESTS" = "false" ]]; then diff --git a/scripts/run-kuttl-tests.sh b/scripts/run-kuttl-tests.sh deleted file mode 100755 index 8af2ab90ed1..00000000000 --- a/scripts/run-kuttl-tests.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/usr/bin/env bash - -# fail if some commands fails -set -e - -# Do not show token in CI log -set +x - -# show commands -set -x -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source $DIR/e2e-common.sh - -testsuite="$1" -report=${report:-"json"} -current_time=${current_time:-$(date "+%Y.%m.%d-%H.%M.%S")} - -# deletes the temp directory -cleanup() { - if test -f $WORK_DIR/results/kuttl-test.$report; then - echo "Copying results" - mv $WORK_DIR/results/kuttl-test.$report $DIR/results/$testsuite-results-$current_time.$report - mv $WORK_DIR/results/$testsuite.log $DIR/results/$testsuite-results-$current_time.log - fi - - rm -rf "$WORK_DIR" - echo "Deleted temp working directory $WORK_DIR" -} - -# Simple wrapper to run the acceptance tests for GitOps Operator - - -TEST_BASE_DIR=${TEST_BASE_DIR:-"$DIR/../test/openshift/e2e"} - -run_parallel() { - if test -f $WORK_DIR/results/kuttl-test.$report; then - rm -f $WORK_DIR/results/kuttl-test.$report - fi - - echo "Running parallel test suite" - kubectl kuttl test $TEST_BASE_DIR/parallel --artifacts-dir $WORK_DIR/results --config $DIR/../test/openshift/e2e/parallel/kuttl-test.yaml --report $report 2>&1 | tee $WORK_DIR/results/$testsuite.log - if [ ${PIPESTATUS[0]} != 0 ]; then - failed=1 - fi -} - -run_sequential() { - if test -f $WORK_DIR/results/kuttl-test.$report; then - rm -f $WORK_DIR/results/kuttl-test.$report - fi - - echo "Running sequential test suite" - kubectl kuttl test $TEST_BASE_DIR/sequential --artifacts-dir $WORK_DIR/results --config $DIR/../test/openshift/e2e/sequential/kuttl-test.yaml --report $report 2>&1 | tee $WORK_DIR/results/$testsuite.log - if [ ${PIPESTATUS[0]} != 0 ]; then - failed=1 - fi -} - -run_cmd_silent() { - $* >/dev/null 2>&1 - return $? -} - -check_prereqs() { - if ! run_cmd_silent jq --version; then - echo "jq not found" >&2 - return 1 - fi - if ! run_cmd_silent curl --version; then - echo "curl not found" >&2 - return 1 - fi - if ! run_cmd_silent oc version --client; then - echo "oc not found" >&2 - return 1 - fi - if ! run_cmd_silent kubectl version --client; then - echo "kubectl not found" >&2 - return 1 - fi - if ! run_cmd_silent oc project openshift-gitops; then - echo "OpenShift GitOps seems not to be installed in your cluster" >&2 - echo "No openshift-gitops namespace found in your cluster, or cluster down." >&2 - return 1 - fi - return 0 -} - -failed=0 - -if ! check_prereqs; then - echo "Pre-requisites not met. Exiting." - exit 1 -fi - -# the temp directory used, within $DIR -# omit the -p parameter to create a temporal directory in the default location -WORK_DIR=`mktemp -d -p "$DIR"` - -# check if tmp dir was created -if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then - echo "Could not create temp dir" - exit 1 -fi - -# register the cleanup function to be called on the EXIT signal -trap cleanup EXIT - -# Handle ctrl+c -trap unexpectedError INT - -mkdir -p $WORK_DIR/results || exit 1 -mkdir -p $DIR/results || exit 1 - -case "$testsuite" in -"parallel") - header "Running $testsuite tests" - run_parallel $2 - ;; -"sequential") - header "Running $testsuite tests" - run_sequential $2 - ;; -"all") - header "Running $testsuite tests" - run_parallel - run_sequential - ;; -*) - echo "USAGE: $0 (parallel|sequential|all)" >&2 - exit 1 -esac - -(( failed )) && fail_test "$testsuite tests failed" -success $testsuite diff --git a/test/examples/Readme.md b/test/examples/Readme.md index 17da52c0af1..2e9899a1b0f 100644 --- a/test/examples/Readme.md +++ b/test/examples/Readme.md @@ -2,7 +2,7 @@ This directory contains examples for testing gitops operator. -We used to use some of our personal github profiles in Kuttl testing repository as a repoURL. We decided to centralized location for storing them in gitops-operator repo and eliminate the dependency of personal account of a developer or QE. +We used to use some of our personal GitHub profiles in older E2E fixtures as a `repoURL`. We centralized these examples in the gitops-operator repo to avoid depending on a developer or QE personal account. ## How these examples are used? diff --git a/test/openshift/e2e/README.md b/test/openshift/e2e/README.md index c211df1c225..937c569bb4f 100644 --- a/test/openshift/e2e/README.md +++ b/test/openshift/e2e/README.md @@ -62,7 +62,7 @@ You can skip non-local-supported tests by setting `LOCAL_RUN=true`: ```bash LOCAL_RUN=true make e2e-tests-sequential-ginkgo # and/or -LOCAL_RUN=true make e2e-tests-sequential-parallel +LOCAL_RUN=true make e2e-tests-parallel-ginkgo ``` @@ -224,7 +224,7 @@ defer cleanupFunc() ### `01-create-or-update-resource.yaml` Example: -In kuttl, this would create (or modify an existing) `ArgoCD` CR to have dex sso provider using openShiftOAuth. +In a Kuttl test, this would create (or modify an existing) `ArgoCD` CR to use the Dex SSO provider with `openShiftOAuth`. ```yaml apiVersion: argoproj.io/v1alpha1 kind: ArgoCD diff --git a/test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-assert.yaml deleted file mode 100644 index a45cca6dae1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Check that our console link is installed correctly -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd -spec: - location: ApplicationMenu - text: Cluster Argo CD diff --git a/test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-check-console-link.yaml b/test/openshift/e2e/ignore-tests/parallel/1-003_validate_console_link/01-check-console-link.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml deleted file mode 100644 index 2d916d7dcd2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml +++ /dev/null @@ -1,63 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-ca ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-cluster ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-default-cluster-config ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-secret ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-tls ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - replicas: 1 - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-install.yaml deleted file mode 100644 index 5328adc148f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml deleted file mode 100644 index f86fa5f6ea5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This test step ensures that the cluster secret only contains the installation -# namespace after managed-by label has been removed from other-managed-namespace -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml deleted file mode 100644 index 67687481121..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-8-custom -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml deleted file mode 100644 index a7071a2d4ee..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-8-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-8-custom -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml deleted file mode 100644 index 846415fad75..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-8-custom" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml deleted file mode 100644 index f4303c51f84..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-custom-argocd - namespace: test-1-8-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml deleted file mode 100644 index bdffa177675..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-custom-argocd - namespace: test-1-8-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-8-custom - syncPolicy: - automated: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml deleted file mode 100644 index 7b413d0e34f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-8-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-assert.yaml deleted file mode 100644 index b7f673a49ed..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Wait for the Operator to become available -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -# Additional namespace that we want to manage -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-9-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-install.yaml deleted file mode 100644 index c98dea44f18..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-9-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-assert.yaml deleted file mode 100644 index 68f5422f50f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-9-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-9-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-9-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-label-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-label-namespace.yaml deleted file mode 100644 index a8dbd1a5528..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/02-label-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Label the namespace that we want to manage -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-9-custom argocd.argoproj.io/managed-by=$NAMESPACE --overwrite \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/03-check-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/03-check-secret.yaml deleted file mode 100644 index fc3cfdb819a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/03-check-secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE,test-1-9-custom"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-assert.yaml deleted file mode 100644 index 46e0a6a90dc..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-9-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-create-application.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-create-application.yaml deleted file mode 100644 index b5be0f126d5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/04-create-application.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-9-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-9-custom - syncPolicy: - automated: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/05-unlabel-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/05-unlabel-namespace.yaml deleted file mode 100644 index 417ed6bd8ae..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/05-unlabel-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-9-custom argocd.argoproj.io/managed-by- -- script: sleep 5 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/06-check-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/06-check-secret.yaml deleted file mode 100644 index f86fa5f6ea5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/06-check-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This test step ensures that the cluster secret only contains the installation -# namespace after managed-by label has been removed from other-managed-namespace -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/07-check.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/07-check.yaml deleted file mode 100644 index 548cbf2ec03..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/07-check.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 1200 -error: -- errors.yaml diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/99-delete.yaml deleted file mode 100644 index 157ca90bc10..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/99-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-9-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/README.md b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/README.md deleted file mode 100644 index 14399b4bfb0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# manage-other-namespace - -## Synopsis - -This is a test for the `managed-by` permission extension. It creates another -namespace, labels it and checks whether all roles and rolebindings are setup. -Then, it will sync an application into that namespace. - -## Success criterias - -* Role and RoleBindings are created succesfully -* Application is correctly synced to target namespace -* After unlabeling, this is not possible anymore - -## Remarks \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/errors.yaml deleted file mode 100644 index 50a67c2d628..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-009_validate-manage-other-namespace/errors.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-9-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-9-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-redis-ha - namespace: test-1-9-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-9-custom diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-assert.yaml deleted file mode 100644 index a0c2c14377a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Wait for the Operator to become available -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-install.yaml deleted file mode 100644 index 7da3b15acc1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/01-install.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-assert.yaml deleted file mode 100644 index ce3a825e3a0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-12-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml deleted file mode 100644 index 081a978eee7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Label the namespace that we want to manage -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-12-custom argocd.argoproj.io/managed-by=$NAMESPACE --overwrite \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml deleted file mode 100644 index 7d05b0c2fcf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE,test-1-12-custom"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-assert.yaml deleted file mode 100644 index 5e69a1e8c6e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-create-application.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-create-application.yaml deleted file mode 100644 index 24221e83076..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/04-create-application.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom - syncPolicy: - automated: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-assert.yaml deleted file mode 100644 index 0155f0a04e0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom2 ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-12-custom2 ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom2 -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml deleted file mode 100644 index efc7c706135..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Label the namespace that we want to manage -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-12-custom2 argocd.argoproj.io/managed-by=$NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-assert.yaml deleted file mode 100644 index cf974611f8c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-create-application.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-create-application.yaml deleted file mode 100644 index 6d16600f298..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/08-create-application.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom2 - syncPolicy: - automated: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml deleted file mode 100644 index 6b0dfd87a4d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: test-1-12-custom -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: test-1-12-custom2 -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom -command: -- shell: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml deleted file mode 100644 index 28710575ead..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# This test step ensures that the cluster secret only contains the installation -# namespace after managed-by label has been removed from other-managed-namespace -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - should="$NAMESPACE,test-1-12-custom2" - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$should"; then - echo "Assertion for cluster secret failed! '$namespaces' != '$should'" - # 1.2.0 doesn't reconcile the cluster secret on namespace deletion - if test GITOPS_TARGET_VERSION = "1.2.0"; then - exit 0 - else - exit 1 - fi - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-assert.yaml deleted file mode 100644 index 360366f6dc0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -status: - health: - status: Missing - sync: - status: Unknown ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -status: - health: - status: Healthy - sync: - status: Synced diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml deleted file mode 100644 index df3c4e93d5a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom - syncPolicy: - automated: {} - retry: - limit: 5 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom2 - syncPolicy: - automated: {} - retry: - limit: 5 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/99-delete.yaml deleted file mode 100644 index 1878fffbf6f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-012_validate-managed-by-chain/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-assert.yaml deleted file mode 100644 index d37d44c8e47..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-assert.yaml +++ /dev/null @@ -1,125 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/server/tls - name: argocd-repo-server-tls - - mountPath: /app/config/server/tls/redis - name: argocd-operator-redis-tls - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/gpg/source - name: gpg-keys - - mountPath: /app/config/gpg/keys - name: gpg-keyring - - mountPath: /tmp - name: tmp - - mountPath: /app/config/reposerver/tls - name: argocd-repo-server-tls - - mountPath: /app/config/reposerver/tls/redis - name: argocd-operator-redis-tls - - mountPath: /home/argocd/cmp-server/plugins - name: plugins - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - configMap: - defaultMode: 420 - name: argocd-gpg-keys-cm - name: gpg-keys - - emptyDir: {} - name: gpg-keyring - - emptyDir: {} - name: tmp - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls - - emptyDir: {} - name: var-files - - emptyDir: {} - name: plugins ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/controller/tls - name: argocd-repo-server-tls - - mountPath: /app/config/controller/tls/redis - name: argocd-operator-redis-tls - volumes: - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-019_validate_volume_mounts/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-assert.yaml deleted file mode 100644 index 2bdfda83942..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-redis-ha -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-redis-ha -subjects: -- kind: ServiceAccount - name: argocd-argocd-redis-ha ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-021_validate_rolebindings/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-assert.yaml deleted file mode 100644 index bbcf745c508..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-repo-server-tls - namespace: test-1-23-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-install.yaml deleted file mode 100644 index 13792d7ece9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/01-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-23-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -spec: - repo: - autotls: "openshift" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-assert.yaml deleted file mode 100644 index 239bd85a7ce..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server - namespace: test-1-23-custom -spec: - template: - spec: - containers: - - command: - - argocd-server - - --repo-server-strict-tls - - --staticassets - - /shared/app - - --dex-server - - https://argocd-dex-server.test-1-23-custom.svc.cluster.local:5556 - - --repo-server - - argocd-repo-server.test-1-23-custom.svc.cluster.local:8081 - - --redis - - argocd-redis.test-1-23-custom.svc.cluster.local:6379 - - --loglevel - - info - - --logformat - - text diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml deleted file mode 100644 index 01d9a85461c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -spec: - repo: - autotls: "openshift" - verifytls: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml deleted file mode 100644 index e35f2e928e6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 5 -- script: | - oc -n test-1-23-custom get deployment argocd-server \ - -o jsonpath='{.spec.template.spec.containers[0].command}' \ - | jq -r | grep -- '--repo-server-strict-tls' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-assert.yaml deleted file mode 100644 index d68eef3cde0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-23-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-install-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-install-app.yaml deleted file mode 100644 index 699f91d19a9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/04-install-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-23-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-23-custom - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/99-delete.yaml deleted file mode 100644 index 773ec274f3b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-023_validate_repo_server_tls/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-23-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-assert.yaml deleted file mode 100644 index a0d7cd2bf30..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo1 -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo2 -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-install.yaml deleted file mode 100644 index d48bb9e91f0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/01-install.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-target - labels: - argocd.argoproj.io/managed-by: test-1-25-argo1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-argo1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-argo2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo1 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-assert.yaml deleted file mode 100644 index b0d0592ff6e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-install-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-install-app.yaml deleted file mode 100644 index 253fd3cd787..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-install-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-25-target - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-wait.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-wait.yaml deleted file mode 100644 index a4383b200b7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-25-argo1" - wait_until_pods_running "test-1-25-argo2" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-assert.yaml deleted file mode 100644 index 78c233c9ec6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -status: - health: - status: Missing - sync: - status: Unknown ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo2 -status: - health: - status: Healthy - sync: - status: Synced - \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml deleted file mode 100644 index 9fc16d4d1a2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-target - labels: - argocd.argoproj.io/managed-by: test-1-25-argo2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 - annotations: - argocd.argoproj.io/refresh: hard ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-25-target - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/99-delete.yaml deleted file mode 100644 index 4ecf4af0aad..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-025-validate-managed-by-change/99-delete.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-25-target -- apiVersion: v1 - kind: Namespace - name: test-1-25-argo1 -- apiVersion: v1 - kind: Namespace - name: test-1-25-argo2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml deleted file mode 100644 index 83faeebaa39..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-tls \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml deleted file mode 100644 index bd9c6419927..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - observedGeneration: 1 - availableReplicas: 1 - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml deleted file mode 100644 index f6f74f2471c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - openssl req -x509 -newkey rsa:4096 -keyout /tmp/test-029-key.pem -out /tmp/test-029-cert.pem -subj '/CN=test-029-cert' -days 365 -nodes - cert=$(cat /tmp/test-029-cert.pem | base64 -w 0) - key=$(cat /tmp/test-029-key.pem | base64 -w 0) - # Dirty hack to replace argocd-tls - cat <<_EOF_ | oc replace -n $NAMESPACE secret argocd-tls -f - - apiVersion: v1 - kind: Secret - type: kubernetes.io/tls - metadata: - name: argocd-tls - namespace: $NAMESPACE - data: - tls.key: $key - tls.crt: $cert - _EOF_ - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml deleted file mode 100644 index 19fe90ae150..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This makes sure that we still have the first generation of the deployment, -# and that no rollout is pending right now. -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - observedGeneration: 1 - availableReplicas: 1 - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml b/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml deleted file mode 100644 index 90d3be98f2c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-assert.yaml deleted file mode 100644 index e6d765ba9c2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-30-argo1 -status: - phase: Available ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: argocd-server - namespace: test-1-30-argo1 -spec: - port: - targetPort: https - tls: - insecureEdgeTerminationPolicy: Redirect - termination: reencrypt - to: - kind: Service - name: argocd-server - weight: 100 -status: - ingress: - - conditions: - - status: "True" - type: Admitted ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-server-tls - namespace: test-1-30-argo1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-install.yaml deleted file mode 100644 index a9c037e98f4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/01-install.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-30-argo1 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-30-argo1 -spec: - server: - route: - enabled: true - tls: - termination: reencrypt - insecureEdgeTerminationPolicy: Redirect diff --git a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/02-wait.yaml b/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/02-wait.yaml deleted file mode 100644 index 7626618f609..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/02-wait.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-30-argo1" diff --git a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/03-check-route.yaml b/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/03-check-route.yaml deleted file mode 100644 index 029233a907f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-030_validate_reencrypt/03-check-route.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - sleep 30s - routeURL=$(oc -n test-1-30-argo1 get route argocd-server -o jsonpath='{.status.ingress[0].host}') - if ! curl --silent -k https://${routeURL} | grep -q "Your browser does not support JavaScript."; then - echo "Route not configured properly" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/ignore-tests/parallel/1-031_validate_toolchain/01-check.yaml deleted file mode 100644 index c5a3a6fd97d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-031_validate_toolchain/01-check.yaml +++ /dev/null @@ -1,125 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - set -o pipefail - - # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix - expected_kustomizeVersion='v5.2.1' - expected_helmVersion='v3.13.2' - expected_argocdVersion='v2.9.2' - - if CI="prow"; then - # when running against openshift-ci - expected_dexVersion='v2.30.3-dirty' - expected_redisVersion='6.2.4' - else - # when running against RC/ released version of gitops - expected_dexVersion='v2.35.1' - expected_redisVersion='6.2.7' - fi - - MAX_RETRIES=10 - get_pod_name() { - local retry_count=0 - until [ "${retry_count}" -gt ${MAX_RETRIES} ]; do - retry_count=$((retry_count + 1)) - pod=$( - oc get -n openshift-gitops pods \ - -o custom-columns=NAME:.metadata.name --no-headers | - grep $1 | - head -1 - ) - if [[ -z "${pod}" ]]; then - #// no set - if [[ $retry_count*$retry_count > 30 ]] - then - timeout=30 - else - timeout=$retry_count*$retry_count - fi - sleep $timeout - continue - else - #//set - echo $pod - break - fi - done - } - - gitops_server_pod=$(get_pod_name openshift-gitops-server) - - dex_pod=$(get_pod_name openshift-gitops-dex-server) - - redis_pod=$(get_pod_name openshift-gitops-redis) - - route=$( - oc get route -n openshift-gitops \ - -o custom-columns=NAME:.spec.host --no-headers | - grep openshift-gitops-server | - head -1 - ) - - kustomizeVersion=$( - oc -n openshift-gitops exec $gitops_server_pod \ - -- kustomize version - ) - helmVersion=$( - oc -n openshift-gitops exec $gitops_server_pod \ - -- helm version | - sed -e 's/version.BuildInfo//' -e 's/\"//g' | - awk -F':' '{ print $2 }' | - awk -F',' '{ print $1 }' - ) - argocdVersion=$( - oc -n openshift-gitops exec $gitops_server_pod -- \ - argocd version --short --server $route --insecure | - grep 'argocd-server' | - sed -e 's/\+unknown//' | - awk -F' ' '{ print $2 }' - ) - dexVersion=$( - oc -n openshift-gitops exec $dex_pod -- dex version 2>&1 | - grep '^Dex Version' | - awk -F': ' '{ print $2 }' - ) - - redisVersion=$( - oc -n openshift-gitops exec $redis_pod -- \ - redis-server -v | awk -F '=' '{ print $2 }' | cut -d' ' -f 1 - ) - - if test "${kustomizeVersion}" != "${expected_kustomizeVersion}"; then - echo "Kustomize version mismatch. Should be ${expected_kustomizeVersion}, is ${kustomizeVersion}" - error=1 - fi - - if test "${helmVersion}" != "${expected_helmVersion}"; then - echo "Helm version mismatch. Should be ${expected_helmVersion}, is ${helmVersion}" - error=1 - fi - - if test "${dexVersion}" != "${expected_dexVersion}"; then - echo "Dex version mismatch. Should be ${expected_dexVersion}, is ${dexVersion}" - error=1 - fi - - # we are as argocdVersion contains v2.7.6+00c914a suffix addition to the version no. - # So, we are checking if expected_argocdVersion is substring of the actual version - if [[ "${argocdVersion}" == *"${expected_argocdVersion}"* ]]; then - echo "" - else - echo "ArgoCD version mismatch. Should be ${expected_argocdVersion}, is ${argocdVersion}" - error=1 - fi - - if test "${expected_redisVersion}" != "${redisVersion}" ;then - echo "Redis version mismatch. Should be ${expected_redisVersion}, is ${redisVersion}" - error=1 - fi - - if [[ $error == 1 ]]; then - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml b/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml deleted file mode 100644 index eec10e64ab6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - resourceInclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-assert.yaml deleted file mode 100644 index 6cb167cf915..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-032_validate_resource_inclusions/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - resource.inclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet diff --git a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml b/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml deleted file mode 100644 index dba7487a098..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - resourceExclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-assert.yaml deleted file mode 100644 index 919aebd2dcc..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-033_validate_resource_exclusions/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - resource.exclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet diff --git a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml deleted file mode 100644 index 9ee1919d966..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml deleted file mode 100644 index 1f424c4663d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: keycloak-1-deploy -status: - containerStatuses: - - name: deployment - state: - terminated: - reason: Completed ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml b/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml deleted file mode 100644 index 82c226b2e6a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to change sso provider to keycloak -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "add", "path": "/spec/sso", "value": {"provider": "keycloak"}}]' diff --git a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml b/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml deleted file mode 100644 index ee9c18009d6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - resources=$(oc get -n $NAMESPACE pod/keycloak-1-deploy -o jsonpath='{.spec.containers[0].resources}') - if [[ -n ${resources} ]]; then - if [[ "${resources}" != '{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"256Mi"}}' ]]; then - echo "resources spec for pod/keycloak-1-deploy are incorrect" - echo "${resources}" - exit 1 - fi - else - echo "resources spec not found in pod/keycloak-1-deploy" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml deleted file mode 100644 index 2ee939334cf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml deleted file mode 100644 index 22744813fe7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/server/replicas", "value": 3 }]' - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml deleted file mode 100644 index b1783d74ba7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/repo/replicas", "value": 3 }]' - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml deleted file mode 100644 index 3ddbadebda1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 3 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 3 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml deleted file mode 100644 index 790cfdd4709..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/server/replicas", "value": 1 }]' - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml deleted file mode 100644 index f41e545a8d8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/repo/replicas", "value": 1 }]' - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml deleted file mode 100644 index 42e32a779ca..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/02-check-images.yaml b/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/02-check-images.yaml deleted file mode 100644 index 64b28c91dbf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-038_validate_productized_images/02-check-images.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - sleep 10 - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - image=$(oc -n $NAMESPACE get ${wl} -o jsonpath='{.spec.template.spec.containers[0].image}' | awk -F'@' '{print $1}') - if test "$image" != "registry.redhat.io/openshift-gitops-1/argocd-rhel8"; then - echo "Non-productized image in workload $wl detected." - if [ -z $CI ]; then - exit 1 - else - exit 0 - fi - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml deleted file mode 100644 index 8185706d1c6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml deleted file mode 100644 index e8db1935404..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml b/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml deleted file mode 100644 index 50368922e30..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -data: - test.example.com: '-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----' -metadata: - name: argocd-tls-certs-cm \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml b/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml deleted file mode 100644 index d68d60a9eaa..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - tls: - initialCerts: - test.example.com: BEGIN CERTIFICATE diff --git a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml deleted file mode 100644 index d6ffb17db43..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: argocd-tls-certs-cm -data: - test.example.com: BEGIN CERTIFICATE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-assert.yaml deleted file mode 100644 index 1170d554f8e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-argocd-server \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-install.yaml deleted file mode 100644 index e8db1935404..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/02-check_URL.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/02-check_URL.yaml deleted file mode 100644 index 18f076ce89b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/02-check_URL.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - until [[ $i -eq 20 ]] - do - route_URL=$(oc get routes -o jsonpath="{.items[*]['spec.host']}" --field-selector metadata.name=example-argocd-server -n $NAMESPACE) - status_URL=$(oc get argocd -o jsonpath="{.items[*]['status.host']}" -n $NAMESPACE) - - echo -e "route_URL:${route_URL}\nstatus_URL:${status_URL}" - - if ! [[ "${status_URL}" == "${route_URL}" ]]; then - i=$((i+1)) - sleep 6 - else - exit 0 - fi - done - - echo "Error: Route does not match" - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-assert.yaml deleted file mode 100644 index ea5bffd1ba0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - host: modified-route \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-modify_route_URL.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-modify_route_URL.yaml deleted file mode 100644 index 0906e9bebbc..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/03-modify_route_URL.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch route example-argocd-server -n $NAMESPACE --type='json' -p='[{"op": "replace", "path": "/spec/host", "value":"modified-route"}]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-disable_route.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-disable_route.yaml deleted file mode 100644 index faad1acaf10..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-disable_route.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: false \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-errors.yaml deleted file mode 100644 index a962c966ae8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-042_validate_status_host/04-errors.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available - host: modified-route \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml b/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml deleted file mode 100644 index 08516691822..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml +++ /dev/null @@ -1,15 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - logLevel: debug - logFormat: json - repo: - logLevel: debug - logFormat: json - controller: - logLevel: debug - logFormat: json \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml b/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml deleted file mode 100644 index 5bc3e3dc758..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 15 -- script: | - set -e - set -o pipefail - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - wlCommand=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].command}') - level="debug" - format="json" - if ! echo "$wlCommand" | grep -e "\"--loglevel\",\"${level}\""; then - echo "logLevel was not set correctly for $wl" - echo "CWD: $wlCommand" - exit 1 - fi - if ! echo "$wlCommand" | grep -e "\"--logformat\",\"${format}\""; then - echo "logFormat was not set correctly for $wl" - echo "CWD: $wlCommand" - exit 1 - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-assert.yaml deleted file mode 100644 index 6d473259a41..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-assert.yaml +++ /dev/null @@ -1,32 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: "1" - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: "1" - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: "1" - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-install.yaml deleted file mode 100644 index c336598f09a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/01-install.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: 1 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: 1 - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: 1 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml b/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml deleted file mode 100644 index daaa23ac8ae..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: 2 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: 2 - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: 2 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml b/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml deleted file mode 100644 index c82eb661fd9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - set -e - set -o pipefail - for wl in deployments/argocd-server deployments/argocd-repo-server statefulsets/argocd-application-controller; do - res=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].resources.limits.cpu}') - if test "$res" != "2"; then - echo "Reconciliation of resources for $wl failed: Should be 2, is '$res'" - exit 1 - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml b/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml deleted file mode 100644 index e7dcd4fa2f4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - repo: - execTimeout: 300 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml b/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml deleted file mode 100644 index f3e44f7f5ea..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - timeout=$(oc get -n $NAMESPACE deployment argocd-repo-server -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_EXEC_TIMEOUT").value') - if test "$timeout" != "300s"; then - echo "Assertion failed. Timeout should be 300s, is '$timeout'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/02-change-env-vars.yaml b/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/02-change-env-vars.yaml deleted file mode 100644 index 9644a6bbda1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/02-change-env-vars.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - env: - - name: FOO - value: bar - repo: - env: - - name: FOO - value: bar - controller: - env: - - name: FOO - value: bar \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/03-check-workloads.yaml b/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/03-check-workloads.yaml deleted file mode 100644 index ad5c0184545..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-047_validate_custom_env/03-check-workloads.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - set -e - set -o pipefail - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - val=$(oc get -n $NAMESPACE $wl -o json | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="FOO").value') - if test "$val" != "bar"; then - echo "Environment for $wl was not set correctly." - exit 1 - fi - done - - \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-assert.yaml deleted file mode 100644 index ab46dfe9cd7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-1 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml deleted file mode 100644 index 978c1d26003..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - sharding: - enabled: true - replicas: 3 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/03-check-env.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/03-check-env.yaml deleted file mode 100644 index 03a61e6cafb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/03-check-env.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - replicas=$(oc get -n $NAMESPACE statefulset argocd-application-controller -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_CONTROLLER_REPLICAS").value') - if test "$replicas" != "3"; then - echo "Environment ARGOCD_CONTROLLER_REPLICAS not correct. Should '3', is '$replicas'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml deleted file mode 100644 index a3fa97ab6e1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - sharding: - enabled: false - replicas: 3 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-errors.yaml deleted file mode 100644 index aa719afb9bb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/04-errors.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-1 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/05-check-env.yaml b/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/05-check-env.yaml deleted file mode 100644 index 0c80e46ac07..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-048_validate_controller_sharding/05-check-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # we do expect error from jq here if env is not set at all - replicas=$(oc get -n $NAMESPACE statefulset argocd-application-controller -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_CONTROLLER_REPLICASE").value') - if test "$replicas" != ""; then - echo "Environment ARGOCD_CONTROLLER_REPLICAS not correct. Should '', is '$replicas'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-assert.yaml deleted file mode 100644 index 6b21080c096..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml deleted file mode 100644 index 00029c8df31..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - set -o pipefail - expected=10 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml deleted file mode 100644 index cf75730ca3e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - parallelismLimit: 20 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml deleted file mode 100644 index 401b9116844..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 5 -- script: | - set -e - set -o pipefail - expected=20 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml deleted file mode 100644 index 3a5fad3053c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml b/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml deleted file mode 100644 index e14804f25ee..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc patch -n $NAMESPACE argocds/argocd --type=json --patch '[{"op": "remove", "path": "/spec/controller/parallelismLimit"}]' -- script: sleep 5 -- script: | - set -e - set -o pipefail - expected=10 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-051-validate_csv_permissions/01-validate.yaml b/test/openshift/e2e/ignore-tests/parallel/1-051-validate_csv_permissions/01-validate.yaml deleted file mode 100644 index ddf9f521142..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-051-validate_csv_permissions/01-validate.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - res=$(oc auth can-i delete resourcequotas -n openshift-gitops --as system:serviceaccount:openshift-gitops-operator:openshift-gitops-operator-controller-manager) - if test "$res" != "yes"; then - echo "Can't delete resourcequotas" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml b/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml deleted file mode 100644 index 3fb94e98c80..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Add the managed-by label to the namespace created by Kuttl -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc label namespace $NAMESPACE argocd.argoproj.io/managed-by=openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml b/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml deleted file mode 100644 index ec86b21dfc0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - - # Expected and Current RoleBindings - expected_rb=( - "openshift-gitops-argocd-application-controller" - "openshift-gitops-argocd-server" - ) - current_rb=( $(oc get rolebindings -n "${NAMESPACE}" | awk '/gitops/ {print $1}') ) - - # Check that the required RoleBindings exist: - for rb in "${expected_rb[@]}" - do - oc get rolebinding "${rb}" -n "${NAMESPACE}" > /dev/null - done - - # Check that there are only two RoleBindings - echo "Current RoleBindings: ${current_rb[*]}" - [[ "${#current_rb[@]}" == "2" ]] diff --git a/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml deleted file mode 100644 index c697d11412b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-assert.yaml deleted file mode 100644 index 2ee939334cf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-install.yaml deleted file mode 100644 index 7f8eddf2516..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml deleted file mode 100644 index dfed78cb23c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# It would be better to have the "kind: Application" resource as it is, -# but "${NAMESPACE}" expansion doesn't work in kuttl manifests -# We also need to centralize the app examples in a public (common) repo. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - # Install ArgoCD Application with 2 replicas - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: app-deploymentconfig - namespace: ${NAMESPACE} - spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/deploymentconfig-example - targetRevision: "HEAD" - destination: - server: https://kubernetes.default.svc - namespace: ${NAMESPACE} - syncPolicy: - automated: {} - EOF - # Give some time to Application before asserting - sleep 10 - - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/03-assert.yaml deleted file mode 100644 index 8c779dc2a49..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/03-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -status: - health: - status: Healthy - operationState: - phase: Succeeded ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: test-deploymentconfig -status: - replicas: 2 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-assert.yaml deleted file mode 100644 index d98e6fd7b7b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -status: - health: - status: Healthy - operationState: - phase: Succeeded ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: test-deploymentconfig -status: - replicas: 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml b/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml deleted file mode 100644 index d07e4385510..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Point targetRevision to a branch with 0 replicas -# in DeploymentConfig's manifest -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -spec: - project: default - source: - path: test/examples/deploymentconfig-example_replica_0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-assert.yaml deleted file mode 100644 index 8185706d1c6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-errors.yaml deleted file mode 100644 index edc10ee04bf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - notificationsController: diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-install.yaml deleted file mode 100644 index 090703c4e1a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - route: - enabled: true - notifications: - enabled: false diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-assert.yaml deleted file mode 100644 index 4d554aeae50..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-assert.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available - notificationsController: Running ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller -status: - conditions: - - type: Available - status: 'True' - - type: Progressing - status: 'True' ---- -kind: Secret -apiVersion: v1 -metadata: - name: argocd-notifications-secret ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: argocd-notifications-cm ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - name: example-argocd-argocd-notifications-controller ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: example-argocd-argocd-notifications-controller ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: example-argocd-argocd-notifications-controller diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-enable_notification.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-enable_notification.yaml deleted file mode 100644 index 7ff251954ad..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/02-enable_notification.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/03-disable_notification.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/03-disable_notification.yaml deleted file mode 100644 index 0ba1bcd7990..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/03-disable_notification.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: false diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/04-check.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/04-check.yaml deleted file mode 100644 index 5bc157c55cc..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/04-check.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 1200 -error: -- errors.yaml \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/errors.yaml deleted file mode 100644 index e0147f4b035..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-055_validate_notification_controller/errors.yaml +++ /dev/null @@ -1,36 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller ---- -kind: Secret -apiVersion: v1 -metadata: - name: argocd-notifications-secret ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: argocd-notifications-cm ---- -kind: ServiceAccount -apiVersion: v1 -metadata: - name: example-argocd-argocd-notifications-controller ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: example-argocd-argocd-notifications-controller ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: example-argocd-argocd-notifications-controller ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - notificationsController: diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-assert.yaml deleted file mode 100644 index 89f17b7f6c6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-install.yaml deleted file mode 100644 index 8204e070db1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/01-install.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev - labels: - app: smtp4dev -spec: - replicas: 1 - selector: - matchLabels: - app: smtp4dev - template: - metadata: - labels: - app: smtp4dev - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/os - operator: In - values: - - linux - containers: - - name: smtp4dev - image: quay.io/openshift-gitops-test/smtplistener:multiarch - ports: - - containerPort: 80 - - containerPort: 2525 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml deleted file mode 100644 index 1b7c948b947..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 15 -- script: | - set -e - - kubectl patch cm argocd-notifications-cm -n $NAMESPACE --type merge -p '{"data": {"service.email.gmail": "{host: smtp4dev, port: 2525, from: fake@email.com }" }}' -- script: sleep 5 - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/03-create-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/03-create-app.yaml deleted file mode 100644 index cd5bc09e99e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/03-create-app.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: my-app-3 - namespace: $NAMESPACE - annotations: - "notifications.argoproj.io/subscribe.on-created.gmail": "jdfake@email.com" - spec: - destination: - namespace: $NAMESPACE - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: HEAD - EOF -- script: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-assert.yaml deleted file mode 100644 index 89f17b7f6c6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-delete-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-delete-app.yaml deleted file mode 100644 index 47052970a1b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/04-delete-app.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - kubectl delete -n $NAMESPACE application.argoproj.io my-app-3 -- script: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/05-verify-email.yaml b/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/05-verify-email.yaml deleted file mode 100644 index adf7a6828c1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-057_validate_notifications/05-verify-email.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - sleep 5 - smtp4dev_pod=$(kubectl get pod -l=app=smtp4dev -o NAME -n $NAMESPACE) - exit_code=$(kubectl -n $NAMESPACE exec --stdin "${smtp4dev_pod}" -- /bin/bash \ - -c 'if [[ $(grep -rnw /tmp -e "Subject: Application my-app-3 has been created.") ]]; then - exit 0; else - exit 1; - fi') - - - if [[ $exit_code -eq 0 ]]; then - exit 0 - else - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-assert.yaml deleted file mode 100644 index 369ddad0d0c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-install.yaml deleted file mode 100644 index 955aaaef8b0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/02-wait.yaml b/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/02-wait.yaml deleted file mode 100644 index a10fc72ed0d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running $NAMESPACE diff --git a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-assert.yaml deleted file mode 100644 index 370285249d5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-58-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-create_application.yaml b/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-create_application.yaml deleted file mode 100644 index d5751238c55..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-058_validate_prometheus_rule/03-create_application.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: test-1-58-custom - namespace: ${NAMESPACE} - spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/bgd-k8s - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: ${NAMESPACE} - syncPolicy: - automated: {} - EOF \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-assert.yaml deleted file mode 100644 index 7c79c300913..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: label diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-assert.yaml deleted file mode 100644 index cd8e0aed8e1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: annotation diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml deleted file mode 100644 index 6a32d59aa6e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"annotation"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-assert.yaml deleted file mode 100644 index db25e1c94d3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: annotation+label diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml deleted file mode 100644 index 3dc1e956030..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"annotation+label"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-assert.yaml deleted file mode 100644 index 5ec09727b42..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: label diff --git a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml b/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml deleted file mode 100644 index bd11cbd1665..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"invalid_method"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml deleted file mode 100644 index 8c10115f4f0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - extraConfig: - "admin.enabled": "true" # enable admin user through extraConfig \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-assert.yaml deleted file mode 100644 index a6a4b5515df..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml deleted file mode 100644 index bbac50ba574..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - extraConfig: - "admin.enabled": "true" # override admin user through extraConfig \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-assert.yaml deleted file mode 100644 index e5470d42f83..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/02-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-assert.yaml deleted file mode 100644 index 3f172ffda5e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" # operator should reject any manual updates to the configmap. \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-update-configmap.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-update-configmap.yaml deleted file mode 100644 index aff583e2562..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/03-update-configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "false" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-assert.yaml deleted file mode 100644 index d005cd46f72..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - dex.config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml deleted file mode 100644 index 61d0220b238..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - sso: - provider: dex - dex: - config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class - - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-assert.yaml deleted file mode 100644 index 747283cafb2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - dex.config: | - connectors: - - type: github - id: github - name: github-using-extra-config - config: - clientID: extra-config - clientSecret: $dex.github.clientSecret - orgs: - - name: extra-config \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml b/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml deleted file mode 100644 index 8cb6c08cce2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - sso: - provider: dex - dex: - config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class - extraConfig: - "admin.enabled": "true" - "dex.config": | - connectors: - - type: github - id: github - name: github-using-extra-config - config: - clientID: extra-config - clientSecret: $dex.github.clientSecret - orgs: - - name: extra-config diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml deleted file mode 100644 index 1a3e4aa79e8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: v1 -kind: Pod -metadata: - namespace: openshift-gitops - labels: - app.kubernetes.io/name: openshift-gitops-dex-server -spec: - containers: - - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz/live - port: 5558 - scheme: HTTP - initialDelaySeconds: 60 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-assert.yaml deleted file mode 100644 index a3695549dd5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-install.yaml deleted file mode 100644 index 6ce824695ab..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-assert.yaml deleted file mode 100644 index 88db3ef474d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml deleted file mode 100644 index d68fe06715c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch statefulset/example-argocd-application-controller \ - -n $NAMESPACE \ - --type "json" \ - -p '[{"op":"replace","path":"/spec/template/spec/containers/0/image","value":"invalid_image"}]' - sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml b/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml deleted file mode 100644 index 1a9c6577b32..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - image=$(oc get statefulset/example-argocd-application-controller -o jsonpath='{.spec.template.spec.containers[].image}' -n $NAMESPACE) - - if test "${image}" == "invalid_image"; then - echo "The application-controller statefulset is using 'invalid_image'" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-assert.yaml deleted file mode 100644 index 9d21a7003bb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-assert.yaml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-applicationset-controller -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - securityContext: - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true - # random runAsUser in openshift - #runAsUser: 999 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-install.yaml deleted file mode 100644 index 2a8049b2769..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-install.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - applicationSet: - resources: - limits: - cpu: "2" - memory: 1Gi - requests: - cpu: 250m - memory: 512Mi - notifications: - enabled: true - sso: - dex: - openShiftOAuth: true - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - provider: dex diff --git a/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml deleted file mode 100644 index d4094a3fdb3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml deleted file mode 100644 index 1fab1a94154..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -spec: - template: - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/name: argocd-redis-ha - topologyKey: kubernetes.io/hostname diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml deleted file mode 100644 index 1de4afe0880..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml deleted file mode 100644 index 682f45bf57e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if [[ $(uname -o) == "Darwin" ]]; then - echo "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" >${PWD}/openssl_test.cnf - else - echo -e "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" >${PWD}/openssl_test.cnf - fi - - openssl req -new -x509 -sha256 \ - -subj "/C=XX/ST=XX/O=Testing/CN=redis" \ - -reqexts SAN -extensions SAN \ - -config ${PWD}/openssl_test.cnf \ - -keyout ${PWD}/redis.key \ - -out ${PWD}/redis.crt \ - -newkey rsa:4096 \ - -nodes \ - -days 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml deleted file mode 100644 index ab3a96ea352..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - # clean up key, cert and config file - cleanup() { - rm -rf ${PWD}/redis.crt && rm -rf ${PWD}/redis.key && rm -rf ${PWD}/openssl_test.cnf - } - - trap cleanup INT TERM EXIT - - oc create secret tls argocd-operator-redis-tls --key=${PWD}/redis.key --cert=${PWD}/redis.crt -n $NAMESPACE - sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml deleted file mode 100644 index c73dbe584e4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc annotate secret argocd-operator-redis-tls argocds.argoproj.io/name=argocd -n $NAMESPACE - sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml deleted file mode 100644 index 86dc585443d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get deployments.apps argocd-redis -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.args}}{{"\n"}}{{end}}')" != \ - "[redis-server \ - --protected-mode no \ - --save \ - --appendonly no \ - --tls-port 6379 \ - --port 0 \ - --tls-cert-file /app/config/redis/tls/tls.crt \ - --tls-key-file /app/config/redis/tls/tls.key \ - --tls-auth-clients no]"; then - echo "TLS .spec.template.spec.containers.args for argocd-redis deployment are wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-repo-server -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[uid_entrypoint.sh \ - argocd-repo-server \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/reposerver/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-repo-server deployment is wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-server -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-server \ - --staticassets /shared/app \ - --dex-server https://argocd-dex-server.$NAMESPACE.svc.cluster.local:5556 \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/server/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-server deployment is wrong" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml b/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml deleted file mode 100644 index a29d6ef89c2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get statefulsets.apps argocd-application-controller -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-application-controller \ - --operation-processors 10 \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/controller/tls/redis/tls.crt \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --status-processors 20 \ - --kubectl-parallelism-limit 10 \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml deleted file mode 100644 index efba40ead9b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml deleted file mode 100644 index 3b057afec1a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if [[ $(uname -o) == "Darwin" ]]; then - echo "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" > ${PWD}/openssl_test.cnf - else - echo -e "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" > ${PWD}/openssl_test.cnf - fi - - openssl req -new -x509 -sha256 \ - -subj "/C=XX/ST=XX/O=Testing/CN=redis" \ - -reqexts SAN -extensions SAN \ - -config ${PWD}/openssl_test.cnf \ - -keyout ${PWD}/redis-ha.key \ - -out ${PWD}/redis-ha.crt \ - -newkey rsa:4096 \ - -nodes \ - -days 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml deleted file mode 100644 index 6918cf1f183..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - # clean up key and cert and config file - cleanup() { - rm -rf ${PWD}/redis-ha.crt && rm -rf ${PWD}/redis-ha.key && rm -rf ${PWD}/openssl_test.cnf - } - - trap cleanup INT TERM EXIT - - oc create secret tls argocd-operator-redis-tls --key=${PWD}/redis-ha.key --cert=${PWD}/redis-ha.crt -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml deleted file mode 100644 index c62f889776d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml deleted file mode 100644 index b9b265d680c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc annotate secret argocd-operator-redis-tls argocds.argoproj.io/name=argocd -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml deleted file mode 100644 index 047a989adb9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - expected_redis_config=( - 'port 0' - 'tls-port 6379' - 'tls-cert-file /app/config/redis/tls/tls.crt' - 'tls-ca-cert-file /app/config/redis/tls/tls.crt' - 'tls-key-file /app/config/redis/tls/tls.key' - 'tls-replication yes' - 'tls-auth-clients no' - ) - - expected_sentinel_config=( - 'port 0' - 'tls-port 26379' - 'tls-cert-file "/app/config/redis/tls/tls.crt"' - 'tls-ca-cert-file "/app/config/redis/tls/tls.crt"' - 'tls-key-file "/app/config/redis/tls/tls.key"' - 'tls-replication yes' - 'tls-auth-clients no' - ) - - for config in "${expected_redis_config[@]}" - do - oc exec -i pod/argocd-redis-ha-server-0 -n $NAMESPACE -c redis -- grep "${config}" /data/conf/redis.conf - done - - for config in "${expected_sentinel_config[@]}" - do - oc exec -i pod/argocd-redis-ha-server-0 -n $NAMESPACE -c redis -- grep "${config}" /data/conf/sentinel.conf - done diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml deleted file mode 100644 index d6e8af1f0b5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get deployments.apps argocd-repo-server -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[uid_entrypoint.sh \ - argocd-repo-server \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/reposerver/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-repo-server deployment is wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-server -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-server \ - --staticassets /shared/app \ - --dex-server https://argocd-dex-server.$NAMESPACE.svc.cluster.local:5556 \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/server/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-server deployment is wrong" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml b/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml deleted file mode 100644 index 840afc8396e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get statefulsets.apps argocd-application-controller -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-application-controller \ - --operation-processors 10 \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/controller/tls/redis/tls.crt \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --status-processors 20 \ - --kubectl-parallelism-limit 10 \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-assert.yaml deleted file mode 100644 index 1de4afe0880..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-enable_autotls.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-enable_autotls.yaml deleted file mode 100644 index 7c62dd929ca..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/02-enable_autotls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"redis":{"autotls":"openshift"}}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/03-check_secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/03-check_secret.yaml deleted file mode 100644 index bdace720d90..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/03-check_secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - secret_type="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{.type}}')" - secret_len="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{len .data}}')" - expected_secret_type="kubernetes.io/tls" - expected_secret_len=2 - - if test ${secret_type} != ${expected_secret_type}; then - echo "argocd-operator-redis-tls secret type is ${secret_type} and should be ${expected_secret_type}" - exit 1 - fi - if test ${secret_len} != ${expected_secret_len}; then - echo "argocd-operator-redis-tls secret length is ${secret_len} and should be ${expected_secret_len}" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/04-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/04-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/05-check_crt_files.yaml b/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/05-check_crt_files.yaml deleted file mode 100644 index b4500d69dc7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-068_validate_redis_secure_comm_autotls_no_ha/05-check_crt_files.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc exec -i $(oc get pod -l app.kubernetes.io/name=argocd-server -n $NAMESPACE -o=NAME) -n $NAMESPACE -- ls /app/config/server/tls/redis/tls.crt - oc exec -i $(oc get pod -l app.kubernetes.io/name=argocd-repo-server -n $NAMESPACE -o=NAME) -n $NAMESPACE -- ls /app/config/reposerver/tls/redis/tls.crt - oc exec -i $(oc get pod -l app.kubernetes.io/name=argocd-redis -n $NAMESPACE -o=NAME) -n $NAMESPACE -- ls /app/config/redis/tls/tls.crt - oc exec -i $(oc get pod -l app.kubernetes.io/name=argocd-application-controller -n $NAMESPACE -o=NAME) -n $NAMESPACE -- ls /app/config/controller/tls/redis/tls.crt diff --git a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml deleted file mode 100644 index efba40ead9b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml deleted file mode 100644 index c62f889776d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml b/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml deleted file mode 100644 index 7c62dd929ca..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"redis":{"autotls":"openshift"}}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml deleted file mode 100644 index bdace720d90..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - secret_type="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{.type}}')" - secret_len="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{len .data}}')" - expected_secret_type="kubernetes.io/tls" - expected_secret_len=2 - - if test ${secret_type} != ${expected_secret_type}; then - echo "argocd-operator-redis-tls secret type is ${secret_type} and should be ${expected_secret_type}" - exit 1 - fi - if test ${secret_len} != ${expected_secret_len}; then - echo "argocd-operator-redis-tls secret length is ${secret_len} and should be ${expected_secret_len}" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-assert.yaml deleted file mode 100644 index 2a13e2d6783..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: cmp-plugin - namespace: argocd ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: argocd -status: - applicationController: Running - phase: Available - redis: Running - repo: Running - server: Running - sso: Unknown diff --git a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-install.yaml deleted file mode 100644 index f92480a4d4d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/01-install.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: cmp-plugin - namespace: argocd -data: - plugin.yaml: | - apiVersion: argoproj.io/v1alpha1 - kind: ConfigManagementPlugin - metadata: - name: cmp-plugin - spec: - version: v1.0 - generate: - command: [sh, -c, 'echo "{\"kind\": \"ConfigMap\", \"apiVersion\": \"v1\", \"metadata\": { \"name\": \"$ARGOCD_APP_NAME\", \"namespace\": \"$ARGOCD_APP_NAMESPACE\", \"annotations\": {\"Foo\": \"$FOO\", \"Bar\": \"baz\"}}}"'] - discover: - find: - command: [sh, -c, 'echo "FOUND"; exit 0'] - allowConcurrency: true - lockRepo: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: argocd -spec: - server: - route: - enabled: true - repo: - sidecarContainers: - - name: cmp - command: [/var/run/argocd/argocd-cmp-server] # Entrypoint should be Argo CD lightweight CMP server i.e. argocd-cmp-server - image: busybox # This can be off-the-shelf or custom-built image - securityContext: - runAsNonRoot: true - volumeMounts: - - mountPath: /var/run/argocd - name: var-files - - mountPath: /home/argocd/cmp-server/plugins - name: plugins - - mountPath: /tmp - name: tmp - # Remove this volumeMount if you've chosen to bake the config file into the sidecar image. - - mountPath: /home/argocd/cmp-server/config/plugin.yaml - subPath: plugin.yaml - name: cmp-plugin - volumes: - - configMap: - name: cmp-plugin - name: cmp-plugin \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-assert.yaml deleted file mode 100644 index 0d4edbbfcf8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: argocd -status: - health: - status: Healthy - sync: - status: Synced ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: guestbook - namespace: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-create-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-create-app.yaml deleted file mode 100644 index 6ffca65163d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/02-create-app.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: argocd -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator.git - path: test/examples/guestbook - targetRevision: HEAD - plugin: - env: - - name: FOO - value: myfoo - destination: - server: 'https://kubernetes.default.svc' - namespace: argocd - syncPolicy: - automated: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/99-delete.yaml deleted file mode 100644 index c92ff110468..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-070_validate_config_management_plugin/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-assert.yaml deleted file mode 100644 index 984aecce01d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: false -allowPrivilegedContainer: false -allowedCapabilities: null -apiVersion: security.openshift.io/v1 -defaultAddCapabilities: null -fsGroup: - type: MustRunAs -groups: -- system:authenticated -kind: SecurityContextConstraints -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - include.release.openshift.io/single-node-developer: "true" - labels: - app.kubernetes.io/instance: cs-cluster-roles-ocp4-mgm-gsh-cibasic-p - name: restricted-dropcaps -priority: null -readOnlyRootFilesystem: false -requiredDropCapabilities: -- KILL -- MKNOD -- SETUID -- SETGID -- CHOWN -- DAC_OVERRIDE -- FOWNER -- FSETID -- SETPCAP -- NET_BIND_SERVICE -runAsUser: - type: MustRunAsRange -seLinuxContext: - type: MustRunAs -supplementalGroups: - type: RunAsAny -users: [] -volumes: -- configMap -- downwardAPI -- emptyDir -- persistentVolumeClaim -- projected -- secret \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-create-scc.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-create-scc.yaml deleted file mode 100644 index 06b5fb179d8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/01-create-scc.yaml +++ /dev/null @@ -1,53 +0,0 @@ -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: false -allowPrivilegedContainer: false -allowedCapabilities: null -apiVersion: security.openshift.io/v1 -defaultAddCapabilities: null -fsGroup: - type: MustRunAs -groups: -- system:authenticated -kind: SecurityContextConstraints -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: 'true' - include.release.openshift.io/self-managed-high-availability: 'true' - include.release.openshift.io/single-node-developer: 'true' - kubernetes.io/description: This uses the restricted scc and drops additional - capabilities - release.openshift.io/create-only: 'true' - labels: - app.kubernetes.io/instance: cs-cluster-roles-ocp4-mgm-gsh-cibasic-p - name: restricted-dropcaps -priority: null -readOnlyRootFilesystem: false -requiredDropCapabilities: -- KILL -- MKNOD -- SETUID -- SETGID -- CHOWN -- DAC_OVERRIDE -- FOWNER -- FSETID -- SETPCAP -- NET_BIND_SERVICE -runAsUser: - type: MustRunAsRange -seLinuxContext: - type: MustRunAs -supplementalGroups: - type: RunAsAny -users: [] -volumes: -- configMap -- downwardAPI -- emptyDir -- persistentVolumeClaim -- projected -- secret diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-assert.yaml deleted file mode 100644 index 40a1344d8a5..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-application-controller -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-redis -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-repo-server -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-server -status: - phase: Running \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml deleted file mode 100644 index 5328adc148f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-assert.yaml deleted file mode 100644 index 3131eb7c19d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-assert.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true -status: - phase: Available ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-application-controller -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-redis-ha-haproxy -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - name: argocd-redis-ha-server-1 -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - name: argocd-redis-ha-server-2 -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-repo-server -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-server -status: - phase: Running \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/99-delete.yaml deleted file mode 100644 index 6cbd6f48066..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-071_validate_SCC_HA/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: security.openshift.io/v1 - kind: SecurityContextConstraints - metadata: - name: restricted-dropcaps diff --git a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml b/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml deleted file mode 100644 index 8959633f80f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if ! test -z $(oc get statefulset.apps/argocd-application-controller -n $NAMESPACE -o jsonpath='{.spec.template.spec.containers[].livenessProbe}'); then - echo "livenessProbe should not exist on statefulset.apps/argocd-application-controller." - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml deleted file mode 100644 index e7de2ebc96e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-keycloak - labels: - example: keycloak -spec: - sso: - provider: keycloak - keycloak: - rootCA: "---BEGIN---END---" - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-assert.yaml deleted file mode 100644 index 763547d8266..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/01-assert.yaml +++ /dev/null @@ -1,88 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-keycloak -status: - phase: Available ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak -spec: - selector: - deploymentConfig: keycloak - strategy: - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - type: Recreate - template: - metadata: - labels: - application: keycloak - deploymentConfig: keycloak - name: keycloak - spec: - containers: - - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi - volumeMounts: - - mountPath: /etc/x509/https - name: sso-x509-https-volume - readOnly: true - - mountPath: /var/run/configmaps/service-ca - name: service-ca - readOnly: true - - mountPath: /mnt/rh-sso - name: sso-probe-netrc-volume - restartPolicy: Always - volumes: - - name: sso-x509-https-volume - secret: - defaultMode: 420 - secretName: sso-x509-https-secret - - configMap: - defaultMode: 420 - name: keycloak-service-ca - name: service-ca - - name: sso-probe-netrc-volume - emptyDir: - medium: Memory - triggers: - - type: ConfigChange -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: keycloak ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: keycloak -spec: - tls: - termination: reencrypt - to: - kind: Service - name: keycloak - weight: 100 - wildcardPolicy: None ---- -apiVersion: v1 -kind: Secret -metadata: - name: keycloak-secret -type: Opaque \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/02-sleep.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/02-sleep.yaml deleted file mode 100644 index a31a022fb6e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/02-sleep.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# wait for operator to create a new keycloak realm and update OIDC configuration. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 60 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/03-verify-oidc.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/03-verify-oidc.yaml deleted file mode 100644 index 96759d7a56e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/03-verify-oidc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# verify OIDC config -# verify issuer -- script: | - issuer=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep issuer | awk -F' ' '{print $2}') - keycloakRoute=$(kubectl get route keycloak -n $NAMESPACE -o jsonpath='{.spec.host}') - if [[ "${issuer}" == "https://${keycloakRoute}/auth/realms/argocd" ]]; then - echo "issuer matched" - else - echo "issuer mismatched" - echo "${issuer} not equals ${keycloakRoute}/auth/realms/argocd" - exit 1 - fi -# verify oidc config name, clientid -- script: | - clientid=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep clientid | awk -F' ' '{print $2}') - name=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep name | awk -F' ' '{print $2}') - rootCA=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep rootca | awk -F' ' '{print $2}') - - if [[ "${clientid}" == "argocd" && "${name}" == "Keycloak" && "${rootCA}" == "'---BEGIN---END---'" ]]; then - echo "oidc name, clientid and rootCA matched" - else - echo "oidc name, clientid or rootCA mismatched" - echo "${clientid}, ${name} and ${rootCA}" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml deleted file mode 100644 index c17755f90ef..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# This step is executed after the RHSSO deployment, service, secret, route objects are created and verified. -# Reads the username and password from keycloak secret. -# Requests keycloak for an access token. -# Verifies Realm and Argo CD client creation. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # Set the needed parameter for the authorization - KEYCLOAK_URL=$(oc get route keycloak -n $NAMESPACE -o jsonpath='{.spec.host}') - tenant=argocd - USER=$(oc get secret keycloak-secret -n $NAMESPACE -o jsonpath='{.data.SSO_USERNAME}' | base64 --decode) - PASSWORD=$(oc get secret keycloak-secret -n $NAMESPACE -o jsonpath='{.data.SSO_PASSWORD}' | base64 --decode) - GRANT_TYPE=password - CLIENT_ID=admin-cli - - # Execute the CURL command to request the access-token - access_token=$(curl -d "client_id=$CLIENT_ID" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=$GRANT_TYPE" "https://$KEYCLOAK_URL/auth/realms/master/protocol/openid-connect/token" -k | sed -n 's|.*"access_token":"\([^"]*\)".*|\1|p') - - # Execute the CURL command to verify the realm and client creation - clientFound=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/clients" -k | grep '"clientId":"argocd"') - if ! [ "$clientFound" = "" ]; then - echo "argocd realm and client creation verified" - else - echo "argocd client not found" - exit 1 - fi - - # Verify OpenShift-v4 IdP creation - IdPFound=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/identity-provider/instances" -k | grep -i OpenShift-v4) - if ! [ "$IdPFound" = "" ]; then - echo "OpenShift-v4 IdP creation verified" - else - echo "OpenShift-v4 IdP not found" - exit 1 - fi - - # Verify OpenShift-v4 IdP creation - syncModeVerified=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/identity-provider/instances" -k | grep -i '"syncMode":"FORCE"') - if ! [ "$syncModeVerified" = "" ]; then - echo "syncMode set to Force, verified" - else - echo "syncMode not set to Force" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/99-delete.yaml deleted file mode 100644 index 09d88eb3222..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-073_validate_rhsso/99-delete.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: oc delete argocd example-argocd-keycloak -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml deleted file mode 100644 index aaa8a9dc499..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-main ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-2242-argocd - namespace: gitops-2242-ns-main -spec: - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: gitops-2242-ns-main -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-install.yaml deleted file mode 100644 index aaa8a9dc499..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/01-install.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-main ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-2242-argocd - namespace: gitops-2242-ns-main -spec: - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: gitops-2242-ns-main -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml deleted file mode 100644 index 869c85b2807..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-first - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: gitops-2242-ns-first \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml deleted file mode 100644 index 3b42de9a23c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-first - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: gitops-2242-ns-first - finalizers: - - some.random/finalizer -data: - foo: bar \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml deleted file mode 100644 index f49cafec75b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - - oc delete ns gitops-2242-ns-first --wait=false - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml deleted file mode 100644 index b48dbd1614d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-second - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: gitops-2242-argocd-argocd-server - namespace: gitops-2242-ns-second - annotations: - argocds.argoproj.io/name: gitops-2242-argocd - argocds.argoproj.io/namespace: gitops-2242-ns-main ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: gitops-2242-argocd-argocd-application-controller - namespace: gitops-2242-ns-second - annotations: - argocds.argoproj.io/name: gitops-2242-argocd - argocds.argoproj.io/namespace: gitops-2242-ns-main \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml deleted file mode 100644 index d6a0e145290..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-second - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml b/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml deleted file mode 100644 index 288ebd52771..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - - # Removing finalizer from cm - oc patch cm/my-config-map-2 -n gitops-2242-ns-first --type json --patch='[ { "op": "remove", "path": "/metadata/finalizers" } ]' - - # Deleting namespaces - oc delete ns gitops-2242-ns-first --wait=false - oc delete ns gitops-2242-ns-second --wait=false - oc delete ns gitops-2242-ns-main --wait=false - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-assert.yaml deleted file mode 100644 index eff1a05e18f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-install.yaml deleted file mode 100644 index 2e9d25f658b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/01-install.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - dex: - openShiftOAuth: true - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - provider: dex \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml b/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml deleted file mode 100644 index 855aa8b36cb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc adm policy add-scc-to-user anyuid -z argocd-argocd-dex-server -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-assert.yaml deleted file mode 100644 index ac582c00313..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml b/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml deleted file mode 100644 index 9a43dc0884b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc rollout restart deployment/argocd-dex-server -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml b/test/openshift/e2e/ignore-tests/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml deleted file mode 100644 index d66cebbf47b..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if [ -z $CI ]; then - operator_name_version=$(oc get subscription/openshift-gitops-operator -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}') - if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then - echo "DISABLE_DEX env var is still present in the operator CSV." - exit 1 - fi - else - operator_name_version=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}') - if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then - echo "DISABLE_DEX env var is still present in the operator CSV." - exit 1 - fi - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml deleted file mode 100644 index 51c2a1d1d44..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - notificationsController: Running - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-redis -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml deleted file mode 100644 index 43892645355..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: True - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml deleted file mode 100644 index 2407e1f77c7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: true - env: - - name: foo - value: bar -status: - server: Running - notificationsController: Running - phase: Available ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: example-argocd-notifications-controller - template: - metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: example-argocd-notifications-controller - spec: - containers: - - resources: {} - env: - - name: foo - value: bar -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml deleted file mode 100644 index f623d766dfc..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: True - env: - - name: foo - value: bar - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml deleted file mode 100644 index 047a16a9405..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-redis -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -status: - readyReplicas: 1 - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml deleted file mode 100644 index 2ccddd8293c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml deleted file mode 100644 index 00d7c7d62d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: regex \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml deleted file mode 100644 index 87cb1ea3598..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - rbac: - policyMatcherMode: 'regex' diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml deleted file mode 100644 index 3053e8b23d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: '' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml deleted file mode 100644 index 3053e8b23d7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: '' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml deleted file mode 100644 index dd3fa0660a1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: glob \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml deleted file mode 100644 index 3c91f213f2d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - rbac: - policyMatcherMode: 'glob' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-081_validate_applicationset_deployment/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-081_validate_applicationset_deployment/01-assert.yaml deleted file mode 100644 index e9b050d30ce..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-081_validate_applicationset_deployment/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -spec: - template: - spec: - containers: - - ports: - - containerPort: 7000 - name: webhook - protocol: TCP - - containerPort: 8080 - name: metrics - protocol: TCP -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -spec: - ports: - - name: webhook - port: 7000 - protocol: TCP - targetPort: 7000 - - name: metrics - port: 8080 - protocol: TCP - targetPort: 8080 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-assert.yaml deleted file mode 100644 index 00173536321..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-default-node-selector.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-default-node-selector.yaml deleted file mode 100644 index 2ccddd8293c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/01-default-node-selector.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-assert.yaml deleted file mode 100644 index 39759aad55d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-assert.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml deleted file mode 100644 index 67a5ad9f7f1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: - nodePlacement: - nodeSelector: - key1: value1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-assert.yaml deleted file mode 100644 index c41d1b1fd64..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-assert.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml b/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml deleted file mode 100644 index d3e895cd909..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: - nodePlacement: - nodeSelector: - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule - \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-assert.yaml deleted file mode 100644 index 7aef4ded9cd..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: namespace-gitops-2038 -status: - phase: Available - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-install.yaml deleted file mode 100644 index cfc05982ac4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: namespace-gitops-2038 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: namespace-gitops-2038 -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-assert.yaml deleted file mode 100644 index cc8de5a0b26..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - namespace: namespace-gitops-2038 - annotations: - foo: gitops-configmap - name: gitops-configmap - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml deleted file mode 100644 index 2d82f3d3c33..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-kustomize - namespace: namespace-gitops-2038 -spec: - project: default - source: - - repoURL: https://github.com/redhat-developer/gitops-operator.git - path: test/examples/kustomize-example - targetRevision: HEAD - destination: - server: 'https://kubernetes.default.svc' - namespace: namespace-gitops-2038 - syncPolicy: - automated: {} - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/99-delete.yaml deleted file mode 100644 index 55a447e1e02..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_kustomize_namereference/99-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: namespace-gitops-2038 - diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml deleted file mode 100644 index 1eff3b22c11..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml +++ /dev/null @@ -1,86 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - resourceIgnoreDifferences: - all: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldsManagers: - - xyz - - abc - resourceIdentifiers: - - group: apps - kind: deployments - customization: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldManagers: - - xyz - - abc - - group: batch - kind: jobs - customization: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldsManagers: - - xyz - - abc - resourceHealthChecks: - - group: certmanager.k8s.io - kind: Certificate - check: | - hs = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" - hs.message = "Waiting for certificate" - return hs - resourceActions: - - group: apps - kind: Deployment - action: | - discovery.lua: | - actions = {} - actions["restart"] = {} - return actions - definitions: - - name: restart - # Lua Script to modify the obj - action.lua: | - local os = require("os") - if obj.spec.template.metadata == nil then - obj.spec.template.metadata = {} - end - if obj.spec.template.metadata.annotations == nil then - obj.spec.template.metadata.annotations = {} - end - obj.spec.template.metadata.annotations["kubectl.kubernetes.io/restartedAt"] = os.date("!%Y-%m-%dT%XZ") - return obj \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml deleted file mode 100644 index 9975a65560d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml +++ /dev/null @@ -1,91 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - application.instanceLabelKey: app.kubernetes.io/instance - application.resourceTrackingMethod: label - configManagementPlugins: "" - ga.anonymizeusers: "false" - ga.trackingid: "" - help.chatText: "" - help.chatUrl: "" - kustomize.buildOptions: "" - oidc.config: "" - repositories: "" - repository.credentials: "" - resource.customizations.actions.apps_Deployment: | - discovery.lua: | - actions = {} - actions["restart"] = {} - return actions - definitions: - - name: restart - # Lua Script to modify the obj - action.lua: | - local os = require("os") - if obj.spec.template.metadata == nil then - obj.spec.template.metadata = {} - end - if obj.spec.template.metadata.annotations == nil then - obj.spec.template.metadata.annotations = {} - end - obj.spec.template.metadata.annotations["kubectl.kubernetes.io/restartedAt"] = os.date("!%Y-%m-%dT%XZ") - return obj - resource.customizations.health.certmanager.k8s.io_Certificate: | - hs = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" - hs.message = "Waiting for certificate" - return hs - resource.customizations.ignoreDifferences.all: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: - - xyz - - abc - resource.customizations.ignoreDifferences.apps_deployments: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: [] - resource.customizations.ignoreDifferences.batch_jobs: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: - - xyz - - abc \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml b/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml deleted file mode 100644 index a18fcb9fece..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - host: test-crane.apps.rh-4.12-111111.dev.openshift.org - grpc: - ingress: - enabled: true - ingress: - enabled: true - tls: - - hosts: - - test-crane diff --git a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-assert.yaml deleted file mode 100644 index 5632d347ddf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: example-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/02-assert.yaml deleted file mode 100644 index de4465aa55f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-084_validate_status_host_ingress/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - host: test-crane.apps.rh-4.12-111111.dev.openshift.org diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-assert.yaml deleted file mode 100644 index 8185706d1c6..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-install.yaml deleted file mode 100644 index 955aaaef8b0..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-assert.yaml deleted file mode 100644 index 352218d8d35..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - serviceAccountName: default - automountServiceAccountToken: false - serviceAccount: default -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml deleted file mode 100644 index e76ef9c8dc8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: false - serviceaccount: default \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-assert.yaml deleted file mode 100644 index 54eb04d1abf..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: modified-default ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - serviceAccountName: modified-default - automountServiceAccountToken: true - serviceAccount: modified-default -status: - readyReplicas: 1 - \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml deleted file mode 100644 index be0e8f43f9d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: modified-default ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: true - serviceaccount: modified-default \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-assert.yaml deleted file mode 100644 index f4645c1343a..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Add checks for serviceAccountName and serviceAccount after fixing https://issues.redhat.com/browse/GITOPS-2452 -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - automountServiceAccountToken: false -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml b/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml deleted file mode 100644 index 13e98fa5359..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: - serviceaccount: \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml deleted file mode 100644 index 962fa53fbad..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/01-assert.yaml +++ /dev/null @@ -1,910 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - name: gitops-operator.v1.8.0 - namespace: openshift-gitops-operator -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - kind: AnalysisRun - name: analysisruns.argoproj.io - version: v1alpha1 - - kind: AnalysisTemplate - name: analysistemplates.argoproj.io - version: v1alpha1 - - description: An Application is a group of Kubernetes resources as defined by - a manifest. - displayName: Application - kind: Application - name: applications.argoproj.io - version: v1alpha1 - - description: ApplicationSet is the representation of an ApplicationSet controller - deployment. - kind: ApplicationSet - name: applicationsets.argoproj.io - version: v1alpha1 - - description: An AppProject is a logical grouping of Argo CD Applications. - displayName: AppProject - kind: AppProject - name: appprojects.argoproj.io - version: v1alpha1 - - description: Argo CD is the representation of an Argo CD deployment. - displayName: Argo CD - kind: ArgoCD - name: argocds.argoproj.io - resources: - - kind: ArgoCD - name: "" - version: v1alpha1 - - kind: ConfigMap - name: "" - version: v1 - - kind: CronJob - name: "" - version: v1 - - kind: Deployment - name: "" - version: v1 - - kind: Ingress - name: "" - version: v1 - - kind: Job - name: "" - version: v1 - - kind: PersistentVolumeClaim - name: "" - version: v1 - - kind: Pod - name: "" - version: v1 - - kind: Prometheus - name: "" - version: v1 - - kind: ReplicaSet - name: "" - version: v1 - - kind: Route - name: "" - version: v1 - - kind: Secret - name: "" - version: v1 - - kind: Service - name: "" - version: v1 - - kind: ServiceMonitor - name: "" - version: v1 - - kind: StatefulSet - name: "" - version: v1 - version: v1alpha1 - - kind: ArgoCD - name: argocds.argoproj.io - version: v1beta1 - - kind: ClusterAnalysisTemplate - name: clusteranalysistemplates.argoproj.io - version: v1alpha1 - - kind: Experiment - name: experiments.argoproj.io - version: v1alpha1 - - description: GitopsService is the Schema for the gitopsservices API - displayName: Gitops Service - kind: GitopsService - name: gitopsservices.pipelines.openshift.io - version: v1alpha1 - - kind: NotificationsConfiguration - name: notificationsconfigurations.argoproj.io - version: v1alpha1 - - kind: RolloutManager - name: rolloutmanagers.argoproj.io - version: v1alpha1 - - kind: Rollout - name: rollouts.argoproj.io - version: v1alpha1 - description: "Red Hat OpenShift GitOps is a declarative continuous delivery platform - based on [Argo CD](https://argoproj.github.io/argo-cd/). It enables teams to adopt - GitOps principles for managing cluster configurations and automating secure and - repeatable application delivery across hybrid multi-cluster Kubernetes environments. - Following GitOps and infrastructure as code principles, you can store the configuration - of clusters and applications in Git repositories and use Git workflows to roll - them out to the target clusters.\n\n## Features\n* Automated install and upgrades - of Argo CD\n* Manual and automated configuration sync from Git repositories to - target OpenShift and Kubernetes clusters\n* Support for the Helm and Kustomize - templating tools\n* Configuration drift detection and visualization on live clusters\n* - Audit trails of rollouts to the clusters\n* Monitoring and logging integration - with OpenShift\n##Components\n* Argo CD 2.7.6\n\n## - How to Install \nAfter installing the OpenShift GitOps operator, an instance of - Argo CD is installed in the `openshift-gitops` namespace which has sufficent privileges - for managing cluster configurations. You can create additional Argo CD instances - using the `ArgoCD` custom resource within the desired namespaces.\n```yaml\napiVersion: - argoproj.io/v1alpha1\nkind: ArgoCD\nmetadata:\n name: argocd\nspec:\n server:\n - \ route:\n enabled: true\n```\n\nOpenShift GitOps is a layered product - on top of OpenShift that enables teams to adopt GitOps principles for managing - cluster configurations and automating secure and repeatable application delivery - across hybrid multi-cluster Kubernetes environments. OpenShift GitOps is built - around Argo CD as the core upstream project and assists customers to establish - an end-to-end application delivery workflow on GitOps principles.\n" - displayName: Red Hat OpenShift GitOps - icon: - - base64data: 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 - mediatype: image/png - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - events - - namespaces - - pods - - secrets - - serviceaccounts - - services - - services/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - events - - persistentvolumeclaims - - pods - - secrets - - serviceaccounts - - services - - services/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - "" - resources: - - deployments - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - namespaces - - resourcequotas - verbs: - - create - - delete - - get - - list - - update - - watch - - apiGroups: - - "" - resources: - - pods/eviction - verbs: - - create - - apiGroups: - - "" - resources: - - pods/log - verbs: - - get - - apiGroups: - - "" - resources: - - podtemplates - verbs: - - get - - list - - watch - - apiGroups: - - appmesh.k8s.aws - resources: - - virtualnodes - - virtualrouters - verbs: - - get - - list - - patch - - update - - watch - - apiGroups: - - appmesh.k8s.aws - resources: - - virtualservices - verbs: - - get - - list - - watch - - apiGroups: - - apps - resources: - - daemonsets - - deployments - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - podtemplates - - replicasets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - apps - resourceNames: - - gitops-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - apps.openshift.io - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - analysisruns - - analysisruns/finalizers - - experiments - - experiments/finalizers - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - analysistemplates - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - applications - - appprojects - - argocds - - argocds/finalizers - - argocds/status - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - clusteranalysistemplates - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - notificationsconfigurations - - notificationsconfigurations/finalizers - verbs: - - '*' - - apiGroups: - - argoproj.io - resources: - - rolloutmanagers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - rolloutmanagers/finalizers - verbs: - - update - - apiGroups: - - argoproj.io - resources: - - rolloutmanagers/status - verbs: - - get - - patch - - update - - apiGroups: - - argoproj.io - resources: - - rollouts - - rollouts/finalizers - - rollouts/scale - - rollouts/status - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - - apiGroups: - - autoscaling - resources: - - horizontalpodautoscalers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - batch - resources: - - cronjobs - - jobs - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - batch - resources: - - jobs - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - config.openshift.io - resources: - - clusterversions - verbs: - - get - - list - - watch - - apiGroups: - - console.openshift.io - resources: - - consoleclidownloads - verbs: - - create - - get - - list - - patch - - update - - watch - - apiGroups: - - console.openshift.io - resources: - - consolelinks - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - console.openshift.io - resources: - - consoleplugins - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - create - - get - - update - - apiGroups: - - elbv2.k8s.aws - resources: - - targetgroupbindings - verbs: - - get - - list - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - create - - get - - list - - patch - - watch - - apiGroups: - - getambassador.io - resources: - - ambassadormappings - - mappings - verbs: - - create - - delete - - get - - list - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - prometheuses - - prometheusrules - - servicemonitors - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - networking.istio.io - resources: - - destinationrules - - virtualservices - verbs: - - get - - list - - patch - - update - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - create - - get - - list - - patch - - update - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingresses - - networkpolicies - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - oauth.openshift.io - resources: - - oauthclients - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - operators.coreos.com - resources: - - clusterserviceversions - - operatorgroups - - subscriptions - verbs: - - create - - get - - list - - watch - - apiGroups: - - pipelines.openshift.io - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - pipelines.openshift.io - resources: - - gitopsservices - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - pipelines.openshift.io - resources: - - gitopsservices/finalizers - verbs: - - update - - apiGroups: - - pipelines.openshift.io - resources: - - gitopsservices/status - verbs: - - get - - patch - - update - - apiGroups: - - rbac.authorization.k8s.io - resources: - - '*' - verbs: - - bind - - create - - delete - - deletecollection - - escalate - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterrolebindings - - clusterroles - verbs: - - bind - - create - - delete - - deletecollection - - escalate - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - rolebindings - - roles - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - route.openshift.io - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - route.openshift.io - resources: - - routes - - routes/custom-host - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - split.smi-spec.io - resources: - - trafficsplits - verbs: - - create - - get - - patch - - update - - watch - - apiGroups: - - template.openshift.io - resources: - - templateconfigs - - templateinstances - - templates - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - traefik.containo.us - resources: - - traefikservices - verbs: - - get - - update - - watch - - apiGroups: - - x.getambassador.io - resources: - - ambassadormappings - - mappings - verbs: - - create - - delete - - get - - list - - update - - watch - - apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create - - apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create - serviceAccountName: openshift-gitops-operator-controller-manager - deployments: - - name: openshift-gitops-operator-controller-manager - spec: - replicas: 1 - selector: - matchLabels: - control-plane: gitops-operator - strategy: {} - template: - metadata: - labels: - control-plane: gitops-operator - spec: - containers: - - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 - - --leader-elect - command: - - /usr/local/bin/manager - env: - - name: ARGOCD_CLUSTER_CONFIG_NAMESPACES - value: openshift-gitops - - name: OPERATOR_NAME - value: gitops-operator - - name: LABEL_SELECTOR - - name: ENABLE_CONVERSION_WEBHOOK - value: "true" - image: quay.io/redhat-developer/gitops-operator:latest - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - name: manager - ports: - - containerPort: 9443 - name: webhook-server - protocol: TCP - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: {} - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - readOnlyRootFilesystem: true - runAsNonRoot: true - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080 - - --tls-cert-file=/etc/tls/private/tls.crt - - --tls-private-key-file=/etc/tls/private/tls.key - - --logtostderr=true - - --allow-paths=/metrics - - --http2-disable - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.15 - name: kube-rbac-proxy - ports: - - containerPort: 8443 - name: metrics - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 1m - memory: 15Mi - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - volumeMounts: - - mountPath: /etc/tls/private - name: kube-rbac-proxy-tls - readOnly: true - securityContext: - runAsNonRoot: true - serviceAccountName: openshift-gitops-operator-controller-manager - terminationGracePeriodSeconds: 10 - volumes: - - name: kube-rbac-proxy-tls - secret: - secretName: kube-rbac-proxy-tls - permissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - serviceAccountName: openshift-gitops-operator-controller-manager - strategy: deployment - installModes: - - supported: false - type: OwnNamespace - - supported: false - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: true - type: AllNamespaces - keywords: - - devtools - - gitops - - pipelines - maintainers: - - email: shbose@redhat.com - name: shoubhik - maturity: alpha - provider: - name: Red Hat Inc - replaces: gitops-operator.v1.7.3 - version: 1.8.0 - webhookdefinitions: - - admissionReviewVersions: - - v1alpha1 - - v1beta1 - containerPort: 443 - conversionCRDs: - - argocds.argoproj.io - deploymentName: openshift-gitops-operator-controller-manager - generateName: cargocds.kb.io - sideEffects: None - targetPort: 9443 - type: ConversionWebhook - webhookPath: /convert diff --git a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/02-assert.yaml deleted file mode 100644 index 850a1fd6fa4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-090_validate_permissions/02-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: gitopsservices.pipelines.openshift.io -spec: - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - spec: - description: GitopsServiceSpec defines the desired state of GitopsService - properties: - nodeSelector: - additionalProperties: - type: string - description: NodeSelector is a map of key value pairs used for node - selection in the default workloads - type: object - tolerations: - description: Tolerations allow the default workloads to schedule onto - nodes with matching taints \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-assert.yaml deleted file mode 100644 index a481801527d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: example-argocd-argocd-dex-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-install.yaml deleted file mode 100644 index 29de2e73e7e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - examples: route -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml b/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml deleted file mode 100644 index 631e2d8d45e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - clientSecret=$(oc get configmap argocd-cm -n $NAMESPACE -o jsonpath='{.data.dex\.config}' | grep clientSecret | awk -F' ' '{print $2}') - if test "$clientSecret" != "\$oidc.dex.clientSecret"; then - echo "Client secret exposed!" - exit 1 - fi - exit 0 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml deleted file mode 100644 index 138cf6ce64f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # This test validates the Dex Client Secret copied by the operator from dex serviceaccount token secret in to argocd-secret. - # To verify the behavior we should first get the token secret name of the dex service account. - secret=$(oc get -n $NAMESPACE sa example-argocd-argocd-dex-server -o json | jq -r '.secrets[] | select(.name | contains("token")) | .name') - - # Extract the clientSecret - expectedClientSecret=$(oc get secret $secret -n $NAMESPACE -o json | jq -r '.data.token') - - # actualClientSecret is the value of the secret in argocd-secret where argocd-operator should copy the secret from - actualClientSecret=$(oc get secret argocd-secret -o json -n $NAMESPACE | jq -r '.data."oidc.dex.clientSecret"') - - # Verify - if [[ $expectedClientSecret != $actualClientSecret ]]; then - echo "Error: Dex Client Secret for OIDC is not valid" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-assert.yaml deleted file mode 100644 index cf4e8aacbb1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: example-argocd-argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-install.yaml deleted file mode 100644 index 999eb47f1a9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/01-install.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml b/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml deleted file mode 100644 index 25defd5b710..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # This test validates the Dex Client Secret copied by the operator from dex serviceaccount token secret in to argocd-secret. - # To verify the behavior we should first get the token secret name of the dex service account. - secret=$(oc get -n $NAMESPACE sa example-argocd-argocd-dex-server -o json | jq -r '.secrets' | grep token | sed 's/ "name": "//g' | sed 's/"//g') - - # Extract the clientSecret - expectedClientSecret=$(oc get secret $secret -n $NAMESPACE -o json | jq -r '.data.token') - - # actualClientSecret is the value of the secret in argocd-secret where argocd-operator should copy the secret from - actualClientSecret=$(oc get secret argocd-secret -o json -n $NAMESPACE | jq -r '.data."oidc.dex.clientSecret"') - - # Verify - if $expectedClientSecret != $actualClientSecret; then - echo "Error: Dex Client Secret for OIDC is not valid" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-assert.yaml deleted file mode 100644 index aadbf9f9ca4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -spec: - replicas: 2 -status: - conditions: - - type: Available - status: 'True' - - type: Progressing - status: 'True' diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-install.yaml deleted file mode 100644 index 58dc91c4f8c..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml deleted file mode 100644 index 6e30d1c7b3f..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 - autoscale: - enabled: true - hpa: - minReplicas: 4 - maxReplicas: 7 - targetCPUUtilizationPercentage: 50 - scaleTargetRef: - kind: deployment - apiVersion: apps/v1 - name: example-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml deleted file mode 100644 index b3ddd875b67..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 45 -- script: | - set -e - serverReplicas=$(kubectl get -n $NAMESPACE deployment/example-argocd-server -o jsonpath='{.spec.replicas}') - - if [ "$serverReplicas" -ge 4 ] && [ "$serverReplicas" -le 7 ]; then - echo "server replica count matches expectation" - exit 0 - fi - exit 1 - done diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-assert.yaml deleted file mode 100644 index 3fafb2f0b4d..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: example-argocd-server -spec: - maxReplicas: 12 - metrics: - - resource: - name: cpu - target: - averageUtilization: 50 - type: Utilization - type: Resource - minReplicas: 8 - scaleTargetRef: - apiVersion: apps/v1 - kind: deployment - name: example-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml b/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml deleted file mode 100644 index 9157a38ef15..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 - autoscale: - enabled: true - hpa: - minReplicas: 8 - maxReplicas: 12 - targetCPUUtilizationPercentage: 50 - scaleTargetRef: - kind: deployment - apiVersion: apps/v1 - name: example-argocd-server diff --git a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-assert.yaml deleted file mode 100644 index a15d7f7b6c8..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-assert.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argo-rollouts ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argo-rollouts ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-admin ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-edit ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-view ---- -kind: Secret -apiVersion: v1 -metadata: - name: argo-rollouts-notification-secret ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argo-rollouts -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: argo-rollouts-metrics diff --git a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml b/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml deleted file mode 100644 index 63fc7d3c5e1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager - labels: - example: example-rollout-manager -spec: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/02-assert.yaml deleted file mode 100644 index 8b936d32707..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-100_validate_rollouts_resources_creation/02-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager -status: - phase: Available diff --git a/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-assert.yaml deleted file mode 100644 index a9981fd7d5e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-assert.yaml +++ /dev/null @@ -1,211 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argo-rollouts -rules: -- apiGroups: - - argoproj.io - resources: - - rollouts - - rollouts/status - - rollouts/finalizers - verbs: - - get - - list - - watch - - update - - patch -- apiGroups: - - argoproj.io - resources: - - analysisruns - - analysisruns/finalizers - - experiments - - experiments/finalizers - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - argoproj.io - resources: - - analysistemplates - - clusteranalysistemplates - verbs: - - get - - list - - watch -- apiGroups: - - apps - resources: - - replicasets - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - "" - - apps - resources: - - deployments - - podtemplates - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - services - verbs: - - get - - list - - watch - - patch - - create - - delete -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - create - - get - - update -- apiGroups: - - "" - resources: - - secrets - - configmaps - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - pods - verbs: - - list - - update - - watch -- apiGroups: - - "" - resources: - - pods/eviction - verbs: - - create -- apiGroups: - - "" - resources: - - events - verbs: - - create - - update - - patch -- apiGroups: - - networking.k8s.io - - extensions - resources: - - ingresses - verbs: - - create - - get - - list - - watch - - patch -- apiGroups: - - batch - resources: - - jobs - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - networking.istio.io - resources: - - virtualservices - - destinationrules - verbs: - - watch - - get - - update - - patch - - list -- apiGroups: - - split.smi-spec.io - resources: - - trafficsplits - verbs: - - create - - watch - - get - - update - - patch -- apiGroups: - - getambassador.io - - x.getambassador.io - resources: - - mappings - - ambassadormappings - verbs: - - create - - watch - - get - - update - - list - - delete -- apiGroups: - - "" - resources: - - endpoints - verbs: - - get -- apiGroups: - - elbv2.k8s.aws - resources: - - targetgroupbindings - verbs: - - list - - get -- apiGroups: - - appmesh.k8s.aws - resources: - - virtualservices - verbs: - - watch - - get - - list -- apiGroups: - - appmesh.k8s.aws - resources: - - virtualnodes - - virtualrouters - verbs: - - watch - - get - - list - - update - - patch -- apiGroups: - - traefik.containo.us - resources: - - traefikservices - verbs: - - watch - - get - - update diff --git a/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml b/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml deleted file mode 100644 index 63fc7d3c5e1..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager - labels: - example: example-rollout-manager -spec: {} diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml deleted file mode 100644 index 25a05427feb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-service-argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml deleted file mode 100644 index 25a05427feb..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-service-argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml deleted file mode 100644 index 3ee2c131f67..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: gitops-service-argocd - namespace: gitops-service-argocd -status: - phase: Available ---- -kind: Namespace -apiVersion: v1 -metadata: - name: jane - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: jane - finalizers: - - some.random/finalizer diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml deleted file mode 100644 index f816740dff7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml +++ /dev/null @@ -1,198 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-service-argocd - namespace: gitops-service-argocd -spec: - resourceInclusions: | - - apiGroups: - - "" - kinds: - - "PersistentVolumeClaim" - - "PersistentVolume" - - "Secret" - - "ConfigMap" - - "Pod" - - "Endpoint" - - "Service" - - "ServiceAccounts" - clusters: - - "*" - - apiGroups: - - "apps" - kinds: - - "ReplicaSet" - - "StatefulSet" - - "DaemonSet" - - "Deployment" - clusters: - - "*" - - apiGroups: - - "discovery.k8s.io" - kinds: - - "EndpointSlice" - clusters: - - "*" - - apiGroups: - - "networking.k8s.io" - kinds: - - "Ingress" - - "IngressClass" - clusters: - - "*" - - apiGroups: - - "rbac.authorization.k8s.io" - kinds: - - "RoleBinding" - - "Role" - clusters: - - "*" - - apiGroups: - - "route.openshift.io" - kinds: - - "Route" - clusters: - - "*" - - apiGroups: - - "triggers.tekton.dev" - kinds: - - "EventListener" - - "TriggerTemplate" - clusters: - - "*" - - apiGroups: - - "pipelinesascode.tekton.dev" - kinds: - - "Repository" - clusters: - - "*" - applicationSet: - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 250m - memory: 128Mi - controller: - logLevel: "debug" - processors: {} - resources: - limits: - cpu: "2" - memory: 3Gi - requests: - cpu: 250m - memory: 256Mi - env: - - name: ARGOCD_RECONCILIATION_TIMEOUT - value: 60s - sharding: {} -# dex: -# enabled: false -# openShiftOAuth: false # true -# resources: -# limits: -# cpu: 500m -# memory: 256Mi -# requests: -# cpu: 250m -# memory: 128Mi - grafana: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - route: - enabled: false - ha: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - initialSSHKnownHosts: {} - prometheus: - enabled: false - ingress: - enabled: false - route: - enabled: false - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' - redis: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - repo: - logLevel: "debug" - extraRepoCommandArgs: - - --max-combined-directory-manifests-size - - 10M - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 250m - memory: 256Mi - env: - - name: ARGOCD_RECONCILIATION_TIMEOUT - value: "60s" - server: - logLevel: "debug" - autoscale: - enabled: false - grpc: - ingress: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 125m - memory: 128Mi - route: - enabled: true - tls: - termination: reencrypt - service: - type: "" - tls: - ca: {} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: jane - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: jane - finalizers: - - some.random/finalizer -data: {} ---- diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml deleted file mode 100644 index f1b46092ae4..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: kubectl delete ns jane - ignoreFailure: true - timeout: 30 diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml deleted file mode 100644 index 7b9d898b856..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: john - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml deleted file mode 100644 index 7b9d898b856..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: john - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml deleted file mode 100644 index 86f043d675e..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: my-app - namespace: gitops-service-argocd -status: - sync: - status: Synced diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml deleted file mode 100644 index b0807129715..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: my-app - namespace: gitops-service-argocd -spec: - destination: - namespace: john - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/kustomize-guestbook - targetRevision: master - syncPolicy: - automated: - prune: true - selfHeal: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml deleted file mode 100644 index 575eef2fe27..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch cm/my-config-map-2 -n jane --type json --patch='[ { "op": "remove", "path": "/metadata/finalizers" }]'] -delete: -- apiVersion: v1 - kind: Namespace - name: gitops-service-argocd -- apiVersion: v1 - kind: Namespace - name: john diff --git a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml b/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml deleted file mode 100644 index 98ae37baf04..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - dex: - openShiftOAuth: true - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml deleted file mode 100644 index 110eb0637c7..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true -status: - phase: Available - sso: Running diff --git a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml b/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml deleted file mode 100644 index fd9f5918ae9..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml b/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml deleted file mode 100644 index 67165d6b510..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml b/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml deleted file mode 100644 index 55907d32c74..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-104-appsets-scm-tls-mount -spec: - applicationSet: - scmRootCAConfigMap: test-1-104-appsets-scm-tls-cm -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-applicationset-controller - namespace: test-1-104-appsets-scm-tls-mount - labels: - app.kubernetes.io/component: controller - app.kubernetes.io/managed-by: argocd - app.kubernetes.io/name: argocd-applicationset-controller - app.kubernetes.io/part-of: argocd-applicationset -spec: - selector: - matchLabels: - app.kubernetes.io/name: argocd-applicationset-controller - template: - spec: - containers: - - command: - - entrypoint.sh - - argocd-applicationset-controller - - --argocd-repo-server - - argocd-repo-server.test-1-104-appsets-scm-tls-mount.svc.cluster.local:8081 - - --loglevel - - info - - --scm-root-ca-path - - /app/tls/scm/cert - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/gpg/source - name: gpg-keys - - mountPath: /app/config/gpg/keys - name: gpg-keyring - - mountPath: /tmp - name: tmp - - mountPath: /app/tls/scm/cert - name: appset-gitlab-scm-tls-cert - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - configMap: - defaultMode: 420 - name: argocd-gpg-keys-cm - name: gpg-keys - - emptyDir: {} - name: gpg-keyring - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: argocd-appset-gitlab-scm-tls-certs-cm - name: appset-gitlab-scm-tls-cert diff --git a/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml b/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml deleted file mode 100644 index 68e229e2059..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-104-appsets-scm-tls-mount ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: test-1-104-appsets-scm-tls-cm - namespace: test-1-104-appsets-scm-tls-mount -data: - cert: | - -----BEGIN CERTIFICATE----- - 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 - XWyb96wrUlv+E8I= - -----END CERTIFICATE----- - ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-104-appsets-scm-tls-mount -spec: - applicationSet: - scmRootCAConfigMap: test-1-104-appsets-scm-tls-cm \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/parallel/kuttl-test.yaml b/test/openshift/e2e/ignore-tests/parallel/kuttl-test.yaml deleted file mode 100644 index 788001a60a3..00000000000 --- a/test/openshift/e2e/ignore-tests/parallel/kuttl-test.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestSuite -name: gitops-operator-e2e -testDirs: - - . -suppress: - - events -parallel: 5 -timeout: 1200 -reportFormat: JSON -reportName: openshift-gitops-e2e diff --git a/test/openshift/e2e/ignore-tests/sequential/1-002_validate_backend_service/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-002_validate_backend_service/01-assert.yaml deleted file mode 100644 index 199a89ba362..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-002_validate_backend_service/01-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# We need the openshift-gitops namespace installed by default -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-gitops ---- -# We need a cluster deployment in the namespace -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -status: - replicas: 1 - readyReplicas: 1 ---- -# Service for cluster exists -apiVersion: v1 -kind: Service -metadata: - name: cluster - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-002_validate_backend_service/01-check-backend-service.yaml b/test/openshift/e2e/ignore-tests/sequential/1-002_validate_backend_service/01-check-backend-service.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/01-assert.yaml deleted file mode 100644 index 3f910770d4e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/01-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Check for the openshift-gitops Argo CD Operand to be installed and in phase -# available. -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/01-check-prereqs.yaml b/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/01-check-prereqs.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/02-change-operand.yaml b/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/02-change-operand.yaml deleted file mode 100644 index 29770189886..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/02-change-operand.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - controller: - processors: - operation: 20 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/03-wait.yaml b/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/03-wait.yaml deleted file mode 100644 index 73c2aec072d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/03-wait.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/04-assert.yaml deleted file mode 100644 index 76570ad8afd..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-004_validate_argocd_installation/04-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - controller: - processors: - operation: 20 -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-005_validate_metrics/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-005_validate_metrics/01-assert.yaml deleted file mode 100644 index 1b0dc4c315a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-005_validate_metrics/01-assert.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# ServiceMonitor for openshift-gitops -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - namespaceSelector: {} - selector: - matchLabels: - app.kubernetes.io/name: openshift-gitops-metrics ---- -# ServiceMonitor for openshift-gitops-repo-server -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - namespaceSelector: {} - selector: - matchLabels: - app.kubernetes.io/name: openshift-gitops-repo-server ---- -# ServiceMonitor for openshift-gitops-repo-server -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - namespaceSelector: {} - selector: - matchLabels: - app.kubernetes.io/name: openshift-gitops-server-metrics ---- -# Validate PrometheusRule for openshift-gitops -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops -spec: - groups: - - name: GitOpsOperatorArgoCD - rules: - - alert: ArgoCDSyncAlert - annotations: - summary: Argo CD application is out of sync - description: Argo CD application {{ $labels.name }} is out of sync. Check ArgoCDSyncAlert status, this alert is designed to notify that an application managed by Argo CD is out of sync. - expr: argocd_app_info{namespace="openshift-gitops",sync_status="OutOfSync"} > 0 - labels: - severity: warning diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-assert.yaml deleted file mode 100644 index 3a8a92d350b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-assert.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -status: - readyReplicas: 2 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -status: - readyReplicas: 2 - replicas: 2 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-install.yaml deleted file mode 100644 index db87c2e5a87..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - repo: - replicas: 2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-assert.yaml deleted file mode 100644 index 97caad98dea..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-machine-config - namespace: openshift-gitops -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-install.yaml deleted file mode 100644 index 230b64b8a49..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/02-install.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-machine-config - namespace: openshift-gitops -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/image - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: openshift-gitops - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-assert.yaml deleted file mode 100644 index c5e00ae77ac..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Check for the openshift-gitops Argo CD Operand to be installed and in phase -# available. -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-install.yaml deleted file mode 100644 index 8914a77359f..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/03-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - repo: - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/99-delete.yaml deleted file mode 100644 index 8dc647ab1e9..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-006_validate_machine_config/99-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: validate-machine-config - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml deleted file mode 100644 index 2d659ebe0d8..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: source-ns ---- -apiVersion: v1 -kind: Namespace -metadata: - name: target-ns - labels: - argocd.argoproj.io/managed-by: source-ns ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: source-ns -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: default - namespace: source-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: target-ns diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-install.yaml deleted file mode 100644 index 9514336389d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/01-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: source-ns ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: source-ns -spec: - server: - route: - enabled: true ---- -apiVersion: v1 -kind: Namespace -metadata: - name: target-ns - labels: - argocd.argoproj.io/managed-by: source-ns diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml deleted file mode 100644 index 6b1544c0f9d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: source-ns-openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml deleted file mode 100644 index 6b1544c0f9d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: source-ns-openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml deleted file mode 100644 index ae8b9ebc84f..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nginx - namespace: source-ns -status: - health: - status: Healthy - sync: - status: Synced diff --git a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml b/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml deleted file mode 100644 index 068dae3e813..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nginx - namespace: source-ns -spec: - destination: - namespace: target-ns - server: 'https://kubernetes.default.svc' - project: default - source: - path: test/examples/nginx - repoURL: 'https://github.com/redhat-developer/gitops-operator' - targetRevision: HEAD - syncPolicy: - automated: {} -status: {} diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-assert.yaml deleted file mode 100644 index 7a45d03357e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Wait for the Operator to become available -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -# Additional namespace that we want to manage -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-10-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-install.yaml deleted file mode 100644 index ee1fc2c22e0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-10-custom - labels: - kubernetes.io/metadata.name: test-1-10-custom - argocd.argoproj.io/managed-by: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/02-assert.yaml deleted file mode 100644 index 856cd78b86a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/02-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-10-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-10-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-10-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-server -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-assert.yaml deleted file mode 100644 index 61128d5254c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-10-custom - namespace: openshift-gitops -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-create-application.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-create-application.yaml deleted file mode 100644 index 56c8bdd3b61..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/03-create-application.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-10-custom - namespace: openshift-gitops -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-10-custom - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/04-unlabel-namespace.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/04-unlabel-namespace.yaml deleted file mode 100644 index be710ac7bd7..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/04-unlabel-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-10-custom argocd.argoproj.io/managed-by- -- script: sleep 5 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/05-check-rbac.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/05-check-rbac.yaml deleted file mode 100644 index 40b594a3aad..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/05-check-rbac.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 1200 -error: -- errors.yaml - diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/99-delete.yaml deleted file mode 100644 index 8df1501a0b3..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/99-delete.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-10-custom -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: test-1-10-custom - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/README.md b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/README.md deleted file mode 100644 index 14399b4bfb0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# manage-other-namespace - -## Synopsis - -This is a test for the `managed-by` permission extension. It creates another -namespace, labels it and checks whether all roles and rolebindings are setup. -Then, it will sync an application into that namespace. - -## Success criterias - -* Role and RoleBindings are created succesfully -* Application is correctly synced to target namespace -* After unlabeling, this is not possible anymore - -## Remarks \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/errors.yaml deleted file mode 100644 index b582cc5fbb2..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-010_validate-ootb-manage-other-namespace/errors.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-10-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-10-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-redis-ha - namespace: test-1-10-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-10-custom diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml deleted file mode 100644 index 6d1dc202ff2..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/01-assert.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops ---- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-assert.yaml deleted file mode 100644 index 14db9444245..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-operator-controller-manager - namespace: openshift-gitops-operator -status: - readyReplicas: 1 - replicas: 1 - availableReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-patch-subscription.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-patch-subscription.yaml deleted file mode 100644 index 39a3327a311..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/02-patch-subscription.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set an environment variable -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_INSTANCE="true" - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_INSTANCE", "value": "true"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_INSTANCE", "value": "true"}]}}}' - fi -- script: sleep 120 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/03-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/03-errors.yaml deleted file mode 100644 index 762a5663376..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/03-errors.yaml +++ /dev/null @@ -1,196 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: openshift-gitops-openshift-gitops-argocd-application-controller ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: openshift-gitops-openshift-gitops-argocd-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: openshift-gitops-openshift-gitops-argocd-application-controller ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: openshift-gitops-openshift-gitops-argocd-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-dex-server - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-grafana - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-redis - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-redis-ha - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-dex-server - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-grafana - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-redis - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-redis-ha - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-dex-server - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-grafana - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-redis - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-redis-ha - namespace: openshift-gitops ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: openshift-gitops-argocd-server - namespace: openshift-gitops ---- ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-assert.yaml deleted file mode 100644 index 0dfe861400a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-assert.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-patch-subscription.yaml b/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-patch-subscription.yaml deleted file mode 100644 index bd858caec55..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-018_validate_disable_default_instance/04-patch-subscription.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set an environment variable -- script: | - if ! [ -z $NON_OLM ]; then - - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_INSTANCE=null - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - fi -- script: sleep 120 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-026-validate_backend_service_permissions/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-026-validate_backend_service_permissions/01-assert.yaml deleted file mode 100644 index 93dbf371da0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-026-validate_backend_service_permissions/01-assert.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - serviceAccount: gitops-service-cluster - serviceAccountName: gitops-service-cluster ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: gitops-service-cluster - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: gitops-service-cluster -rules: -- apiGroups: - - argoproj.io - resources: - - applications - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - secrets - verbs: - - get - - list - - watch ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: gitops-service-cluster -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: gitops-service-cluster -subjects: -- kind: ServiceAccount - name: gitops-service-cluster - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-026-validate_backend_service_permissions/01-check-backend-service.yaml b/test/openshift/e2e/ignore-tests/sequential/1-026-validate_backend_service_permissions/01-check-backend-service.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-assert.yaml deleted file mode 100644 index 5eab98a847a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-assert.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-27-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: 1-27-argocd - namespace: openshift-gitops -status: - health: - status: Healthy - sync: - status: Synced ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-27-custom -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-install.yaml deleted file mode 100644 index 224b2a48d69..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/02-install.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: 1-27-argocd - namespace: openshift-gitops -spec: - project: default - source: - # TODO: Move this repository to a better location - repoURL: https://github.com/jannfis/operator-e2e-git - path: ./operator-acceptance/1-027_operand-from-git - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: openshift-gitops - syncPolicy: - automated: {} - retry: - limit: 5 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-assert.yaml deleted file mode 100644 index 979025ae172..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis - namespace: test-1-27-custom -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server - namespace: test-1-27-custom -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server - namespace: test-1-27-custom -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx-deployment - namespace: test-1-27-custom -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-27-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: 1-27-argocd - namespace: openshift-gitops -status: - health: - status: Healthy - sync: - status: Synced ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-27-custom -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-27-custom -status: - health: - status: Healthy - sync: - status: Synced diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-create-app.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-create-app.yaml deleted file mode 100644 index 91453a90ad1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/03-create-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-27-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-27-custom - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/99-delete.yaml deleted file mode 100644 index a8916c5eeaa..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-027_validate_operand_from_git/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-27-custom -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: 1-27-argocd - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml deleted file mode 100644 index a6eded59e88..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-assert.yaml +++ /dev/null @@ -1,93 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-install.yaml deleted file mode 100644 index 0d9b35e8729..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# We must not use declarative update/creation for gitopsservice, because kuttl -# would delete the resource after the test finishes. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"runOnInfra": true, "tolerations": [{"effect": "NoSchedule", "key": "infra", "value": "reserved"}]}}' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-errors.yaml deleted file mode 100644 index 89840612532..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/02-errors.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/03-change-back.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/03-change-back.yaml deleted file mode 100644 index da1aba0f12d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/03-change-back.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=json --patch='[{"op": "remove", "path": "/spec/tolerations"}, {"op": "remove", "path": "/spec/runOnInfra"}]' - oc patch statefulset openshift-gitops-application-controller -n openshift-gitops -p '{"spec":{"replicas":0}}' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/04-check.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/04-check.yaml deleted file mode 100644 index 5bc157c55cc..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/04-check.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 1200 -error: -- errors.yaml \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml deleted file mode 100644 index 277cccd5924..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-028_validate_run_on_infra/errors.yaml +++ /dev/null @@ -1,89 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-assert.yaml deleted file mode 100644 index c05075a77a1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-assert.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-034-custom -status: - phase: Available ---- -apiVersion: v1 -kind: Namespace -metadata: - name: custom-role-namespace - labels: - argocd.argoproj.io/managed-by: test-1-034-custom ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: custom-argocd-role -rules: - - verbs: - - list - - watch - - get - apiGroups: - - '*' - resources: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-install.yaml deleted file mode 100644 index c4cde52d606..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/01-install.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Create a new namespace -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-034-custom ---- -# Create an Argo CD instance in the new namespace -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-034-custom ---- -# Create a test namespace with managed-by label -apiVersion: v1 -kind: Namespace -metadata: - name: custom-role-namespace - labels: - argocd.argoproj.io/managed-by: test-1-034-custom ---- -# Create a sample cluster role for application-controller and server -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: custom-argocd-role -rules: - - verbs: - - list - - watch - - get - apiGroups: - - '*' - resources: - - '*' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml deleted file mode 100644 index 51c34e1904d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Add env variables specifying custom roles -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator CONTROLLER_CLUSTER_ROLE=custom-argocd-role - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator SERVER_CLUSTER_ROLE=custom-argocd-role - - elif ! [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'`\ - --type merge --patch '{"spec": {"config": {"env": [{"name": "CONTROLLER_CLUSTER_ROLE", "value": "custom-argocd-role"},{"name": "SERVER_CLUSTER_ROLE", "value": "custom-argocd-role"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "CONTROLLER_CLUSTER_ROLE", "value": "custom-argocd-role"},{"name": "SERVER_CLUSTER_ROLE", "value": "custom-argocd-role"}]}}}' - - fi -- script: sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/03-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/03-errors.yaml deleted file mode 100644 index 2c1866eea4c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/03-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Check if the default roles are removed from the namespace -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-034-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/04-assert.yaml deleted file mode 100644 index 0fafcbabdff..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/04-assert.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Check if the Rolebindings are updated in all the namespaces -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-034-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: test-1-034-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/05-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/05-delete.yaml deleted file mode 100644 index 5a56e8ae1e4..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/05-delete.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: argocd - namespace: test-1-034-custom -- apiVersion: v1 - kind: Namespace - name: test-1-034-custom -- apiVersion: v1 - kind: Namespace - name: custom-role-namespace -- apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRole - name: custom-argocd-role \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/06-revert-patch.yaml b/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/06-revert-patch.yaml deleted file mode 100644 index e63e9b4216e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-034_validate_custom_roles/06-revert-patch.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator SERVER_CLUSTER_ROLE=null - - elif ! [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]' - else - oc patch subscription/openshift-gitops-operator -n openshift-gitops-operator --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]' - fi -- script: sleep 10 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml b/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml deleted file mode 100644 index 5aaa3061a7e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch secret/argocd-secret -p '{"data":null}' -n openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml b/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml deleted file mode 100644 index 70d6fc9f34d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Check if the argocd-secret was repopulated -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - until [[ $i -eq 20 ]] - do - secret_data=$(oc get secret/argocd-secret -n openshift-gitops -o custom-columns=SECRET:.data --no-headers) - if [[ $secret_data == "" ]] - then - i=$((i+1)) - sleep 6 - else - echo "argocd-secret was repopulated" - exit 0 - fi - done - - echo "argocd-secret was not repopulated" - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml b/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml deleted file mode 100644 index 12e333c409b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Check if the openshift-gitops-operator-controller-manager pod is running -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc rollout status deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator --timeout=1m - rollout_status=$? - if [ "${rollout_status}" -ne 0 ]; then - echo "openshift-gitops-operator-controller-manager deployment was not successfully rolled out" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml b/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml deleted file mode 100644 index c6165d11500..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") - password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - output=$(argocd login $api_server --username admin --password $password --insecure) - - if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then - if [[ "${output}" == *"rpc error: code = Unknown desc = server.secretkey is missing" ]]; then - echo "server.secretkey is missing" - exit 1 - fi - fi - exit 0 - diff --git a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml b/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml deleted file mode 100644 index ca687cb6caf..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") - password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - - output=$(argocd login $api_server --username admin --password $password --insecure) - - if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then - exit 1 - fi - exit 0 - diff --git a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml b/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml deleted file mode 100644 index 6039fb04ef7..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - output=$(argocd proj role create default somerole) - - if ! [[ "$output" =~ "Role 'somerole' created" ]]; then - echo "Error creating role" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml b/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml deleted file mode 100644 index 7a096dd9d63..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - output=$(argocd proj role add-group default somerole '"CN=foo,OU=bar,O=baz"') - - cleanup() { - argocd proj role delete default somerole - } - trap cleanup INT TERM EXIT - - if ! [[ "${output}" =~ "added to role 'somerole'" ]]; then - echo "Contains comma characters!" - exit 1 - fi diff --git a/test/openshift/e2e/ignore-tests/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml deleted file mode 100644 index 2b89033e1ca..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops -spec: - groups: - - name: GitOpsOperatorArgoCD - rules: - - alert: ArgoCDSyncAlert - annotations: - summary: Argo CD application is out of sync - description: Argo CD application {{ $labels.name }} is out of sync. Check ArgoCDSyncAlert status, this alert is designed to notify that an application managed by Argo CD is out of sync. - expr: argocd_app_info{namespace="openshift-gitops",sync_status="OutOfSync"} > 0 - for: 5m - labels: - severity: warning diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-assert.yaml deleted file mode 100644 index d26b59dcd3d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Running ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: v1 -kind: Service -metadata: - name: argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-install.yaml deleted file mode 100644 index 9e8bc52dfc6..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/01-install.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-assert.yaml deleted file mode 100644 index b655143521c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Unknown \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-errors.yaml deleted file mode 100644 index 29e4f1025ab..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: v1 -kind: Service -metadata: - name: argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-remove-spec-sso.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-remove-spec-sso.yaml deleted file mode 100644 index a19ebd02e03..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/02-remove-spec-sso.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the CR to remove .spec.sso -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "remove", "path": "/spec/sso"}]' -- script: sleep 10 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-assert.yaml deleted file mode 100644 index b608278183b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Failed \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-errors.yaml deleted file mode 100644 index 7e00cea3291..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-errors.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml deleted file mode 100644 index 1b7234cec5f..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: keycloak - dex: - config: test \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-assert.yaml deleted file mode 100644 index bf94f95293e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Running ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-remove-spec-dex.yaml b/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-remove-spec-dex.yaml deleted file mode 100644 index f58c6e269db..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-050_validate_sso/08-remove-spec-dex.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the CR to remove .spec.sso -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "remove", "path": "/spec/sso/dex"}]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-assert.yaml deleted file mode 100644 index baf2f329c9a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-assert.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom - labels: - argocd.argoproj.io/managed-by: test-1-56-target ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - namespace: test-1-56-target -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-install.yaml deleted file mode 100644 index ec183bee84e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/01-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom - labels: - argocd.argoproj.io/managed-by: test-1-56-target ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - namespace: test-1-56-target -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/02-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/02-delete.yaml deleted file mode 100644 index 3e4266da0db..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/02-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: example-argocd - namespace: test-1-56-target diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/03-check.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/03-check.yaml deleted file mode 100644 index 69624aed8a6..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/03-check.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - label_value=$(oc get ns/test-1-56-custom -o go-template=$'{{index .metadata.labels "argocd.argoproj.io/managed-by"}}') - - echo "label value: ${label_value}" - - if [[ "${label_value}" == "test-1-56-target" ]]; then - echo "managed-by label exists, set REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION variable to delete the label" - exit 0 - fi - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/04-add_env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/04-add_env.yaml deleted file mode 100644 index e7669fb444b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/04-add_env.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set the environment variable -- script: | - set -e - - if ! [ -z $NON_OLM ]; then - - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION=true - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION", "value": "true"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION", "value": "true"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/05-check.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/05-check.yaml deleted file mode 100644 index dd39153ae23..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/05-check.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION")|.value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-assert.yaml deleted file mode 100644 index 61e3efab3f1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-assert.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target-2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-2 - namespace: test-1-56-target-2 -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-redis - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-repo-server - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-server - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-2-application-controller - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-install.yaml deleted file mode 100644 index 57780b8238b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/06-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target-2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 - labels: - argocd.argoproj.io/managed-by: test-1-56-target-2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-2 - namespace: test-1-56-target-2 -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-delete.yaml deleted file mode 100644 index f2b3b38e2c2..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: example-argocd-2 - namespace: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-errors.yaml deleted file mode 100644 index 5bd4602e1a0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/07-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 - labels: - argocd.argoproj.io/managed-by: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/08-remove_env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/08-remove_env.yaml deleted file mode 100644 index 8f22ee530cc..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/08-remove_env.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set an environment variable -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION=null - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - fi diff --git a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/99-delete.yaml deleted file mode 100644 index df3bf9503b9..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-056_validate_managed-by/99-delete.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-56-custom -- apiVersion: v1 - kind: Namespace - name: test-1-56-custom-2 -- apiVersion: v1 - kind: Namespace - name: test-1-56-target -- apiVersion: v1 - kind: Namespace - name: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-assert.yaml deleted file mode 100644 index db5870cfcf0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-27-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: 1-27-argocd - namespace: openshift-gitops -status: - health: - status: Healthy - sync: - status: Synced ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-27-custom -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-install.yaml deleted file mode 100644 index 224b2a48d69..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/02-install.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: 1-27-argocd - namespace: openshift-gitops -spec: - project: default - source: - # TODO: Move this repository to a better location - repoURL: https://github.com/jannfis/operator-e2e-git - path: ./operator-acceptance/1-027_operand-from-git - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: openshift-gitops - syncPolicy: - automated: {} - retry: - limit: 5 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/03-wait.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/03-wait.yaml deleted file mode 100644 index d39abd5af6c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/03-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-27-custom" \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-assert.yaml deleted file mode 100644 index 939b0397330..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-27-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-create-app.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-create-app.yaml deleted file mode 100644 index 91453a90ad1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/04-create-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-27-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-27-custom - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/05-check-app-manifest.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/05-check-app-manifest.yaml deleted file mode 100644 index 92438f374a6..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/05-check-app-manifest.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - cleanup() { - argocd logout "${api_server}" - unset api_server - unset password - } - trap cleanup INT TERM EXIT - - # Get credentials - api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") - password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - - # Login into ArgoCD - login=$(argocd login $api_server --username admin --password $password --insecure) - if ! [[ "${login}" =~ "'admin:login' logged in successfully" ]]; then - echo "ERROR: unable to login to ArgoCD remote api server" - exit 1 - fi - - # Execute 'argocd app manifest' and check the 'read tcp' error - app_manifests=$(argocd app manifests 1-27-argocd --source git --revision HEAD) - if [[ "${app_manifests}" =~ 'Original error: read tcp' ]]; then - echo "ERROR: TCP reset error is present in this code" - exit 2 - fi - - exit 0 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/99-delete.yaml deleted file mode 100644 index a8916c5eeaa..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-27-custom -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: 1-27-argocd - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml deleted file mode 100644 index d10a97921cd..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/01-assert.yaml +++ /dev/null @@ -1,65 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml deleted file mode 100644 index 1b6b57cd8b7..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml deleted file mode 100644 index e850ace776b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"nodeSelector": {"key1": "value1"}}}' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml deleted file mode 100644 index 6069bc97a78..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-assert.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml deleted file mode 100644 index 7ca77f5c3c3..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"runOnInfra": true, "tolerations": [{"effect": "NoSchedule", "key": "infra", "value": "reserved"}]}}' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-change-back.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-change-back.yaml deleted file mode 100644 index 9a45ab5f8b6..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-change-back.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=json --patch='[{"op": "remove", "path": "/spec/tolerations"}, {"op": "remove", "path": "/spec/runOnInfra"}, {"op": "remove", "path": "/spec/nodeSelector"}]' - oc patch statefulset openshift-gitops-application-controller -n openshift-gitops -p '{"spec":{"replicas":0}}' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml deleted file mode 100644 index 6069bc97a78..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-071_validate_node_selectors/04-errors.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml deleted file mode 100644 index 93a363477ce..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Refer to https://issues.redhat.com/browse/GITOPS-2664 - -# apiVersion: monitoring.coreos.com/v1 -# kind: PrometheusRule -# metadata: -# name: argocd-component-status-alert -# namespace: openshift-gitops -# spec: -# groups: -# - name: ArgoCDComponentStatus -# rules: -# - alert: ApplicationControllerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: ServerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: RepoServerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: ApplicationSetControllerNotReady -# for: 5m -# labels: -# severity: warning -# - alert: DexNotReady -# for: 5m -# labels: -# severity: warning -# - alert: NotificationsControllerNotReady -# for: 5m -# labels: -# severity: warning -# - alert: RedisNotReady -# for: 5m -# labels: -# severity: warning diff --git a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml deleted file mode 100644 index 0aa6f79605e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# apiVersion: argoproj.io/v1alpha1 -# kind: ArgoCD -# metadata: -# name: openshift-gitops -# namespace: openshift-gitops -# labels: -# example: argocd -# spec: -# applicationSet: -# image: test-image -# monitoring: -# enabled: true diff --git a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml deleted file mode 100644 index 6857407a8ed..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# commands: -# - script: sleep 10m -# - script: | -# jq '.data.alerts' <<< "$(oc -n openshift-monitoring exec -c prometheus prometheus-k8s-0 -- curl -s 'http://localhost:9090/api/v1/alerts')" > alerts.json - -# result=$(jq --arg deployment "openshift-gitops-applicationset-controller" --arg namespace $NAMESPACE '.[] | select(.labels.alertname == "ApplicationSetControllerNotReady" and .state == "firing")' alerts.json) - -# rm alerts.json - -# [[ ! -z "$result" ]] && exit 0 || exit 1 - diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml deleted file mode 100644 index fbfc9e9b451..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml deleted file mode 100644 index 3acec839413..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=true - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "true"}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "true"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml deleted file mode 100644 index c33864cdd4b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml deleted file mode 100644 index f8b32868c9a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=false - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "false"}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "false"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml deleted file mode 100644 index 20b88d5ed60..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == '"false"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"false"' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"false"' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml deleted file mode 100644 index bdb35197835..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK="" - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": ""}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": ""}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml deleted file mode 100644 index 46ba0958717..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq -r '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == null ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '""' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '""' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml b/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml deleted file mode 100644 index 474000095a4..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=null - elif [ -z $CI ]; then - oc -n openshift-gitops-operator patch subscription openshift-gitops-operator --type='json' -p='[{"op": "remove", "path": "/spec/config" }]' - else - oc -n openshift-gitops-operator patch subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type='json' -p='[{"op": "remove", "path": "/spec/config" }]' - fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-assert.yaml deleted file mode 100644 index 7f60d3361eb..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-assert.yaml +++ /dev/null @@ -1,99 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-server -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-create-ns-managed-by.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-create-ns-managed-by.yaml deleted file mode 100644 index ac11c6901dc..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/01-create-ns-managed-by.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops - - diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-add-source-ns.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-add-source-ns.yaml deleted file mode 100644 index 8c0f775fd8a..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-add-source-ns.yaml +++ /dev/null @@ -1,9 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - sourceNamespaces: - - test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-assert.yaml deleted file mode 100644 index a89acd85de7..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-assert.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-server -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-errors.yaml deleted file mode 100644 index 99d4e31f190..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/02-errors.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops_test-1-24-custom -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/03-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/03-delete.yaml deleted file mode 100644 index 8fdf9250483..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/03-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-assert.yaml deleted file mode 100644 index 02481e54cc0..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-change-source-namespaces.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-change-source-namespaces.yaml deleted file mode 100644 index 91ae6075f58..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-change-source-namespaces.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - sourceNamespaces: \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-errors.yaml deleted file mode 100644 index daa55c3e116..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/04-errors.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-assert.yaml deleted file mode 100644 index c57e946974d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-assert.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops_test-1-24-custom -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-create-ns-and-add-source-ns.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-create-ns-and-add-source-ns.yaml deleted file mode 100644 index 6b46f05e974..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/05-create-ns-and-add-source-ns.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - sourceNamespaces: - - test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-add-managed-by.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-add-managed-by.yaml deleted file mode 100644 index 7feff9050fa..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-add-managed-by.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-assert.yaml deleted file mode 100644 index df1940984bb..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-assert.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-server -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-errors.yaml deleted file mode 100644 index e7bfd7cc17e..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/06-errors.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops_test-1-24-custom -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-assert.yaml deleted file mode 100644 index c57e946974d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-assert.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops_test-1-24-custom -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-remove-managed-by.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-remove-managed-by.yaml deleted file mode 100644 index a5f3b224c39..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/07-remove-managed-by.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: oc label ns test-1-24-custom argocd.argoproj.io/managed-by- -- script: oc rollout restart deployment.apps/openshift-gitops-server -n openshift-gitops -- script: oc rollout restart statefulset.apps/openshift-gitops-application-controller -n openshift-gitops -- script: sleep 5 -timeout: 1200 -error: -- errors.yaml \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-assert.yaml deleted file mode 100644 index aca6c501ec1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-change-source-namespaces.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-change-source-namespaces.yaml deleted file mode 100644 index 91ae6075f58..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-change-source-namespaces.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - sourceNamespaces: \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-errors.yaml deleted file mode 100644 index 7163053f2de..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/08-errors.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - labels: - argocd.argoproj.io/managed-by-cluster-argocd: openshift-gitops - kubernetes.io/metadata.name: test-1-24-custom - name: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops_test-1-24-custom - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops_test-1-24-custom -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-delete.yaml deleted file mode 100644 index 8fdf9250483..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-errors.yaml deleted file mode 100644 index b7e1f72fdd5..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/99-errors.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/errors.yaml deleted file mode 100644 index afd97a9f3e8..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-083_validate_apps_in_any_namespace/errors.yaml +++ /dev/null @@ -1,86 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-24-custom - labels: - argocd.argoproj.io/managed-by: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-grafana - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-redis - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-application-controller - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-grafana - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-grafana -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-grafana - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-redis - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-redis -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-redis - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: openshift-gitops-argocd-server - namespace: test-1-24-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: openshift-gitops-argocd-server -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-assert.yaml deleted file mode 100644 index de34835b614..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-assert.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Disabling the test temporarily, refer to https://issues.redhat.com/browse/GITOPS-2650 - -# apiVersion: argoproj.io/v1alpha1 -# kind: ArgoCD -# metadata: -# name: openshift-gitops -# namespace: openshift-gitops -# status: -# phase: Available -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-redis -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-repo-server -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-server -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-applicationset-controller -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: StatefulSet -# metadata: -# name: openshift-gitops-application-controller -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml b/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml deleted file mode 100644 index 54917c48775..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# --- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: namespace-gitops-1672 -# labels: -# argocd.argoproj.io/managed-by: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml b/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml deleted file mode 100644 index 65592901a0d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml +++ /dev/null @@ -1,155 +0,0 @@ -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# commands: -# - script: | -# set -eou pipefail -# DIR="$(pwd)" - -# cleanup() { -# argocd logout "${api_server}" -# oc delete application app-kustomize -n openshift-gitops -# rm -rf $WORK_DIR -# } - -# WORK_DIR=`mktemp -d -p "$DIR"` - -# # check if tmp dir was created -# if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then -# echo "Could not create temp dir" -# exit 1 -# fi - -# trap cleanup INT TERM EXIT - -# # Login to apiserver -# api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") -# password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) -# output=$(argocd login $api_server --username admin --password $password --insecure) - -# # ensure namespace exists -# oc get ns namespace-gitops-1672 2>/dev/null || { -# oc new-project namespace-gitops-1672 -# oc label namespace namespace-gitops-1672 argocd.argoproj.io/managed-by=openshift-gitops -# } - -# # ensure template cleanup, if exists in namespace before we start tests -# oc delete template redis-template-gitops -n namespace-gitops-1672 --ignore-not-found=true - -# # Adding duplicate GVK to check prune functionality against issue #GITOPS-1672 -# cat > $WORK_DIR/app-template.yaml << EOF -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops -# annotations: -# description: "Description" -# iconClass: "icon-redis" -# tags: "database,nosql" -# objects: -# - apiVersion: v1 -# kind: Pod -# metadata: -# name: redis-master -# spec: -# containers: -# - env: -# - name: REDIS_PASSWORD -# value: xyz1234s -# image: dockerfile/redis -# name: master -# ports: -# - containerPort: 6379 -# protocol: TCP -# parameters: -# - description: Password used for Redis authentication -# from: '[A-Z0-9]{8}' -# generate: expression -# name: REDIS_PASSWORD -# labels: -# redis: master -# EOF - -# cat > $WORK_DIR/app-template2.yaml << EOF -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops2 -# annotations: -# description: "Description" -# iconClass: "icon-redis" -# tags: "database,nosql" -# objects: -# - apiVersion: v1 -# kind: Pod -# metadata: -# name: redis-master -# spec: -# containers: -# - env: -# - name: REDIS_PASSWORD -# value: xyz1234s -# image: dockerfile/redis -# name: master -# ports: -# - containerPort: 6379 -# protocol: TCP -# parameters: -# - description: Password used for Redis authentication -# from: '[A-Z0-9]{8}' -# generate: expression -# name: REDIS_PASSWORD -# labels: -# redis: master -# EOF - -# # create application.yaml -# cat </dev/null; then -# echo "Application listing failed" -# exit 1 -# fi - -# if ! argocd app sync app-kustomize --local $WORK_DIR --timeout 100 2>/dev/null; then -# echo "App didn't sync well with local flag" -# exit 1 -# fi - -# # Now delete resource from git source and try to resync back -# rm -rf $WORK_DIR/app-template.yaml - -# sleep 5 - -# # Now sync application with prune and PruneLast options enabled -# if ! argocd app sync app-kustomize --local $WORK_DIR --prune --timeout 100 2>/dev/null; then -# echo "App didn't prune or synced well with local flag" -# exit 1 -# fi - -# if oc get template redis-template-gitops -n namespace-gitops-1672 --no-headers 2>/dev/null; then -# echo "Templete is not pruned properly." -# exit 1 -# else -# echo "Test is successful, no templates found" -# exit 0 -# fi \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/03-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/03-errors.yaml deleted file mode 100644 index 74568964a2c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/03-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# --- -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops -# namespace: namespace-gitops-1672 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/04-delete.yaml b/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/04-delete.yaml deleted file mode 100644 index 27404363fae..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-084_validate_prune_templates/04-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# --- -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# delete: -# - apiVersion: v1 -# kind: Namespace -# name: namespace-gitops-1672 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml b/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml deleted file mode 100644 index 8c63a5a640f..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - - # Get CSV name and also OCP version. - csv_name=$(oc get csv -n openshift-gitops-operator | awk '/gitops-operator/ {print $1}') - ocp_version=$(oc version | awk '/Server Version/ {split($3,a,"-"); print a[1]}') - - if [[ ${ocp_version} =~ "4.15" ]]; then - exit 0 - fi - - # Patch the CSV to add the necessary env key:value for Dynamic Plugin - oc patch csv "${csv_name}" -n openshift-gitops-operator \ - --type='json' \ - -p='[{ - "op": "add", - "path": "/spec/install/spec/deployments/0/spec/template/spec/containers/0/env/-", - "value": { - "name": "DYNAMIC_PLUGIN_START_OCP_VERSION", - "value": "'${ocp_version}'" - } - }]' - - # Sleep 10 seconds, so the resources are launched before next assert step. - sleep 5 - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml deleted file mode 100644 index 300c60f485d..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gitops-plugin - namespace: openshift-gitops -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: httpd-cfg - namespace: openshift-gitops - labels: - app: gitops-plugin - app.kubernetes.io/part-of: gitops-plugin ---- -apiVersion: v1 -kind: Secret -metadata: - name: console-serving-cert - namespace: openshift-gitops ---- -apiVersion: v1 -kind: Service -metadata: - name: gitops-plugin - namespace: openshift-gitops -spec: - ports: - - name: tcp-9001 - port: 9001 - protocol: TCP - targetPort: 9001 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/01-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/01-assert.yaml deleted file mode 100644 index 090e14a457c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/01-assert.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: openshift-gitops - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: openshift-gitops -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: "" - scopes: '[groups]' ---- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-assert.yaml deleted file mode 100644 index 418157aad67..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-assert.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy - namespace: test-1-086-custom -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-empty - namespace: test-1-086-custom2 -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-admin - namespace: test-1-086-custom3 -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom -data: - policy.csv: "" - policy.default: role:readonly - scopes: '[groups]' ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy-empty - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom2 -data: - policy.csv: "" - policy.default: '' - scopes: '[groups]' ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy-admin - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom3 -data: - policy.csv: "" - policy.default: 'role:admin' - scopes: '[groups]' ---- diff --git a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-install.yaml deleted file mode 100644 index 1829d56f142..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-086_validate_default_argocd_role/02-install.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom3 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy - namespace: test-1-086-custom -spec: - sso: - verifyTLS: true - server: - route: - enabled: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-empty - namespace: test-1-086-custom2 -spec: - rbac: - defaultPolicy: '' - sso: - verifyTLS: true - server: - route: - enabled: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-admin - namespace: test-1-086-custom3 -spec: - rbac: - defaultPolicy: 'role:admin' - sso: - verifyTLS: true - server: - route: - enabled: true diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/01-add-label-selector.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/01-add-label-selector.yaml deleted file mode 100644 index aa334315614..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/01-add-label-selector.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to add label selector in argocd-operator - -# - script: | -# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager -# - script: sleep 30 -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}' - fi -- script: sleep 120 diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-errors.yaml deleted file mode 100644 index d40a8ae0f91..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-errors.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-install.yaml deleted file mode 100644 index fb628766e68..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/02-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-add-label.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-add-label.yaml deleted file mode 100644 index 79dfb0c9484..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-add-label.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the argocd instance with the label -- script: | - kubectl label argocd test1 foo=bar -n test-argocd - -- script: sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-assert.yaml deleted file mode 100644 index 3e60734cb73..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/03-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available ---- \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-assert.yaml deleted file mode 100644 index 14256ec7b28..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-assert.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-install.yaml deleted file mode 100644 index 9bbcca51ec1..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/04-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/05-remove-label.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/05-remove-label.yaml deleted file mode 100644 index 4ef30373835..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/05-remove-label.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the argocd instance by removing the label -- script: | - kubectl label argocd test1 foo- -n test-argocd -- script: sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-assert.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-assert.yaml deleted file mode 100644 index 0fbedd777c9..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-errors.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-errors.yaml deleted file mode 100644 index d3116edd134..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-errors.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[people]' \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-install.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-install.yaml deleted file mode 100644 index 989a1b0cf6c..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/06-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - scopes: '[people]' diff --git a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml b/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml deleted file mode 100644 index 8f467e0264b..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to remove label-selector from argocd-operator -# - script: | -# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager -# - script: sleep 30 - -- script: | - if ! [ -z $NON_OLM ]; then - - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - fi -- script: sleep 120 \ No newline at end of file diff --git a/test/openshift/e2e/ignore-tests/sequential/kuttl-test.yaml b/test/openshift/e2e/ignore-tests/sequential/kuttl-test.yaml deleted file mode 100644 index aa2259170fe..00000000000 --- a/test/openshift/e2e/ignore-tests/sequential/kuttl-test.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestSuite -name: gitops-operator-e2e -testDirs: - - . -suppress: - - events -timeout: 720 -parallel: 1 -reportFormat: JSON -reportName: openshift-gitops-e2e diff --git a/test/openshift/e2e/parallel/1-003_validate_console_link/01-assert.yaml b/test/openshift/e2e/parallel/1-003_validate_console_link/01-assert.yaml deleted file mode 100644 index a45cca6dae1..00000000000 --- a/test/openshift/e2e/parallel/1-003_validate_console_link/01-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Check that our console link is installed correctly -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd -spec: - location: ApplicationMenu - text: Cluster Argo CD diff --git a/test/openshift/e2e/parallel/1-003_validate_console_link/01-check-console-link.yaml b/test/openshift/e2e/parallel/1-003_validate_console_link/01-check-console-link.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/01-assert.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/01-assert.yaml deleted file mode 100644 index 6e489fbc9a3..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/01-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -status: - phase: Available - applicationSetController: Running - server: Running ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-server -spec: - to: - kind: Service - name: example-server - weight: 100 - tls: - insecureEdgeTerminationPolicy: Redirect - termination: reencrypt ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-applicationset-controller-webhook -spec: - to: - kind: Service - name: example-applicationset-controller - weight: 100 - tls: - termination: edge - insecureEdgeTerminationPolicy: Redirect diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/01-install.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/01-install.yaml deleted file mode 100644 index 8dd4cb5b2ce..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -spec: - server: - route: - enabled: true - applicationSet: - enabled: true - webhookServer: - host: example.com - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/02-assert.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/02-assert.yaml deleted file mode 100644 index 4ae649f0e0e..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/02-assert.yaml +++ /dev/null @@ -1,168 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -status: - phase: Available - applicationSetController: Running - server: Running ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-server -spec: - to: - kind: Service - name: example-server - weight: 100 - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-applicationset-controller-webhook -spec: - to: - kind: Service - name: example-applicationset-controller - weight: 100 - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/02-embedded-tls-data.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/02-embedded-tls-data.yaml deleted file mode 100644 index 19ea5f180b2..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/02-embedded-tls-data.yaml +++ /dev/null @@ -1,154 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -spec: - server: - route: - enabled: true - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- - applicationSet: - enabled: true - webhookServer: - host: example.com - route: - enabled: true - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/03-assert.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/03-assert.yaml deleted file mode 100644 index accab332a97..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/03-assert.yaml +++ /dev/null @@ -1,206 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -status: - phase: Available - applicationSetController: Running - server: Running ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-server -spec: - to: - kind: Service - name: example-server - weight: 100 - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - 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 - UVwpFuaKz5vTCD36Gmmy/u8y - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - Xq+NinfrqOLJkIZ/u/PJu4KqN3M= - -----END PRIVATE KEY----- ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-applicationset-controller-webhook -spec: - to: - kind: Service - name: example-applicationset-controller - weight: 100 - tls: - termination: reencrypt - certificate: |- - -----BEGIN CERTIFICATE----- - MIIFrjCCA5agAwIBAgIUbM9O0W6IdumLQodDCDqyckYDr2IwDQYJKoZIhvcNAQEL - BQAwTTELMAkGA1UEBhMCVVMxDTALBgNVBAgMBFRlc3QxDTALBgNVBAoMBFRlc3Qx - DTALBgNVBAsMBFRlc3QxETAPBgNVBAMMCHRlc3QuY29tMCAXDTIzMTEyNjIyMTg0 - N1oYDzIxMjMxMTI3MjIxODQ3WjBNMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVGVz - dDENMAsGA1UECgwEVGVzdDENMAsGA1UECwwEVGVzdDERMA8GA1UEAwwIdGVzdC5j - b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDbgAmnUjFux9u2Xzhi - mno5zjA/YsoXr3eFtK9XtByQMLLyT0hbXoa9gpTeafOs3IkCotPdN+omxm2tN9UA - ebAq+EamWyIF28EA3UbCWWULghveezrmAKSMcqQqby3knbcbGng+ZZjRdC3xc0uz - /sd4FqaLt0UHBDMlpxRskj/S3CDetfyIrKYQcZ5NQjx75aRN8At5OPC1NiWTmlsv - ppa4LLV0HR6AJzq+C6RAmJTcHQOFAq33wZEHHIpoQoGWHHPpT0ut54KIiVTRJ2o4 - MEV4KlBBgL3ux4+v7R0RfVmzgaMEDG1fC9tX8pIofv7wP7WX/5XHTjyAiv8gbpUW - nLiU8FoTDZWxZN+MiCkUvZl8KqotbcUPjhnRdnq4anFwywY1lKILnCIayqzI7mPW - 12h39fNwprFz9YFYbLLoQHekir2nLw8ZH83nNyD82YQ3EFm7UnOld6zw/8aURRuQ - C0oOEHyAXsvIyaWAb6lWvplDdCUGQWWr7MVp5YPPhWdtAv7B4QLDUNHGQMU/1Qrq - VBH22lcU7XrCh6GXrRVm+gF7kAuJzkuae0txvk9mHc+8Y0C4/i9C3xU2qHjWcElw - etcHbqOZjDtC8+n8mDD4hDYEMGV54VhXCKwoFLneT2no27S3SVPvNbMfyyNuUa2i - 5azKnIf439Cmfww7ImxIpOR5nQIDAQABo4GDMIGAMB0GA1UdDgQWBBQfe95iWKlT - K6BGFov9JFXQTQN0ZjAfBgNVHSMEGDAWgBQfe95iWKlTK6BGFov9JFXQTQN0ZjAP - BgNVHRMBAf8EBTADAQH/MC0GA1UdEQQmMCSCB3dlYmhvb2uCDndlYmhvb2stc2Vy - dmVygglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggIBAH7Vv+Iar1UbF41c9I88 - oIu8iWfLVnAfe/64tULy77x4nfEQiukBJDoZ9m19KEVdPqsFzT6lFB7Fu1oc9A28 - 5b1+PEynHcopNK41zF4n4FnIy9h8zJfaPYYCPPMT0v9LzuT5zyF5sXCz0o4KwQJ6 - zrggZme8udl9sWyDxZyFoFPLWtnQFY7vJ9LSM2Gt+XUIuYNwDkvGFs6RfBYJGarX - qq7YHYj0H2x/us3KQCXGX5GzSmM9ewHvaScRpFcCdVwszKwWF0vMvdnh+3P72/Yy - dQvZXyfNiwqaIdznJn/AjzR9K4dHfbY7wMm83WHwWyjzV6CybHbtWpoUIlZtW3TT - gz6MP2z+BhOdMiQA33aO38J2TX/CMkEvkagEiZdS9t3xtpF2LOb5bRIdlENtZU0i - LnhgWEpJmswxBtuJ0d/zcyUlvK7FYoJZB7pT3YX/321HXZVCKyw+xrinwQoI3RnX - 7u0TZ3MqtSKEwCyDWYRJDbs6XUX1G0q7jXBf1+3cd+lBdOZ4Kl5B4YSU9hcFxAuO - 4a1eFXBdmT8PnwoTizFvag3IgBXkf8PqcKNvSMU6UKcD5LYTwRGK3JVl1L79gkrb - LmWEfOXFHgSlMIZkEs41TiopXy8p/LSera8NR86Q3mTZ7rRdEveOb6ZLJksRqaqr - UVwpFuaKz5vTCD36Gmmy/u8y - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - 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 - Xq+NinfrqOLJkIZ/u/PJu4KqN3M= - -----END PRIVATE KEY----- \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/03-secret-tls-data.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/03-secret-tls-data.yaml deleted file mode 100644 index 08a91b14990..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/03-secret-tls-data.yaml +++ /dev/null @@ -1,116 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -spec: - server: - route: - enabled: true - tls: - externalCertificate: - name: tls-data-secret - termination: reencrypt - applicationSet: - enabled: true - webhookServer: - host: example.com - route: - enabled: true - tls: - externalCertificate: - name: tls-data-secret - termination: reencrypt ---- -apiVersion: v1 -kind: Secret -metadata: - name: tls-data-secret -type: kubernetes.io/tls -stringData: - tls.crt: |- - -----BEGIN CERTIFICATE----- - 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 - UVwpFuaKz5vTCD36Gmmy/u8y - -----END CERTIFICATE----- - tls.key: |- - -----BEGIN PRIVATE KEY----- - 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 - Xq+NinfrqOLJkIZ/u/PJu4KqN3M= - -----END PRIVATE KEY----- \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/04-assert.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/04-assert.yaml deleted file mode 100644 index 281015a8e9d..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/04-assert.yaml +++ /dev/null @@ -1,170 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: example -status: - phase: Available - applicationSetController: Running - server: Running ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-server -spec: - to: - kind: Service - name: example-server - weight: 100 - tls: - termination: reencrypt - # latest data from secret - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQCVLr/pzu0tNvgR - 6Oc5FYPyMFDUqkIbICntw487JiEnLa8zYK7VD6sWFNFwz1yEv7+MK7V62145RGlY - KU06Krfw0SEx/yPRWcxUEUFimxsdIN2h/yxSRx4seCgjD8xHMpF22t8yamXouDXi - e8pv2eYP4CYxjhNkg1STe2APaVihIH//kwerj5BHIDXPvKxSm8EOtyIajpx2atJh - Wk/w1kFFmKizWThyIl4yBC4xnkY85sZU0HfYVqwvhT9Xzs/QIaZ8PKCfsBKTFEqb - AHdxRWFA2Vv24948Fi091rZk23eXoaXhP8zObcMuK2V80+N/n7Dv57NmA8bEoro6 - 7cJvwK+ZPOktl05Fq6On/7fzJXXCBs1GZtpUkWnF9W6yITa8h1NmclbBCiW0uP+z - f8B06oXLUmZSUV5H4z4iAtih1WJ4DwLSfn0pnVC3e6yFnGsbK6Z8qM1ac2JuVPF0 - Rpv6Y9hRR1Sj3UgaKNhq5FTMoaFN/mIhZ6Oe8DW65vUTszCB4YcCAwEAAQKCAYBJ - 9tTF6odjTIav8oZ5ofY6ZMQevI9r/YVsUfI4xE3Zq+falEv6bPtJRmcVBGp9ksg4 - ig8/a3YK9KU6Rbf5Z+as6jMII9SxXlFVOPzvE7HcvkfEosxpusL2D1jvEU0Z27ON - dzUEPQZr3LEyqmeTDzjmlB67oRJyWj7bpGbbHUMJGCD+KPq7j8Fb0ld7uLLDfl+4 - mQm6mwxuFcZa6DkMUl4oUGkMCudWhz2mlLYGec+fMFgTAwz4YPib0ve15F7adWPh - EYqE8cqz3p1r2b9O6MNu0GTK16+388AFVSULImag/525pddohZgPHU8BJAKffGL6 - XCCfQrQBbe6geYsNANx8E34M3fbmkeby41oLY8v8PJOMHvoDREqD7tgqlPgozlD0 - BXlDaxTYLAwbyK+jARvQT60a4V744MMhsJ57GMC69R/YDW7Qbd4hiD3P4XEmqHBz - a/dhsNsJylgTMLFOIr4RnH/82yXyG3J0WTtZP+kRxq1aHaTduSif1SQkFqhr+MkC - gcEAxxmX9UAChk+DuOPsYYtx+kl/0aR8B5tvVQRQDxfij0Km9nXEyTsRE34sFlAk - RxgVUb+DjARPn5OuST/v3HHemGUU2x/L5BYYgtn9waI6vpTA3lllPzTYIr6aZfkb - yaX6UbHk5C9af/0F+xq4pNoSpcafdrE5dJ9JyM/20Q3DRxCN+RY2alezO/UCe0Sf - 3OH7Qk2RYgbP1lADV/58oqGpU079N1M4yt6ziyltPC8y/laGOAA00ZGFBPzySs2J - 3yXbAoHBAL/RI4s2WsX8ERaa/GXo85q0/LK2Wq8LICm/jxrMAZrVK1u9kSEKgps2 - pGV9hE73y7gBgstrfrUKghSsqwtIwQCXVYFKEzu4l2fojukJ13eCR7YSBqGTM3Jn - PhyjvxoAcmBsKjkoaXAt5+6DtuTVlQmElJB1s/A8us6rwy2GaXAWTHhNGJ5xuSAd - h3nW1Bsg84f5J6Vx0mnW85kAipB16LZFKUSqHpWYZ+Qe9yT0+iS0Fexz/dHmX4WA - eBZ0rulAxQKBwAutkKAt9PfzygIaPE8sYq8PiJO/VhcMIueVrSx1djB49FoYZkZ3 - VHUUPXnBkZ8p5nY5CXo49oKhouNhAKypcSj3JNYFc2wZb66dIqks3s025GkmTS37 - 54GCNIQurFaTia8pBAfuTxyatrMXyiTBNb7Le6b2liwk+6rvp8ZzTDTq36jwiJiM - NFMb991LFSVbi+VDr3dUdvRXFRsgLidL3Caqx2drVjVwAo/zChkxm4gXgx/dwztX - kbnNLFj+3UtdaQKBwBfHGRzctAvu3z9qHveTFP+Mh/avXDZurqH+OQMdXuWOnz1U - FnV+FAqhj2d1U71mQj6hEVGeFarjjpR5gwp3DlXAbL0GLbQtgbdDwNNqgOczoygS - u/ezg6Ee4zgxpDLY81S4k9NaCxf42NNcSIO9Zigz4ya1MIULQiz0ZdFy5Acc/IW9 - KNwbRNOSVYTo+IoUX5vvata7cVXla3T/+C1IMHzHvgHhBMGOjvJcVE6kf42lNUKG - bmRiplyqPDisZjJL8QKBwQCupVWTNeEy0YZ+7mwyJZ1DLURRlgUOKx7LhkO1MDn4 - YyjJrDm1Ne3XjNXq/wjaQX5KuUdkXoqAp1emo2nKGqqVjwSkWX6ordO6mLYhGDiA - vDydisaLX4I8x6NZFIabzqpZbmf6pWlxXVsEptXdAeALpxNZ/r/P34UOgF/g5jZB - /r8qFYC5HnDCY72bY52UXON3ktVmhC7PK3JNmruJgunEfC/yOk8YB9Eks7+3+9SR - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-applicationset-controller-webhook -spec: - to: - kind: Service - name: example-applicationset-controller - weight: 100 - tls: - termination: reencrypt - # latest data from secret - certificate: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - key: |- - -----BEGIN PRIVATE KEY----- - MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQCVLr/pzu0tNvgR - 6Oc5FYPyMFDUqkIbICntw487JiEnLa8zYK7VD6sWFNFwz1yEv7+MK7V62145RGlY - KU06Krfw0SEx/yPRWcxUEUFimxsdIN2h/yxSRx4seCgjD8xHMpF22t8yamXouDXi - e8pv2eYP4CYxjhNkg1STe2APaVihIH//kwerj5BHIDXPvKxSm8EOtyIajpx2atJh - Wk/w1kFFmKizWThyIl4yBC4xnkY85sZU0HfYVqwvhT9Xzs/QIaZ8PKCfsBKTFEqb - AHdxRWFA2Vv24948Fi091rZk23eXoaXhP8zObcMuK2V80+N/n7Dv57NmA8bEoro6 - 7cJvwK+ZPOktl05Fq6On/7fzJXXCBs1GZtpUkWnF9W6yITa8h1NmclbBCiW0uP+z - f8B06oXLUmZSUV5H4z4iAtih1WJ4DwLSfn0pnVC3e6yFnGsbK6Z8qM1ac2JuVPF0 - Rpv6Y9hRR1Sj3UgaKNhq5FTMoaFN/mIhZ6Oe8DW65vUTszCB4YcCAwEAAQKCAYBJ - 9tTF6odjTIav8oZ5ofY6ZMQevI9r/YVsUfI4xE3Zq+falEv6bPtJRmcVBGp9ksg4 - ig8/a3YK9KU6Rbf5Z+as6jMII9SxXlFVOPzvE7HcvkfEosxpusL2D1jvEU0Z27ON - dzUEPQZr3LEyqmeTDzjmlB67oRJyWj7bpGbbHUMJGCD+KPq7j8Fb0ld7uLLDfl+4 - mQm6mwxuFcZa6DkMUl4oUGkMCudWhz2mlLYGec+fMFgTAwz4YPib0ve15F7adWPh - EYqE8cqz3p1r2b9O6MNu0GTK16+388AFVSULImag/525pddohZgPHU8BJAKffGL6 - XCCfQrQBbe6geYsNANx8E34M3fbmkeby41oLY8v8PJOMHvoDREqD7tgqlPgozlD0 - BXlDaxTYLAwbyK+jARvQT60a4V744MMhsJ57GMC69R/YDW7Qbd4hiD3P4XEmqHBz - a/dhsNsJylgTMLFOIr4RnH/82yXyG3J0WTtZP+kRxq1aHaTduSif1SQkFqhr+MkC - gcEAxxmX9UAChk+DuOPsYYtx+kl/0aR8B5tvVQRQDxfij0Km9nXEyTsRE34sFlAk - RxgVUb+DjARPn5OuST/v3HHemGUU2x/L5BYYgtn9waI6vpTA3lllPzTYIr6aZfkb - yaX6UbHk5C9af/0F+xq4pNoSpcafdrE5dJ9JyM/20Q3DRxCN+RY2alezO/UCe0Sf - 3OH7Qk2RYgbP1lADV/58oqGpU079N1M4yt6ziyltPC8y/laGOAA00ZGFBPzySs2J - 3yXbAoHBAL/RI4s2WsX8ERaa/GXo85q0/LK2Wq8LICm/jxrMAZrVK1u9kSEKgps2 - pGV9hE73y7gBgstrfrUKghSsqwtIwQCXVYFKEzu4l2fojukJ13eCR7YSBqGTM3Jn - PhyjvxoAcmBsKjkoaXAt5+6DtuTVlQmElJB1s/A8us6rwy2GaXAWTHhNGJ5xuSAd - h3nW1Bsg84f5J6Vx0mnW85kAipB16LZFKUSqHpWYZ+Qe9yT0+iS0Fexz/dHmX4WA - eBZ0rulAxQKBwAutkKAt9PfzygIaPE8sYq8PiJO/VhcMIueVrSx1djB49FoYZkZ3 - VHUUPXnBkZ8p5nY5CXo49oKhouNhAKypcSj3JNYFc2wZb66dIqks3s025GkmTS37 - 54GCNIQurFaTia8pBAfuTxyatrMXyiTBNb7Le6b2liwk+6rvp8ZzTDTq36jwiJiM - NFMb991LFSVbi+VDr3dUdvRXFRsgLidL3Caqx2drVjVwAo/zChkxm4gXgx/dwztX - kbnNLFj+3UtdaQKBwBfHGRzctAvu3z9qHveTFP+Mh/avXDZurqH+OQMdXuWOnz1U - FnV+FAqhj2d1U71mQj6hEVGeFarjjpR5gwp3DlXAbL0GLbQtgbdDwNNqgOczoygS - u/ezg6Ee4zgxpDLY81S4k9NaCxf42NNcSIO9Zigz4ya1MIULQiz0ZdFy5Acc/IW9 - KNwbRNOSVYTo+IoUX5vvata7cVXla3T/+C1IMHzHvgHhBMGOjvJcVE6kf42lNUKG - bmRiplyqPDisZjJL8QKBwQCupVWTNeEy0YZ+7mwyJZ1DLURRlgUOKx7LhkO1MDn4 - YyjJrDm1Ne3XjNXq/wjaQX5KuUdkXoqAp1emo2nKGqqVjwSkWX6ordO6mLYhGDiA - vDydisaLX4I8x6NZFIabzqpZbmf6pWlxXVsEptXdAeALpxNZ/r/P34UOgF/g5jZB - /r8qFYC5HnDCY72bY52UXON3ktVmhC7PK3JNmruJgunEfC/yOk8YB9Eks7+3+9SR - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-005_validate_route_tls/04-update-secret-tls-data.yaml b/test/openshift/e2e/parallel/1-005_validate_route_tls/04-update-secret-tls-data.yaml deleted file mode 100644 index 47f0599cd7c..00000000000 --- a/test/openshift/e2e/parallel/1-005_validate_route_tls/04-update-secret-tls-data.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: tls-data-secret -type: kubernetes.io/tls -stringData: - tls.crt: |- - -----BEGIN CERTIFICATE----- - MIIEbTCCAtWgAwIBAgIUA80/UfgNcx8tYz/XXlo6X8DJzXQwDQYJKoZIhvcNAQEL - BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM - GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yNDA5MjUwNDM4MjdaGA8yMTIz - MDQyMDA0MzgyN1owRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx - ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAaIwDQYJKoZIhvcN - AQEBBQADggGPADCCAYoCggGBAJUuv+nO7S02+BHo5zkVg/IwUNSqQhsgKe3Djzsm - ISctrzNgrtUPqxYU0XDPXIS/v4wrtXrbXjlEaVgpTToqt/DRITH/I9FZzFQRQWKb - Gx0g3aH/LFJHHix4KCMPzEcykXba3zJqZei4NeJ7ym/Z5g/gJjGOE2SDVJN7YA9p - WKEgf/+TB6uPkEcgNc+8rFKbwQ63IhqOnHZq0mFaT/DWQUWYqLNZOHIiXjIELjGe - RjzmxlTQd9hWrC+FP1fOz9Ahpnw8oJ+wEpMUSpsAd3FFYUDZW/bj3jwWLT3WtmTb - d5ehpeE/zM5twy4rZXzT43+fsO/ns2YDxsSiujrtwm/Ar5k86S2XTkWro6f/t/Ml - dcIGzUZm2lSRacX1brIhNryHU2ZyVsEKJbS4/7N/wHTqhctSZlJRXkfjPiIC2KHV - YngPAtJ+fSmdULd7rIWcaxsrpnyozVpzYm5U8XRGm/pj2FFHVKPdSBoo2GrkVMyh - oU3+YiFno57wNbrm9ROzMIHhhwIDAQABo1MwUTAdBgNVHQ4EFgQUTbU3O3JsKBC6 - jCLjxTX4zWEAgc8wHwYDVR0jBBgwFoAUTbU3O3JsKBC6jCLjxTX4zWEAgc8wDwYD - VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAYEAMthyYhEUf5GdrKSMBuWR - +QlsBau/6N2nSxRxM2g4oexQOGUny1r76KrW6o/2V/PYyz/3WgOgSB/4sZxNoeu8 - rsjY9sp/bCWJ6jEmhm2kkVeb3Arix0iNt7BviOCjoVchc31R20JLP0a6WK+KtiV2 - C8qbuOQEkVWY/NVy+buHKqJjNZXyj8ADX0It8rAmaEGMEGkEFtYTnjEYHdkPWfYx - 6P9C12PrZySu9+L3eGmylKeDU7dWvBAONbHfHL8W/8pxG1CwObfkTEpzVTlR0SfI - W1dZ9YXb7S5F/0j6GLeUSgvnQZxH4rbc699wC9Y/kt5EozT1xvmKgZ6G6vaU2Mhb - jZnrbB4swXCVf98HDAy8PWrn7BWky9G8SbM5kS6Mj9pQwZnnfF6VLg+uWBBjMh7g - 0Ntf+Lv/IC5v+jC7TDKRPCAUGYzBRLMbT0WvK0BVXhp6swCi4qtME/BTsqXA6zzk - 5PfEh1b+yuqxbF3bU8rII1LIsXxr96lssl+H0HxPpQKv - -----END CERTIFICATE----- - tls.key: |- - -----BEGIN PRIVATE KEY----- - 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 - HkXkOt1cAbJWZruf4j13X4s= - -----END PRIVATE KEY----- ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 diff --git a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml b/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml deleted file mode 100644 index 2d916d7dcd2..00000000000 --- a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-assert.yaml +++ /dev/null @@ -1,63 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-ca ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-cluster ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-default-cluster-config ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-secret ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-tls ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - replicas: 1 - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - replicas: 1 - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-install.yaml b/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-install.yaml deleted file mode 100644 index 5328adc148f..00000000000 --- a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml b/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml deleted file mode 100644 index f86fa5f6ea5..00000000000 --- a/test/openshift/e2e/parallel/1-007_validate_namespace_scoped_install/02-check-cluster-secret.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This test step ensures that the cluster secret only contains the installation -# namespace after managed-by label has been removed from other-managed-namespace -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml deleted file mode 100644 index 67687481121..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-8-custom -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml deleted file mode 100644 index a7071a2d4ee..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-8-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-8-custom -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml deleted file mode 100644 index 846415fad75..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-8-custom" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml deleted file mode 100644 index f4303c51f84..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-custom-argocd - namespace: test-1-8-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml deleted file mode 100644 index bdffa177675..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/03-create-app.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: validate-custom-argocd - namespace: test-1-8-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-8-custom - syncPolicy: - automated: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml b/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml deleted file mode 100644 index 7b413d0e34f..00000000000 --- a/test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-8-custom \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-assert.yaml deleted file mode 100644 index a0c2c14377a..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Wait for the Operator to become available -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-install.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-install.yaml deleted file mode 100644 index 7da3b15acc1..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/01-install.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-assert.yaml deleted file mode 100644 index ce3a825e3a0..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-12-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml deleted file mode 100644 index 081a978eee7..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/02-label-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Label the namespace that we want to manage -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-12-custom argocd.argoproj.io/managed-by=$NAMESPACE --overwrite \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml deleted file mode 100644 index 7d05b0c2fcf..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/03-check-secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$NAMESPACE,test-1-12-custom"; then - echo "Assertion for cluster secret failed!" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-assert.yaml deleted file mode 100644 index 5e69a1e8c6e..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-create-application.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-create-application.yaml deleted file mode 100644 index 24221e83076..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/04-create-application.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom - syncPolicy: - automated: {} diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-assert.yaml deleted file mode 100644 index 0155f0a04e0..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# We need all of the following roles in the namespace that we want to manage -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom2 ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-12-custom2 ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-12-custom2 -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml deleted file mode 100644 index efc7c706135..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/07-label-namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Label the namespace that we want to manage -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: kubectl label ns test-1-12-custom2 argocd.argoproj.io/managed-by=$NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-assert.yaml deleted file mode 100644 index cf974611f8c..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-create-application.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-create-application.yaml deleted file mode 100644 index 6d16600f298..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/08-create-application.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# This creates an application with a destination in the other managed namespace -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom2 - syncPolicy: - automated: {} diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml deleted file mode 100644 index 6b0dfd87a4d..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/09-delete-app-and-namespace.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: test-1-12-custom -- apiVersion: argoproj.io/v1alpha1 - kind: Application - name: test-1-12-custom2 -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom -command: -- shell: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml deleted file mode 100644 index 28710575ead..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/10-check-secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# This test step ensures that the cluster secret only contains the installation -# namespace after managed-by label has been removed from other-managed-namespace -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - should="$NAMESPACE,test-1-12-custom2" - namespaces=$(oc get secret -n $NAMESPACE argocd-default-cluster-config -o jsonpath='{.data.namespaces}' | base64 -d) - if test "$namespaces" != "$should"; then - echo "Assertion for cluster secret failed! '$namespaces' != '$should'" - # 1.2.0 doesn't reconcile the cluster secret on namespace deletion - if test GITOPS_TARGET_VERSION = "1.2.0"; then - exit 0 - else - exit 1 - fi - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-assert.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-assert.yaml deleted file mode 100644 index 360366f6dc0..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -status: - health: - status: Missing - sync: - status: Unknown ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -status: - health: - status: Healthy - sync: - status: Synced diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml deleted file mode 100644 index df3c4e93d5a..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/11-recreate-applications.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-12-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom - syncPolicy: - automated: {} - retry: - limit: 5 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-12-custom2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: test-1-12-custom2 - syncPolicy: - automated: {} - retry: - limit: 5 diff --git a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/99-delete.yaml b/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/99-delete.yaml deleted file mode 100644 index 1878fffbf6f..00000000000 --- a/test/openshift/e2e/parallel/1-012_validate-managed-by-chain/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom -- apiVersion: v1 - kind: Namespace - name: test-1-12-custom2 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml b/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml deleted file mode 100644 index 179b13c30cc..00000000000 --- a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml +++ /dev/null @@ -1,161 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/server/tls - name: argocd-repo-server-tls - - mountPath: /app/config/server/tls/redis - name: argocd-operator-redis-tls - - mountPath: /home/argocd - name: plugins-home - - mountPath: /home/argocd/params - name: argocd-cmd-params-cm - - mountPath: /tmp - name: tmp - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls - - emptyDir: {} - name: plugins-home - - configMap: - defaultMode: 420 - optional: true - items: - - key: server.profile.enabled - path: profiler.enabled - name: argocd-cmd-params-cm - name: argocd-cmd-params-cm - - emptyDir: {} - name: tmp ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/gpg/source - name: gpg-keys - - mountPath: /app/config/gpg/keys - name: gpg-keyring - - mountPath: /app/config/reposerver/tls - name: argocd-repo-server-tls - - mountPath: /app/config/reposerver/tls/redis - name: argocd-operator-redis-tls - - mountPath: /home/argocd/cmp-server/plugins - name: plugins - - mountPath: /tmp - name: tmp - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - configMap: - defaultMode: 420 - name: argocd-gpg-keys-cm - name: gpg-keys - - emptyDir: {} - name: gpg-keyring - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls - - emptyDir: {} - name: var-files - - emptyDir: {} - name: plugins - - emptyDir: {} - name: tmp ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -spec: - template: - spec: - containers: - - volumeMounts: - - mountPath: /app/config/controller/tls - name: argocd-repo-server-tls - - mountPath: /app/config/controller/tls/redis - name: argocd-operator-redis-tls - - mountPath: /home/argocd - name: argocd-home - - mountPath: /home/argocd/params - name: argocd-cmd-params-cm - - mountPath: /tmp - name: argocd-application-controller-tmp - volumes: - - name: argocd-repo-server-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-repo-server-tls - - name: argocd-operator-redis-tls - secret: - defaultMode: 420 - optional: true - secretName: argocd-operator-redis-tls - - emptyDir: {} - name: argocd-home - - configMap: - defaultMode: 420 - items: - - key: controller.profile.enabled - path: profiler.enabled - name: argocd-cmd-params-cm - optional: true - name: argocd-cmd-params-cm - - emptyDir: {} - name: argocd-application-controller-tmp \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-install.yaml b/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-install.yaml deleted file mode 100644 index 3a5fad3053c..00000000000 --- a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-install.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-assert.yaml b/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-assert.yaml deleted file mode 100644 index 2bdfda83942..00000000000 --- a/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-redis-ha -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-redis-ha -subjects: -- kind: ServiceAccount - name: argocd-argocd-redis-ha ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server diff --git a/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-install.yaml b/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-021_validate_rolebindings/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-assert.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-assert.yaml deleted file mode 100644 index bbcf745c508..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-repo-server-tls - namespace: test-1-23-custom \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-install.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-install.yaml deleted file mode 100644 index 13792d7ece9..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/01-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-23-custom ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -spec: - repo: - autotls: "openshift" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-assert.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-assert.yaml deleted file mode 100644 index 239bd85a7ce..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server - namespace: test-1-23-custom -spec: - template: - spec: - containers: - - command: - - argocd-server - - --repo-server-strict-tls - - --staticassets - - /shared/app - - --dex-server - - https://argocd-dex-server.test-1-23-custom.svc.cluster.local:5556 - - --repo-server - - argocd-repo-server.test-1-23-custom.svc.cluster.local:8081 - - --redis - - argocd-redis.test-1-23-custom.svc.cluster.local:6379 - - --loglevel - - info - - --logformat - - text diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml deleted file mode 100644 index 01d9a85461c..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/02-change-argocd.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-23-custom -spec: - repo: - autotls: "openshift" - verifytls: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml deleted file mode 100644 index e35f2e928e6..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/03-check-workloads.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 5 -- script: | - oc -n test-1-23-custom get deployment argocd-server \ - -o jsonpath='{.spec.template.spec.containers[0].command}' \ - | jq -r | grep -- '--repo-server-strict-tls' \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-assert.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-assert.yaml deleted file mode 100644 index d68eef3cde0..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-23-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-install-app.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-install-app.yaml deleted file mode 100644 index 699f91d19a9..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/04-install-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-23-custom -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-23-custom - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/99-delete.yaml b/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/99-delete.yaml deleted file mode 100644 index 773ec274f3b..00000000000 --- a/test/openshift/e2e/parallel/1-023_validate_repo_server_tls/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-23-custom \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-assert.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-assert.yaml deleted file mode 100644 index a0d7cd2bf30..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo1 -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo2 -status: - phase: Available diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-install.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-install.yaml deleted file mode 100644 index d48bb9e91f0..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/01-install.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-target - labels: - argocd.argoproj.io/managed-by: test-1-25-argo1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-argo1 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-argo2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo1 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-25-argo2 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-assert.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-assert.yaml deleted file mode 100644 index b0d0592ff6e..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-install-app.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-install-app.yaml deleted file mode 100644 index 253fd3cd787..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-install-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-25-target - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-wait.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-wait.yaml deleted file mode 100644 index a4383b200b7..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-25-argo1" - wait_until_pods_running "test-1-25-argo2" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-assert.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-assert.yaml deleted file mode 100644 index 78c233c9ec6..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 -status: - health: - status: Missing - sync: - status: Unknown ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo2 -status: - health: - status: Healthy - sync: - status: Synced - \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml deleted file mode 100644 index 9fc16d4d1a2..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/03-update-namespace.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-25-target - labels: - argocd.argoproj.io/managed-by: test-1-25-argo2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo1 - annotations: - argocd.argoproj.io/refresh: hard ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: test-1-25-argo2 -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: ./test/examples/nginx - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: test-1-25-target - syncPolicy: - automated: {} - retry: - limit: 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/99-delete.yaml b/test/openshift/e2e/parallel/1-025-validate-managed-by-change/99-delete.yaml deleted file mode 100644 index 4ecf4af0aad..00000000000 --- a/test/openshift/e2e/parallel/1-025-validate-managed-by-change/99-delete.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-25-target -- apiVersion: v1 - kind: Namespace - name: test-1-25-argo1 -- apiVersion: v1 - kind: Namespace - name: test-1-25-argo2 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml deleted file mode 100644 index 83faeebaa39..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-tls \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml deleted file mode 100644 index bd9c6419927..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - observedGeneration: 1 - availableReplicas: 1 - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml deleted file mode 100644 index f6f74f2471c..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/02-create-tls-secret.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - openssl req -x509 -newkey rsa:4096 -keyout /tmp/test-029-key.pem -out /tmp/test-029-cert.pem -subj '/CN=test-029-cert' -days 365 -nodes - cert=$(cat /tmp/test-029-cert.pem | base64 -w 0) - key=$(cat /tmp/test-029-key.pem | base64 -w 0) - # Dirty hack to replace argocd-tls - cat <<_EOF_ | oc replace -n $NAMESPACE secret argocd-tls -f - - apiVersion: v1 - kind: Secret - type: kubernetes.io/tls - metadata: - name: argocd-tls - namespace: $NAMESPACE - data: - tls.key: $key - tls.crt: $cert - _EOF_ - diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml deleted file mode 100644 index 19fe90ae150..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# This makes sure that we still have the first generation of the deployment, -# and that no rollout is pending right now. -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - observedGeneration: 1 - availableReplicas: 1 - replicas: 1 - readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml b/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml deleted file mode 100644 index 90d3be98f2c..00000000000 --- a/test/openshift/e2e/parallel/1-029_validate_tls_secret_no_scale/03-sleep-and-recheck.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-assert.yaml b/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-assert.yaml deleted file mode 100644 index e6d765ba9c2..00000000000 --- a/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-30-argo1 -status: - phase: Available ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: argocd-server - namespace: test-1-30-argo1 -spec: - port: - targetPort: https - tls: - insecureEdgeTerminationPolicy: Redirect - termination: reencrypt - to: - kind: Service - name: argocd-server - weight: 100 -status: - ingress: - - conditions: - - status: "True" - type: Admitted ---- -apiVersion: v1 -kind: Secret -metadata: - name: argocd-server-tls - namespace: test-1-30-argo1 diff --git a/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-install.yaml b/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-install.yaml deleted file mode 100644 index a9c037e98f4..00000000000 --- a/test/openshift/e2e/parallel/1-030_validate_reencrypt/01-install.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-30-argo1 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-30-argo1 -spec: - server: - route: - enabled: true - tls: - termination: reencrypt - insecureEdgeTerminationPolicy: Redirect diff --git a/test/openshift/e2e/parallel/1-030_validate_reencrypt/02-wait.yaml b/test/openshift/e2e/parallel/1-030_validate_reencrypt/02-wait.yaml deleted file mode 100644 index 7626618f609..00000000000 --- a/test/openshift/e2e/parallel/1-030_validate_reencrypt/02-wait.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running "test-1-30-argo1" diff --git a/test/openshift/e2e/parallel/1-030_validate_reencrypt/03-check-route.yaml b/test/openshift/e2e/parallel/1-030_validate_reencrypt/03-check-route.yaml deleted file mode 100644 index 029233a907f..00000000000 --- a/test/openshift/e2e/parallel/1-030_validate_reencrypt/03-check-route.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - sleep 30s - routeURL=$(oc -n test-1-30-argo1 get route argocd-server -o jsonpath='{.status.ingress[0].host}') - if ! curl --silent -k https://${routeURL} | grep -q "Your browser does not support JavaScript."; then - echo "Route not configured properly" - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml deleted file mode 100644 index c297a7ad362..00000000000 --- a/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml +++ /dev/null @@ -1,125 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - set -o pipefail - - # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix - expected_kustomizeVersion='v5.4.3' - expected_helmVersion='v3.16.3' - expected_argocdVersion='v2.14.4' - - if CI="prow"; then - # when running against openshift-ci - expected_dexVersion='v2.30.3-dirty' - expected_redisVersion='6.2.4' - else - # when running against RC/ released version of gitops - expected_dexVersion='v2.35.1' - expected_redisVersion='6.2.7' - fi - - MAX_RETRIES=10 - get_pod_name() { - local retry_count=0 - until [ "${retry_count}" -gt ${MAX_RETRIES} ]; do - retry_count=$((retry_count + 1)) - pod=$( - oc get -n openshift-gitops pods \ - -o custom-columns=NAME:.metadata.name --no-headers | - grep $1 | - head -1 - ) - if [[ -z "${pod}" ]]; then - #// no set - if [[ $retry_count*$retry_count > 30 ]] - then - timeout=30 - else - timeout=$retry_count*$retry_count - fi - sleep $timeout - continue - else - #//set - echo $pod - break - fi - done - } - - gitops_server_pod=$(get_pod_name openshift-gitops-server) - - dex_pod=$(get_pod_name openshift-gitops-dex-server) - - redis_pod=$(get_pod_name openshift-gitops-redis) - - route=$( - oc get route -n openshift-gitops \ - -o custom-columns=NAME:.spec.host --no-headers | - grep openshift-gitops-server | - head -1 - ) - - kustomizeVersion=$( - oc -n openshift-gitops exec $gitops_server_pod \ - -- kustomize version - ) - helmVersion=$( - oc -n openshift-gitops exec $gitops_server_pod \ - -- helm version | - sed -e 's/version.BuildInfo//' -e 's/\"//g' | - awk -F':' '{ print $2 }' | - awk -F',' '{ print $1 }' - ) - argocdVersion=$( - oc -n openshift-gitops exec $gitops_server_pod -- \ - argocd version --short --server $route --insecure | - grep 'argocd-server' | - sed -e 's/\+unknown//' | - awk -F' ' '{ print $2 }' - ) - dexVersion=$( - oc -n openshift-gitops exec $dex_pod -- dex version 2>&1 | - grep '^Dex Version' | - awk -F': ' '{ print $2 }' - ) - - redisVersion=$( - oc -n openshift-gitops exec $redis_pod -- \ - redis-server -v | awk -F '=' '{ print $2 }' | cut -d' ' -f 1 - ) - - if test "${kustomizeVersion}" != "${expected_kustomizeVersion}"; then - echo "Kustomize version mismatch. Should be ${expected_kustomizeVersion}, is ${kustomizeVersion}" - error=1 - fi - - if test "${helmVersion}" != "${expected_helmVersion}"; then - echo "Helm version mismatch. Should be ${expected_helmVersion}, is ${helmVersion}" - error=1 - fi - - if test "${dexVersion}" != "${expected_dexVersion}"; then - echo "Dex version mismatch. Should be ${expected_dexVersion}, is ${dexVersion}" - error=1 - fi - - # we are as argocdVersion contains v2.7.6+00c914a suffix addition to the version no. - # So, we are checking if expected_argocdVersion is substring of the actual version - if [[ "${argocdVersion}" == *"${expected_argocdVersion}"* ]]; then - echo "" - else - echo "ArgoCD version mismatch. Should be ${expected_argocdVersion}, is ${argocdVersion}" - error=1 - fi - - if test "${expected_redisVersion}" != "${redisVersion}" ;then - echo "Redis version mismatch. Should be ${expected_redisVersion}, is ${redisVersion}" - error=1 - fi - - if [[ $error == 1 ]]; then - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-assert.yaml b/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-install.yaml b/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml b/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml deleted file mode 100644 index eec10e64ab6..00000000000 --- a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-add_resource_inclusions.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - resourceInclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-assert.yaml b/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-assert.yaml deleted file mode 100644 index 6cb167cf915..00000000000 --- a/test/openshift/e2e/parallel/1-032_validate_resource_inclusions/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - resource.inclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet diff --git a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-assert.yaml b/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-install.yaml b/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml b/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml deleted file mode 100644 index dba7487a098..00000000000 --- a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-add_resource_exclusions.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - resourceExclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-assert.yaml b/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-assert.yaml deleted file mode 100644 index 919aebd2dcc..00000000000 --- a/test/openshift/e2e/parallel/1-033_validate_resource_exclusions/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - resource.exclusions: | - - apiGroups: - - tekton.dev - clusters: - - '*' - kinds: - - DaemonSet diff --git a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml b/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml deleted file mode 100644 index 9ee1919d966..00000000000 --- a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml b/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml b/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml deleted file mode 100644 index 1f424c4663d..00000000000 --- a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-assert.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: keycloak-1-deploy -status: - containerStatuses: - - name: deployment - state: - terminated: - reason: Completed ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml b/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml deleted file mode 100644 index 82c226b2e6a..00000000000 --- a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/02-update-sso-keycloak-provider.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to change sso provider to keycloak -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "add", "path": "/spec/sso", "value": {"provider": "keycloak"}}]' diff --git a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml b/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml deleted file mode 100644 index ee9c18009d6..00000000000 --- a/test/openshift/e2e/parallel/1-036_validate_keycloak_resource_reqs/03-check-resources.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - resources=$(oc get -n $NAMESPACE pod/keycloak-1-deploy -o jsonpath='{.spec.containers[0].resources}') - if [[ -n ${resources} ]]; then - if [[ "${resources}" != '{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"250m","memory":"256Mi"}}' ]]; then - echo "resources spec for pod/keycloak-1-deploy are incorrect" - echo "${resources}" - exit 1 - fi - else - echo "resources spec not found in pod/keycloak-1-deploy" - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml deleted file mode 100644 index 2ee939334cf..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml deleted file mode 100644 index 22744813fe7..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/02-scale_out_server.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/server/replicas", "value": 3 }]' - exit 0 diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml deleted file mode 100644 index b1783d74ba7..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/03-scale_out_repo.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/repo/replicas", "value": 3 }]' - exit 0 diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml deleted file mode 100644 index 3ddbadebda1..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/04-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 3 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 3 diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml deleted file mode 100644 index 790cfdd4709..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/05-scale_in_server.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/server/replicas", "value": 1 }]' - exit 0 diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml deleted file mode 100644 index f41e545a8d8..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/06-scale_in_repo.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd argocd \ - -n $NAMESPACE \ - --type='json' \ - -p='[{"op": "replace", "path": "/spec/repo/replicas", "value": 1 }]' - exit 0 diff --git a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml b/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml deleted file mode 100644 index 42e32a779ca..00000000000 --- a/test/openshift/e2e/parallel/1-037_validate_argocd_setting_replicas/07-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/parallel/1-038_validate_productized_images/01-assert.yaml b/test/openshift/e2e/parallel/1-038_validate_productized_images/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-038_validate_productized_images/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-038_validate_productized_images/01-install.yaml b/test/openshift/e2e/parallel/1-038_validate_productized_images/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-038_validate_productized_images/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-038_validate_productized_images/02-check-images.yaml b/test/openshift/e2e/parallel/1-038_validate_productized_images/02-check-images.yaml deleted file mode 100644 index 64b28c91dbf..00000000000 --- a/test/openshift/e2e/parallel/1-038_validate_productized_images/02-check-images.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - sleep 10 - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - image=$(oc -n $NAMESPACE get ${wl} -o jsonpath='{.spec.template.spec.containers[0].image}' | awk -F'@' '{print $1}') - if test "$image" != "registry.redhat.io/openshift-gitops-1/argocd-rhel8"; then - echo "Non-productized image in workload $wl detected." - if [ -z $CI ]; then - exit 1 - else - exit 0 - fi - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml b/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml deleted file mode 100644 index 8185706d1c6..00000000000 --- a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available diff --git a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml b/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml deleted file mode 100644 index e8db1935404..00000000000 --- a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml b/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml deleted file mode 100644 index 50368922e30..00000000000 --- a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/02-modify_configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -data: - test.example.com: '-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----' -metadata: - name: argocd-tls-certs-cm \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml b/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml deleted file mode 100644 index d68d60a9eaa..00000000000 --- a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/03-modify_argocd_cr.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - tls: - initialCerts: - test.example.com: BEGIN CERTIFICATE diff --git a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml b/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml deleted file mode 100644 index d6ffb17db43..00000000000 --- a/test/openshift/e2e/parallel/1-039_validate_fix_argocd-tls-certs-cm/04-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: argocd-tls-certs-cm -data: - test.example.com: BEGIN CERTIFICATE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/01-assert.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/01-assert.yaml deleted file mode 100644 index 1170d554f8e..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: example-argocd-server \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/01-install.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/01-install.yaml deleted file mode 100644 index e8db1935404..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/02-check_URL.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/02-check_URL.yaml deleted file mode 100644 index 18f076ce89b..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/02-check_URL.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - until [[ $i -eq 20 ]] - do - route_URL=$(oc get routes -o jsonpath="{.items[*]['spec.host']}" --field-selector metadata.name=example-argocd-server -n $NAMESPACE) - status_URL=$(oc get argocd -o jsonpath="{.items[*]['status.host']}" -n $NAMESPACE) - - echo -e "route_URL:${route_URL}\nstatus_URL:${status_URL}" - - if ! [[ "${status_URL}" == "${route_URL}" ]]; then - i=$((i+1)) - sleep 6 - else - exit 0 - fi - done - - echo "Error: Route does not match" - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/03-assert.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/03-assert.yaml deleted file mode 100644 index ea5bffd1ba0..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/03-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - host: modified-route \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/03-modify_route_URL.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/03-modify_route_URL.yaml deleted file mode 100644 index 0906e9bebbc..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/03-modify_route_URL.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch route example-argocd-server -n $NAMESPACE --type='json' -p='[{"op": "replace", "path": "/spec/host", "value":"modified-route"}]' \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/04-disable_route.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/04-disable_route.yaml deleted file mode 100644 index faad1acaf10..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/04-disable_route.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - route: - enabled: false \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-042_validate_status_host/04-errors.yaml b/test/openshift/e2e/parallel/1-042_validate_status_host/04-errors.yaml deleted file mode 100644 index a962c966ae8..00000000000 --- a/test/openshift/e2e/parallel/1-042_validate_status_host/04-errors.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available - host: modified-route \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-assert.yaml b/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-install.yaml b/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-043_validate_log_level_format/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml b/test/openshift/e2e/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml deleted file mode 100644 index 08516691822..00000000000 --- a/test/openshift/e2e/parallel/1-043_validate_log_level_format/02-change-loglevel.yaml +++ /dev/null @@ -1,15 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - logLevel: debug - logFormat: json - repo: - logLevel: debug - logFormat: json - controller: - logLevel: debug - logFormat: json \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml b/test/openshift/e2e/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml deleted file mode 100644 index 5bc3e3dc758..00000000000 --- a/test/openshift/e2e/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 15 -- script: | - set -e - set -o pipefail - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - wlCommand=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].command}') - level="debug" - format="json" - if ! echo "$wlCommand" | grep -e "\"--loglevel\",\"${level}\""; then - echo "logLevel was not set correctly for $wl" - echo "CWD: $wlCommand" - exit 1 - fi - if ! echo "$wlCommand" | grep -e "\"--logformat\",\"${format}\""; then - echo "logFormat was not set correctly for $wl" - echo "CWD: $wlCommand" - exit 1 - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-assert.yaml b/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-assert.yaml deleted file mode 100644 index 6d473259a41..00000000000 --- a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-assert.yaml +++ /dev/null @@ -1,32 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: "1" - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: "1" - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: "1" - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-install.yaml b/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-install.yaml deleted file mode 100644 index c336598f09a..00000000000 --- a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/01-install.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: 1 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: 1 - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: 1 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml b/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml deleted file mode 100644 index daaa23ac8ae..00000000000 --- a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/02-change-limits.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - resources: - limits: - cpu: 2 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi - controller: - resources: - limits: - cpu: 2 - memory: 2000Mi - requests: - cpu: 50m - memory: 200Mi - repo: - resources: - limits: - cpu: 2 - memory: 200Mi - requests: - cpu: 50m - memory: 200Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml b/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml deleted file mode 100644 index c82eb661fd9..00000000000 --- a/test/openshift/e2e/parallel/1-044_validate_resource_limit_changes/04-check-workloads.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - set -e - set -o pipefail - for wl in deployments/argocd-server deployments/argocd-repo-server statefulsets/argocd-application-controller; do - res=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].resources.limits.cpu}') - if test "$res" != "2"; then - echo "Reconciliation of resources for $wl failed: Should be 2, is '$res'" - exit 1 - fi - done \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml b/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-install.yaml b/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-install.yaml deleted file mode 100644 index fc2d28f83d7..00000000000 --- a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd diff --git a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml b/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml deleted file mode 100644 index e7dcd4fa2f4..00000000000 --- a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/02-change-exec-timeout.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - repo: - execTimeout: 300 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml b/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml deleted file mode 100644 index f3e44f7f5ea..00000000000 --- a/test/openshift/e2e/parallel/1-045_validate_repo_exec_timeout/04-check-workload-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - timeout=$(oc get -n $NAMESPACE deployment argocd-repo-server -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_EXEC_TIMEOUT").value') - if test "$timeout" != "300s"; then - echo "Assertion failed. Timeout should be 300s, is '$timeout'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-047_validate_custom_env/01-assert.yaml b/test/openshift/e2e/parallel/1-047_validate_custom_env/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-047_validate_custom_env/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-047_validate_custom_env/01-install.yaml b/test/openshift/e2e/parallel/1-047_validate_custom_env/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-047_validate_custom_env/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-047_validate_custom_env/02-change-env-vars.yaml b/test/openshift/e2e/parallel/1-047_validate_custom_env/02-change-env-vars.yaml deleted file mode 100644 index 9644a6bbda1..00000000000 --- a/test/openshift/e2e/parallel/1-047_validate_custom_env/02-change-env-vars.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - env: - - name: FOO - value: bar - repo: - env: - - name: FOO - value: bar - controller: - env: - - name: FOO - value: bar \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-047_validate_custom_env/03-check-workloads.yaml b/test/openshift/e2e/parallel/1-047_validate_custom_env/03-check-workloads.yaml deleted file mode 100644 index ad5c0184545..00000000000 --- a/test/openshift/e2e/parallel/1-047_validate_custom_env/03-check-workloads.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 10 -- script: | - set -e - set -o pipefail - for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do - val=$(oc get -n $NAMESPACE $wl -o json | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="FOO").value') - if test "$val" != "bar"; then - echo "Environment for $wl was not set correctly." - exit 1 - fi - done - - \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-assert.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-install.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-assert.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-assert.yaml deleted file mode 100644 index ab46dfe9cd7..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-0 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-1 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-2 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml deleted file mode 100644 index 978c1d26003..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/02-change-sharding.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - sharding: - enabled: true - replicas: 3 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/03-check-env.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/03-check-env.yaml deleted file mode 100644 index 03a61e6cafb..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/03-check-env.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - replicas=$(oc get -n $NAMESPACE statefulset argocd-application-controller -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_CONTROLLER_REPLICAS").value') - if test "$replicas" != "3"; then - echo "Environment ARGOCD_CONTROLLER_REPLICAS not correct. Should '3', is '$replicas'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml deleted file mode 100644 index a3fa97ab6e1..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-change-sharding.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - sharding: - enabled: false - replicas: 3 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-errors.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-errors.yaml deleted file mode 100644 index aa719afb9bb..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/04-errors.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-1 ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-2 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/05-check-env.yaml b/test/openshift/e2e/parallel/1-048_validate_controller_sharding/05-check-env.yaml deleted file mode 100644 index 0c80e46ac07..00000000000 --- a/test/openshift/e2e/parallel/1-048_validate_controller_sharding/05-check-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # we do expect error from jq here if env is not set at all - replicas=$(oc get -n $NAMESPACE statefulset argocd-application-controller -o json \ - | jq -r '.spec.template.spec.containers[0].env[]|select(.name=="ARGOCD_CONTROLLER_REPLICASE").value') - if test "$replicas" != ""; then - echo "Environment ARGOCD_CONTROLLER_REPLICAS not correct. Should '', is '$replicas'" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-assert.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-assert.yaml deleted file mode 100644 index 6b21080c096..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-install.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml deleted file mode 100644 index 00029c8df31..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - set -o pipefail - expected=10 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml deleted file mode 100644 index cf75730ca3e..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/03-change-limit.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - parallelismLimit: 20 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml deleted file mode 100644 index 401b9116844..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/04-check-deployment.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 5 -- script: | - set -e - set -o pipefail - expected=20 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml deleted file mode 100644 index 3a5fad3053c..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/05-change-back-to-default.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml b/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml deleted file mode 100644 index e14804f25ee..00000000000 --- a/test/openshift/e2e/parallel/1-049_validate_parallelism_limit/06-check-deployment.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc patch -n $NAMESPACE argocds/argocd --type=json --patch '[{"op": "remove", "path": "/spec/controller/parallelismLimit"}]' -- script: sleep 5 -- script: | - set -e - set -o pipefail - expected=10 - wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}') - if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then - echo "Incorrect or missing --kubectl-parallelism-limit detected." - echo "$wlCommand" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-051-validate_csv_permissions/01-validate.yaml b/test/openshift/e2e/parallel/1-051-validate_csv_permissions/01-validate.yaml deleted file mode 100644 index ddf9f521142..00000000000 --- a/test/openshift/e2e/parallel/1-051-validate_csv_permissions/01-validate.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - res=$(oc auth can-i delete resourcequotas -n openshift-gitops --as system:serviceaccount:openshift-gitops-operator:openshift-gitops-operator-controller-manager) - if test "$res" != "yes"; then - echo "Can't delete resourcequotas" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml b/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml deleted file mode 100644 index 3fb94e98c80..00000000000 --- a/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/01-label_namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Add the managed-by label to the namespace created by Kuttl -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc label namespace $NAMESPACE argocd.argoproj.io/managed-by=openshift-gitops diff --git a/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml b/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml deleted file mode 100644 index 0d7d110f87c..00000000000 --- a/test/openshift/e2e/parallel/1-052_validate_rolebinding_number/02-check_rolebindings.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - - # Expected and Current RoleBindings - expected_rb=( - "openshift-gitops-argocd-application-controller" - "openshift-gitops-argocd-server" - ) - - # Check that eventually the current role bindings equal the expected role - # bindings. Timeout after 60 seconds - timer=0 - current_rb=( $(oc get rolebindings -n "${NAMESPACE}" | awk '/gitops/ {print $1}' | sort) ) - while [[ "${current_rb[@]}" != "${expected_rb[@]}" ]]; do - if [[ $timer -eq 60 ]]; then - echo "timed out waiting for current role bindings to equal expected role bindings" - echo "current role bindings: ${current_rb[*]}" - echo "expected role bindings: ${expected_rb[*]}" - exit 1 - fi - - timer=$((timer+5)) - sleep 5 - current_rb=( $(oc get rolebindings -n "${NAMESPACE}" | awk '/gitops/ {print $1}' | sort) ) - done - - # Check that the expected role bindings continue to exist for at least the - # next 20 seconds - timer=0 - while [ true ]; do - if [[ $timer -eq 20 ]]; then - break - fi - - current_rb=( $(oc get rolebindings -n "${NAMESPACE}" | awk '/gitops/ {print $1}' | sort) ) - if [[ "${current_rb[@]}" != "${expected_rb[@]}" ]]; then - echo "current role bindings have changed, now not equal to expected role bindings" - echo "current role bindings: ${current_rb[*]}" - echo "expected role bindings: ${expected_rb[*]}" - exit 1 - fi - - timer=$((timer+5)) - sleep 5 - done diff --git a/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml b/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml b/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml deleted file mode 100644 index c697d11412b..00000000000 --- a/test/openshift/e2e/parallel/1-053_validate_cluster_admin_rbac/02-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-assert.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-assert.yaml deleted file mode 100644 index 2ee939334cf..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-install.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-install.yaml deleted file mode 100644 index 7f8eddf2516..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml deleted file mode 100644 index dfed78cb23c..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/02-install-deploymentconfig.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# It would be better to have the "kind: Application" resource as it is, -# but "${NAMESPACE}" expansion doesn't work in kuttl manifests -# We also need to centralize the app examples in a public (common) repo. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - # Install ArgoCD Application with 2 replicas - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: app-deploymentconfig - namespace: ${NAMESPACE} - spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/deploymentconfig-example - targetRevision: "HEAD" - destination: - server: https://kubernetes.default.svc - namespace: ${NAMESPACE} - syncPolicy: - automated: {} - EOF - # Give some time to Application before asserting - sleep 10 - - exit 0 diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/03-assert.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/03-assert.yaml deleted file mode 100644 index 8c779dc2a49..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/03-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -status: - health: - status: Healthy - operationState: - phase: Succeeded ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: test-deploymentconfig -status: - replicas: 2 diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-assert.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-assert.yaml deleted file mode 100644 index d98e6fd7b7b..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -status: - health: - status: Healthy - operationState: - phase: Succeeded ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: test-deploymentconfig -status: - replicas: 0 diff --git a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml b/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml deleted file mode 100644 index d07e4385510..00000000000 --- a/test/openshift/e2e/parallel/1-054_validate_deploymentconfig/04-scaledown-deploymentconfig.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Point targetRevision to a branch with 0 replicas -# in DeploymentConfig's manifest -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-deploymentconfig -spec: - project: default - source: - path: test/examples/deploymentconfig-example_replica_0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/01-assert.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/01-assert.yaml deleted file mode 100644 index 89f17b7f6c6..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/01-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/01-install.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/01-install.yaml deleted file mode 100644 index 8204e070db1..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/01-install.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev - labels: - app: smtp4dev -spec: - replicas: 1 - selector: - matchLabels: - app: smtp4dev - template: - metadata: - labels: - app: smtp4dev - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/os - operator: In - values: - - linux - containers: - - name: smtp4dev - image: quay.io/openshift-gitops-test/smtplistener:multiarch - ports: - - containerPort: 80 - - containerPort: 2525 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml deleted file mode 100644 index 22d38a08489..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/02-update-notifications-cm.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 15 -- script: | - set -e - - kubectl patch notificationsconfiguration default-notifications-configuration -n $NAMESPACE --type='json' -p='[{"op": "add", "path": "/spec/services", "value": {"service.email.gmail": "{host: smtp4dev, port: 2525, from: fake@email.com }" } }]' -- script: sleep 5 - diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/03-create-app.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/03-create-app.yaml deleted file mode 100644 index cd5bc09e99e..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/03-create-app.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: my-app-3 - namespace: $NAMESPACE - annotations: - "notifications.argoproj.io/subscribe.on-created.gmail": "jdfake@email.com" - spec: - destination: - namespace: $NAMESPACE - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/nginx - targetRevision: HEAD - EOF -- script: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/04-assert.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/04-assert.yaml deleted file mode 100644 index 89f17b7f6c6..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/04-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - notifications: - enabled: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: smtp4dev -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: smtp4dev -spec: - selector: - app: smtp4dev - ports: - - name: smtp - protocol: TCP - port: 2525 - targetPort: 2525 - - name: http - protocol: TCP - port: 80 - targetPort: 80 diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/04-delete-app.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/04-delete-app.yaml deleted file mode 100644 index 47052970a1b..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/04-delete-app.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - kubectl delete -n $NAMESPACE application.argoproj.io my-app-3 -- script: sleep 5 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-057_validate_notifications/05-verify-email.yaml b/test/openshift/e2e/parallel/1-057_validate_notifications/05-verify-email.yaml deleted file mode 100644 index 817b1f9121d..00000000000 --- a/test/openshift/e2e/parallel/1-057_validate_notifications/05-verify-email.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - smtp4dev_pod=$(kubectl get pod -l=app=smtp4dev -o NAME -n $NAMESPACE) - - while : - do - if [[ $timer -eq 120 ]]; then - echo "timed out while waiting for email notification" - exit 1 - fi - - exit_code=$(kubectl -n $NAMESPACE exec --stdin "${smtp4dev_pod}" -- /bin/bash \ - -c 'if [[ $(grep -rnw /tmp -e "Subject: Application my-app-3 has been created.") ]]; then - exit 0; else - exit 1; - fi') - - if [[ $exit_code -eq 0 ]]; then - exit 0 - fi - - timer=$((timer+5)) - sleep 5 - done \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-assert.yaml b/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-assert.yaml deleted file mode 100644 index 369ddad0d0c..00000000000 --- a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-install.yaml b/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-install.yaml deleted file mode 100644 index 955aaaef8b0..00000000000 --- a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/02-wait.yaml b/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/02-wait.yaml deleted file mode 100644 index a10fc72ed0d..00000000000 --- a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/02-wait.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Wait for the Operator to reconcile -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - function wait_until_pods_running() { - echo -n "Waiting until all pods in namespace $1 are up" - for i in {1..150}; do # timeout after 5 minutes - local pods="$(oc get pods --no-headers -n $1 2>/dev/null)" - # write it to tempfile - TempFile=$(mktemp) - oc get pods --no-headers -n $1 2>/dev/null >$TempFile - - # All pods must be running - local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l) - if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then - local all_ready=1 - while read pod; do - local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' ')) - # All containers must be ready - [[ -z ${status[0]} ]] && all_ready=0 && break - [[ -z ${status[1]} ]] && all_ready=0 && break - [[ ${status[0]} -lt 1 ]] && all_ready=0 && break - [[ ${status[1]} -lt 1 ]] && all_ready=0 && break - [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break - done <${TempFile} - if ((all_ready)); then - echo -e "\nAll pods are up:\n${pods}" - return 0 - fi - fi - echo -n "." - sleep 2 - done - echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}" - return 1 - } - - wait_until_pods_running $NAMESPACE diff --git a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-assert.yaml b/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-assert.yaml deleted file mode 100644 index 370285249d5..00000000000 --- a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: test-1-58-custom -status: - health: - status: Healthy - sync: - status: Synced \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-create_application.yaml b/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-create_application.yaml deleted file mode 100644 index d5751238c55..00000000000 --- a/test/openshift/e2e/parallel/1-058_validate_prometheus_rule/03-create_application.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - cat << EOF | oc apply -f - - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: test-1-58-custom - namespace: ${NAMESPACE} - spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/bgd-k8s - targetRevision: "HEAD" - destination: - server: "https://kubernetes.default.svc" - namespace: ${NAMESPACE} - syncPolicy: - automated: {} - EOF \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-assert.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-assert.yaml deleted file mode 100644 index 7c79c300913..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: label diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-install.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-assert.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-assert.yaml deleted file mode 100644 index cd8e0aed8e1..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: annotation diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml deleted file mode 100644 index 6a32d59aa6e..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/02-patch_cm_annotation.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"annotation"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-assert.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-assert.yaml deleted file mode 100644 index db25e1c94d3..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: annotation+label diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml deleted file mode 100644 index 3dc1e956030..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/03-patch_cm_annotation_label.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"annotation+label"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-assert.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-assert.yaml deleted file mode 100644 index 5ec09727b42..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - application.resourceTrackingMethod: label diff --git a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml b/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml deleted file mode 100644 index bd11cbd1665..00000000000 --- a/test/openshift/e2e/parallel/1-061_validate_resource_tracking_method/04-patch_cm_invalid_method.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"resourceTrackingMethod":"invalid_method"}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml deleted file mode 100644 index 8c10115f4f0..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/01-argocd-with-extraconfig.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - extraConfig: - "admin.enabled": "true" # enable admin user through extraConfig \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/01-assert.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/01-assert.yaml deleted file mode 100644 index a6a4b5515df..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml deleted file mode 100644 index bbac50ba574..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/02-argocd-with-firstclass-and-extraconfig copy.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - extraConfig: - "admin.enabled": "true" # override admin user through extraConfig \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/02-assert.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/02-assert.yaml deleted file mode 100644 index e5470d42f83..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/02-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/03-assert.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/03-assert.yaml deleted file mode 100644 index 3f172ffda5e..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/03-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" # operator should reject any manual updates to the configmap. \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/03-update-configmap.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/03-update-configmap.yaml deleted file mode 100644 index aff583e2562..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/03-update-configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "false" \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/04-assert.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/04-assert.yaml deleted file mode 100644 index d005cd46f72..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/04-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - dex.config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml deleted file mode 100644 index 61d0220b238..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/04-create-dex-without-extraconfig.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - sso: - provider: dex - dex: - config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class - - diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/05-assert.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/05-assert.yaml deleted file mode 100644 index 747283cafb2..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/05-assert.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - dex.config: | - connectors: - - type: github - id: github - name: github-using-extra-config - config: - clientID: extra-config - clientSecret: $dex.github.clientSecret - orgs: - - name: extra-config \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml b/test/openshift/e2e/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml deleted file mode 100644 index 8cb6c08cce2..00000000000 --- a/test/openshift/e2e/parallel/1-062_validate_extra_config/05-override-dex-using-extraconfig.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - disableAdmin: true - sso: - provider: dex - dex: - config: | - connectors: - - type: github - id: github - name: github-using-first-class - config: - clientID: first-class - clientSecret: $dex.github.clientSecret - orgs: - - name: first-class - extraConfig: - "admin.enabled": "true" - "dex.config": | - connectors: - - type: github - id: github - name: github-using-extra-config - config: - clientID: extra-config - clientSecret: $dex.github.clientSecret - orgs: - - name: extra-config diff --git a/test/openshift/e2e/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml b/test/openshift/e2e/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml deleted file mode 100644 index 1a3e4aa79e8..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_dex_liveness_probe/01-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: v1 -kind: Pod -metadata: - namespace: openshift-gitops - labels: - app.kubernetes.io/name: openshift-gitops-dex-server -spec: - containers: - - livenessProbe: - failureThreshold: 3 - httpGet: - path: /healthz/live - port: 5558 - scheme: HTTP - initialDelaySeconds: 60 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-assert.yaml b/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-assert.yaml deleted file mode 100644 index a3695549dd5..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-install.yaml b/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-install.yaml deleted file mode 100644 index 6ce824695ab..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-assert.yaml b/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-assert.yaml deleted file mode 100644 index 88db3ef474d..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml b/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml deleted file mode 100644 index d68fe06715c..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/02-change_to_invalid_image.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch statefulset/example-argocd-application-controller \ - -n $NAMESPACE \ - --type "json" \ - -p '[{"op":"replace","path":"/spec/template/spec/containers/0/image","value":"invalid_image"}]' - sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml b/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml deleted file mode 100644 index 1a9c6577b32..00000000000 --- a/test/openshift/e2e/parallel/1-063_validate_statefulset_restart/03-check_image_after_change.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - image=$(oc get statefulset/example-argocd-application-controller -o jsonpath='{.spec.template.spec.containers[].image}' -n $NAMESPACE) - - if test "${image}" == "invalid_image"; then - echo "The application-controller statefulset is using 'invalid_image'" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-assert.yaml b/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-assert.yaml deleted file mode 100644 index 9d21a7003bb..00000000000 --- a/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-assert.yaml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-applicationset-controller -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-notifications-controller -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - securityContext: - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true - # random runAsUser in openshift - #runAsUser: 999 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - containers: - - securityContext: - capabilities: - drop: - - ALL - allowPrivilegeEscalation: false - # readOnlyRootFilesystem: true - runAsNonRoot: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-install.yaml b/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-install.yaml deleted file mode 100644 index 2a8049b2769..00000000000 --- a/test/openshift/e2e/parallel/1-064_validate_security_contexts/01-install.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - applicationSet: - resources: - limits: - cpu: "2" - memory: 1Gi - requests: - cpu: 250m - memory: 512Mi - notifications: - enabled: true - sso: - dex: - openShiftOAuth: true - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - provider: dex diff --git a/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml b/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml deleted file mode 100644 index d4094a3fdb3..00000000000 --- a/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml b/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml deleted file mode 100644 index 1fab1a94154..00000000000 --- a/test/openshift/e2e/parallel/1-065_validate_redis_ha_anti_affinity/02-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -spec: - template: - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/name: argocd-redis-ha - topologyKey: kubernetes.io/hostname diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml deleted file mode 100644 index 1de4afe0880..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml deleted file mode 100644 index 682f45bf57e..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/02-generate_cert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if [[ $(uname -o) == "Darwin" ]]; then - echo "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" >${PWD}/openssl_test.cnf - else - echo -e "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" >${PWD}/openssl_test.cnf - fi - - openssl req -new -x509 -sha256 \ - -subj "/C=XX/ST=XX/O=Testing/CN=redis" \ - -reqexts SAN -extensions SAN \ - -config ${PWD}/openssl_test.cnf \ - -keyout ${PWD}/redis.key \ - -out ${PWD}/redis.crt \ - -newkey rsa:4096 \ - -nodes \ - -days 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml deleted file mode 100644 index ab3a96ea352..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/03-create_secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - # clean up key, cert and config file - cleanup() { - rm -rf ${PWD}/redis.crt && rm -rf ${PWD}/redis.key && rm -rf ${PWD}/openssl_test.cnf - } - - trap cleanup INT TERM EXIT - - oc create secret tls argocd-operator-redis-tls --key=${PWD}/redis.key --cert=${PWD}/redis.crt -n $NAMESPACE - sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml deleted file mode 100644 index 02c2fa67aa3..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-assert.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml deleted file mode 100644 index c73dbe584e4..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/04-create_annotation.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc annotate secret argocd-operator-redis-tls argocds.argoproj.io/name=argocd -n $NAMESPACE - sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml deleted file mode 100644 index 126c286ae1d..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/05-check_deployments.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get deployments.apps argocd-redis -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.args}}{{"\n"}}{{end}}')" != \ - "[redis-server \ - --protected-mode no \ - --save \ - --appendonly no \ - --requirepass \$(REDIS_PASSWORD) \ - --tls-port 6379 \ - --port 0 \ - --tls-cert-file /app/config/redis/tls/tls.crt \ - --tls-key-file /app/config/redis/tls/tls.key \ - --tls-auth-clients no]"; then - echo "TLS .spec.template.spec.containers.args for argocd-redis deployment are wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-repo-server -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[uid_entrypoint.sh \ - argocd-repo-server \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/reposerver/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-repo-server deployment is wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-server -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-server \ - --staticassets /shared/app \ - --dex-server https://argocd-dex-server.$NAMESPACE.svc.cluster.local:5556 \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/server/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-server deployment is wrong" - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml b/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml deleted file mode 100644 index a29d6ef89c2..00000000000 --- a/test/openshift/e2e/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha/06-check_statefulset.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get statefulsets.apps argocd-application-controller -n $NAMESPACE --template '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-application-controller \ - --operation-processors 10 \ - --redis argocd-redis.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/controller/tls/redis/tls.crt \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --status-processors 20 \ - --kubectl-parallelism-limit 10 \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml deleted file mode 100644 index efba40ead9b..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml deleted file mode 100644 index 3b057afec1a..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/02-generate_cert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if [[ $(uname -o) == "Darwin" ]]; then - echo "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" > ${PWD}/openssl_test.cnf - else - echo -e "\n[SAN]\nsubjectAltName=DNS:argocd-redis.$NAMESPACE.svc.cluster.local\n[req]\ndistinguished_name=req" > ${PWD}/openssl_test.cnf - fi - - openssl req -new -x509 -sha256 \ - -subj "/C=XX/ST=XX/O=Testing/CN=redis" \ - -reqexts SAN -extensions SAN \ - -config ${PWD}/openssl_test.cnf \ - -keyout ${PWD}/redis-ha.key \ - -out ${PWD}/redis-ha.crt \ - -newkey rsa:4096 \ - -nodes \ - -days 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml deleted file mode 100644 index 6918cf1f183..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/03-create_secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - # clean up key and cert and config file - cleanup() { - rm -rf ${PWD}/redis-ha.crt && rm -rf ${PWD}/redis-ha.key && rm -rf ${PWD}/openssl_test.cnf - } - - trap cleanup INT TERM EXIT - - oc create secret tls argocd-operator-redis-tls --key=${PWD}/redis-ha.key --cert=${PWD}/redis-ha.crt -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml deleted file mode 100644 index c62f889776d..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml deleted file mode 100644 index b9b265d680c..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/04-create_annotation.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc annotate secret argocd-operator-redis-tls argocds.argoproj.io/name=argocd -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml deleted file mode 100644 index 047a989adb9..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/05-check_redis_config.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - expected_redis_config=( - 'port 0' - 'tls-port 6379' - 'tls-cert-file /app/config/redis/tls/tls.crt' - 'tls-ca-cert-file /app/config/redis/tls/tls.crt' - 'tls-key-file /app/config/redis/tls/tls.key' - 'tls-replication yes' - 'tls-auth-clients no' - ) - - expected_sentinel_config=( - 'port 0' - 'tls-port 26379' - 'tls-cert-file "/app/config/redis/tls/tls.crt"' - 'tls-ca-cert-file "/app/config/redis/tls/tls.crt"' - 'tls-key-file "/app/config/redis/tls/tls.key"' - 'tls-replication yes' - 'tls-auth-clients no' - ) - - for config in "${expected_redis_config[@]}" - do - oc exec -i pod/argocd-redis-ha-server-0 -n $NAMESPACE -c redis -- grep "${config}" /data/conf/redis.conf - done - - for config in "${expected_sentinel_config[@]}" - do - oc exec -i pod/argocd-redis-ha-server-0 -n $NAMESPACE -c redis -- grep "${config}" /data/conf/sentinel.conf - done diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml deleted file mode 100644 index d6e8af1f0b5..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/06-check_deployments.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get deployments.apps argocd-repo-server -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[uid_entrypoint.sh \ - argocd-repo-server \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/reposerver/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-repo-server deployment is wrong" - exit 1 - fi - -- script: | - set -e - - if test "$(oc get deployments.apps argocd-server -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-server \ - --staticassets /shared/app \ - --dex-server https://argocd-dex-server.$NAMESPACE.svc.cluster.local:5556 \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/server/tls/redis/tls.crt \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-server deployment is wrong" - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml b/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml deleted file mode 100644 index 840afc8396e..00000000000 --- a/test/openshift/e2e/parallel/1-067_validate_redis_secure_comm_no_autotls_ha/07-check_statefulset.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if test "$(oc get statefulsets.apps argocd-application-controller -n $NAMESPACE --template \ - '{{range .spec.template.spec.containers}}{{.command}}{{"\n"}}{{end}}')" != \ - "[argocd-application-controller \ - --operation-processors 10 \ - --redis argocd-redis-ha-haproxy.$NAMESPACE.svc.cluster.local:6379 \ - --redis-use-tls \ - --redis-ca-certificate /app/config/controller/tls/redis/tls.crt \ - --repo-server argocd-repo-server.$NAMESPACE.svc.cluster.local:8081 \ - --status-processors 20 \ - --kubectl-parallelism-limit 10 \ - --loglevel info \ - --logformat text]"; then - echo "TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml b/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml deleted file mode 100644 index efba40ead9b..00000000000 --- a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml b/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml b/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml deleted file mode 100644 index c62f889776d..00000000000 --- a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis-ha-haproxy -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-redis-ha-server -status: - readyReplicas: 3 - replicas: 3 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml b/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml deleted file mode 100644 index 7c62dd929ca..00000000000 --- a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/02-enable_autotls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - oc patch argocds.argoproj.io argocd --type=merge -p '{"spec":{"redis":{"autotls":"openshift"}}}' -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml b/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml deleted file mode 100644 index bdace720d90..00000000000 --- a/test/openshift/e2e/parallel/1-069_validate_redis_secure_comm_autotls_ha/03-check_secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - secret_type="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{.type}}')" - secret_len="$(oc get secrets argocd-operator-redis-tls -n $NAMESPACE --template '{{len .data}}')" - expected_secret_type="kubernetes.io/tls" - expected_secret_len=2 - - if test ${secret_type} != ${expected_secret_type}; then - echo "argocd-operator-redis-tls secret type is ${secret_type} and should be ${expected_secret_type}" - exit 1 - fi - if test ${secret_len} != ${expected_secret_len}; then - echo "argocd-operator-redis-tls secret length is ${secret_len} and should be ${expected_secret_len}" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-assert.yaml b/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-assert.yaml deleted file mode 100644 index 2a13e2d6783..00000000000 --- a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: cmp-plugin - namespace: argocd ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: argocd -status: - applicationController: Running - phase: Available - redis: Running - repo: Running - server: Running - sso: Unknown diff --git a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-install.yaml b/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-install.yaml deleted file mode 100644 index f92480a4d4d..00000000000 --- a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/01-install.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: cmp-plugin - namespace: argocd -data: - plugin.yaml: | - apiVersion: argoproj.io/v1alpha1 - kind: ConfigManagementPlugin - metadata: - name: cmp-plugin - spec: - version: v1.0 - generate: - command: [sh, -c, 'echo "{\"kind\": \"ConfigMap\", \"apiVersion\": \"v1\", \"metadata\": { \"name\": \"$ARGOCD_APP_NAME\", \"namespace\": \"$ARGOCD_APP_NAMESPACE\", \"annotations\": {\"Foo\": \"$FOO\", \"Bar\": \"baz\"}}}"'] - discover: - find: - command: [sh, -c, 'echo "FOUND"; exit 0'] - allowConcurrency: true - lockRepo: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: argocd -spec: - server: - route: - enabled: true - repo: - sidecarContainers: - - name: cmp - command: [/var/run/argocd/argocd-cmp-server] # Entrypoint should be Argo CD lightweight CMP server i.e. argocd-cmp-server - image: busybox # This can be off-the-shelf or custom-built image - securityContext: - runAsNonRoot: true - volumeMounts: - - mountPath: /var/run/argocd - name: var-files - - mountPath: /home/argocd/cmp-server/plugins - name: plugins - - mountPath: /tmp - name: tmp - # Remove this volumeMount if you've chosen to bake the config file into the sidecar image. - - mountPath: /home/argocd/cmp-server/config/plugin.yaml - subPath: plugin.yaml - name: cmp-plugin - volumes: - - configMap: - name: cmp-plugin - name: cmp-plugin \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-assert.yaml b/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-assert.yaml deleted file mode 100644 index 0d4edbbfcf8..00000000000 --- a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-assert.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: argocd -status: - health: - status: Healthy - sync: - status: Synced ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: guestbook - namespace: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-create-app.yaml b/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-create-app.yaml deleted file mode 100644 index 6ffca65163d..00000000000 --- a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/02-create-app.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: guestbook - namespace: argocd -spec: - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator.git - path: test/examples/guestbook - targetRevision: HEAD - plugin: - env: - - name: FOO - value: myfoo - destination: - server: 'https://kubernetes.default.svc' - namespace: argocd - syncPolicy: - automated: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/99-delete.yaml b/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/99-delete.yaml deleted file mode 100644 index c92ff110468..00000000000 --- a/test/openshift/e2e/parallel/1-070_validate_config_management_plugin/99-delete.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-assert.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-assert.yaml deleted file mode 100644 index 984aecce01d..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: false -allowPrivilegedContainer: false -allowedCapabilities: null -apiVersion: security.openshift.io/v1 -defaultAddCapabilities: null -fsGroup: - type: MustRunAs -groups: -- system:authenticated -kind: SecurityContextConstraints -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - include.release.openshift.io/single-node-developer: "true" - labels: - app.kubernetes.io/instance: cs-cluster-roles-ocp4-mgm-gsh-cibasic-p - name: restricted-dropcaps -priority: null -readOnlyRootFilesystem: false -requiredDropCapabilities: -- KILL -- MKNOD -- SETUID -- SETGID -- CHOWN -- DAC_OVERRIDE -- FOWNER -- FSETID -- SETPCAP -- NET_BIND_SERVICE -runAsUser: - type: MustRunAsRange -seLinuxContext: - type: MustRunAs -supplementalGroups: - type: RunAsAny -users: [] -volumes: -- configMap -- downwardAPI -- emptyDir -- persistentVolumeClaim -- projected -- secret \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-create-scc.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-create-scc.yaml deleted file mode 100644 index 06b5fb179d8..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/01-create-scc.yaml +++ /dev/null @@ -1,53 +0,0 @@ -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: false -allowPrivilegedContainer: false -allowedCapabilities: null -apiVersion: security.openshift.io/v1 -defaultAddCapabilities: null -fsGroup: - type: MustRunAs -groups: -- system:authenticated -kind: SecurityContextConstraints -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: 'true' - include.release.openshift.io/self-managed-high-availability: 'true' - include.release.openshift.io/single-node-developer: 'true' - kubernetes.io/description: This uses the restricted scc and drops additional - capabilities - release.openshift.io/create-only: 'true' - labels: - app.kubernetes.io/instance: cs-cluster-roles-ocp4-mgm-gsh-cibasic-p - name: restricted-dropcaps -priority: null -readOnlyRootFilesystem: false -requiredDropCapabilities: -- KILL -- MKNOD -- SETUID -- SETGID -- CHOWN -- DAC_OVERRIDE -- FOWNER -- FSETID -- SETPCAP -- NET_BIND_SERVICE -runAsUser: - type: MustRunAsRange -seLinuxContext: - type: MustRunAs -supplementalGroups: - type: RunAsAny -users: [] -volumes: -- configMap -- downwardAPI -- emptyDir -- persistentVolumeClaim -- projected -- secret diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-assert.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-assert.yaml deleted file mode 100644 index 40a1344d8a5..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-assert.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-application-controller -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-redis -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-repo-server -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-server -status: - phase: Running \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml deleted file mode 100644 index 5328adc148f..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/02-create-argocd.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-assert.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-assert.yaml deleted file mode 100644 index 3131eb7c19d..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-assert.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true -status: - phase: Available ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-application-controller -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-redis-ha-haproxy -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - name: argocd-redis-ha-server-1 -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - name: argocd-redis-ha-server-2 -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-repo-server -status: - phase: Running ---- -kind: Pod -apiVersion: v1 -metadata: - labels: - app.kubernetes.io/name: argocd-server -status: - phase: Running \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml deleted file mode 100644 index b396ec9ea73..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/03-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/99-delete.yaml b/test/openshift/e2e/parallel/1-071_validate_SCC_HA/99-delete.yaml deleted file mode 100644 index 6cbd6f48066..00000000000 --- a/test/openshift/e2e/parallel/1-071_validate_SCC_HA/99-delete.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: security.openshift.io/v1 - kind: SecurityContextConstraints - metadata: - name: restricted-dropcaps diff --git a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml b/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-install.yaml b/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-install.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml b/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml deleted file mode 100644 index 8959633f80f..00000000000 --- a/test/openshift/e2e/parallel/1-072_validate_liveness_probe_removed/02-check_liveness_probe_removed.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - if ! test -z $(oc get statefulset.apps/argocd-application-controller -n $NAMESPACE -o jsonpath='{.spec.template.spec.containers[].livenessProbe}'); then - echo "livenessProbe should not exist on statefulset.apps/argocd-application-controller." - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml deleted file mode 100644 index e7de2ebc96e..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/01-argocd-rhsso.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-keycloak - labels: - example: keycloak -spec: - sso: - provider: keycloak - keycloak: - rootCA: "---BEGIN---END---" - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/01-assert.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/01-assert.yaml deleted file mode 100644 index 763547d8266..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/01-assert.yaml +++ /dev/null @@ -1,88 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-keycloak -status: - phase: Available ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak -spec: - selector: - deploymentConfig: keycloak - strategy: - resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - type: Recreate - template: - metadata: - labels: - application: keycloak - deploymentConfig: keycloak - name: keycloak - spec: - containers: - - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi - volumeMounts: - - mountPath: /etc/x509/https - name: sso-x509-https-volume - readOnly: true - - mountPath: /var/run/configmaps/service-ca - name: service-ca - readOnly: true - - mountPath: /mnt/rh-sso - name: sso-probe-netrc-volume - restartPolicy: Always - volumes: - - name: sso-x509-https-volume - secret: - defaultMode: 420 - secretName: sso-x509-https-secret - - configMap: - defaultMode: 420 - name: keycloak-service-ca - name: service-ca - - name: sso-probe-netrc-volume - emptyDir: - medium: Memory - triggers: - - type: ConfigChange -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: keycloak ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: keycloak -spec: - tls: - termination: reencrypt - to: - kind: Service - name: keycloak - weight: 100 - wildcardPolicy: None ---- -apiVersion: v1 -kind: Secret -metadata: - name: keycloak-secret -type: Opaque \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/02-sleep.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/02-sleep.yaml deleted file mode 100644 index a31a022fb6e..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/02-sleep.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# wait for operator to create a new keycloak realm and update OIDC configuration. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 60 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/03-verify-oidc.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/03-verify-oidc.yaml deleted file mode 100644 index 96759d7a56e..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/03-verify-oidc.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# verify OIDC config -# verify issuer -- script: | - issuer=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep issuer | awk -F' ' '{print $2}') - keycloakRoute=$(kubectl get route keycloak -n $NAMESPACE -o jsonpath='{.spec.host}') - if [[ "${issuer}" == "https://${keycloakRoute}/auth/realms/argocd" ]]; then - echo "issuer matched" - else - echo "issuer mismatched" - echo "${issuer} not equals ${keycloakRoute}/auth/realms/argocd" - exit 1 - fi -# verify oidc config name, clientid -- script: | - clientid=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep clientid | awk -F' ' '{print $2}') - name=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep name | awk -F' ' '{print $2}') - rootCA=$(kubectl get configmap argocd-cm -o jsonpath='{.data.oidc\.config}' -n $NAMESPACE | grep rootca | awk -F' ' '{print $2}') - - if [[ "${clientid}" == "argocd" && "${name}" == "Keycloak" && "${rootCA}" == "'---BEGIN---END---'" ]]; then - echo "oidc name, clientid and rootCA matched" - else - echo "oidc name, clientid or rootCA mismatched" - echo "${clientid}, ${name} and ${rootCA}" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml deleted file mode 100644 index c17755f90ef..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/04-verifyRealmCreation.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# This step is executed after the RHSSO deployment, service, secret, route objects are created and verified. -# Reads the username and password from keycloak secret. -# Requests keycloak for an access token. -# Verifies Realm and Argo CD client creation. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # Set the needed parameter for the authorization - KEYCLOAK_URL=$(oc get route keycloak -n $NAMESPACE -o jsonpath='{.spec.host}') - tenant=argocd - USER=$(oc get secret keycloak-secret -n $NAMESPACE -o jsonpath='{.data.SSO_USERNAME}' | base64 --decode) - PASSWORD=$(oc get secret keycloak-secret -n $NAMESPACE -o jsonpath='{.data.SSO_PASSWORD}' | base64 --decode) - GRANT_TYPE=password - CLIENT_ID=admin-cli - - # Execute the CURL command to request the access-token - access_token=$(curl -d "client_id=$CLIENT_ID" -d "username=$USER" -d "password=$PASSWORD" -d "grant_type=$GRANT_TYPE" "https://$KEYCLOAK_URL/auth/realms/master/protocol/openid-connect/token" -k | sed -n 's|.*"access_token":"\([^"]*\)".*|\1|p') - - # Execute the CURL command to verify the realm and client creation - clientFound=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/clients" -k | grep '"clientId":"argocd"') - if ! [ "$clientFound" = "" ]; then - echo "argocd realm and client creation verified" - else - echo "argocd client not found" - exit 1 - fi - - # Verify OpenShift-v4 IdP creation - IdPFound=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/identity-provider/instances" -k | grep -i OpenShift-v4) - if ! [ "$IdPFound" = "" ]; then - echo "OpenShift-v4 IdP creation verified" - else - echo "OpenShift-v4 IdP not found" - exit 1 - fi - - # Verify OpenShift-v4 IdP creation - syncModeVerified=$(curl -H "Content-Type: application/json" -H "Authorization: bearer $access_token" "https://$KEYCLOAK_URL/auth/admin/realms/$tenant/identity-provider/instances" -k | grep -i '"syncMode":"FORCE"') - if ! [ "$syncModeVerified" = "" ]; then - echo "syncMode set to Force, verified" - else - echo "syncMode not set to Force" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-073_validate_rhsso/99-delete.yaml b/test/openshift/e2e/parallel/1-073_validate_rhsso/99-delete.yaml deleted file mode 100644 index 09d88eb3222..00000000000 --- a/test/openshift/e2e/parallel/1-073_validate_rhsso/99-delete.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: oc delete argocd example-argocd-keycloak -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml deleted file mode 100644 index aaa8a9dc499..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-assert.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-main ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-2242-argocd - namespace: gitops-2242-ns-main -spec: - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: gitops-2242-ns-main -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-install.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-install.yaml deleted file mode 100644 index aaa8a9dc499..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/01-install.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-main ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-2242-argocd - namespace: gitops-2242-ns-main -spec: - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: grant-argocd - namespace: gitops-2242-ns-main -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- kind: ServiceAccount - name: openshift-gitops-argocd-application-controller - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml deleted file mode 100644 index 869c85b2807..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-first - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: gitops-2242-ns-first \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml deleted file mode 100644 index 3b42de9a23c..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/02-managed-ns-cm.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-first - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: gitops-2242-ns-first - finalizers: - - some.random/finalizer -data: - foo: bar \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml deleted file mode 100644 index f49cafec75b..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/03-delete-ns.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - - oc delete ns gitops-2242-ns-first --wait=false - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml deleted file mode 100644 index b48dbd1614d..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-second - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: gitops-2242-argocd-argocd-server - namespace: gitops-2242-ns-second - annotations: - argocds.argoproj.io/name: gitops-2242-argocd - argocds.argoproj.io/namespace: gitops-2242-ns-main ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: gitops-2242-argocd-argocd-application-controller - namespace: gitops-2242-ns-second - annotations: - argocds.argoproj.io/name: gitops-2242-argocd - argocds.argoproj.io/namespace: gitops-2242-ns-main \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml deleted file mode 100644 index d6a0e145290..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/04-create-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-2242-ns-second - labels: - argocd.argoproj.io/managed-by: gitops-2242-ns-main \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml b/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml deleted file mode 100644 index 288ebd52771..00000000000 --- a/test/openshift/e2e/parallel/1-074_validate_terminating_namespace_block/99-cleanup.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - set -e - - # Removing finalizer from cm - oc patch cm/my-config-map-2 -n gitops-2242-ns-first --type json --patch='[ { "op": "remove", "path": "/metadata/finalizers" } ]' - - # Deleting namespaces - oc delete ns gitops-2242-ns-first --wait=false - oc delete ns gitops-2242-ns-second --wait=false - oc delete ns gitops-2242-ns-main --wait=false - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-assert.yaml b/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-assert.yaml deleted file mode 100644 index eff1a05e18f..00000000000 --- a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-install.yaml b/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-install.yaml deleted file mode 100644 index 2e9d25f658b..00000000000 --- a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/01-install.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - dex: - openShiftOAuth: true - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - provider: dex \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml b/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml deleted file mode 100644 index 855aa8b36cb..00000000000 --- a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/02-change_dex_scc_to_anyuid.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc adm policy add-scc-to-user anyuid -z argocd-argocd-dex-server -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-assert.yaml b/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-assert.yaml deleted file mode 100644 index ac582c00313..00000000000 --- a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 - replicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml b/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml deleted file mode 100644 index 9a43dc0884b..00000000000 --- a/test/openshift/e2e/parallel/1-075_validate_dex_anyuid/03-restart_dex_pod.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - oc rollout restart deployment/argocd-dex-server -n $NAMESPACE \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml b/test/openshift/e2e/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml deleted file mode 100644 index d66cebbf47b..00000000000 --- a/test/openshift/e2e/parallel/1-077_validate_disable_dex_removed/01-check_disable_dex_removed.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - - if [ -z $CI ]; then - operator_name_version=$(oc get subscription/openshift-gitops-operator -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}') - if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then - echo "DISABLE_DEX env var is still present in the operator CSV." - exit 1 - fi - else - operator_name_version=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o jsonpath='{.status.installedCSV}') - if [ "$(oc get csv/"${operator_name_version}" -n openshift-gitops-operator -o jsonpath='{.spec.install.spec.deployments[].spec.template.spec.containers[].env}' | grep DISABLE_DEX)" != '' ]; then - echo "DISABLE_DEX env var is still present in the operator CSV." - exit 1 - fi - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml b/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml deleted file mode 100644 index 51c2a1d1d44..00000000000 --- a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - notificationsController: Running - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-redis -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml b/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml deleted file mode 100644 index 43892645355..00000000000 --- a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/01-install.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: True - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml b/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml deleted file mode 100644 index 2407e1f77c7..00000000000 --- a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-assert.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: true - env: - - name: foo - value: bar -status: - server: Running - notificationsController: Running - phase: Available ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-notifications-controller -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: example-argocd-notifications-controller - template: - metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: example-argocd-notifications-controller - spec: - containers: - - resources: {} - env: - - name: foo - value: bar -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml b/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml deleted file mode 100644 index f623d766dfc..00000000000 --- a/test/openshift/e2e/parallel/1-079_validate_vars_for_notificaitons/02-modify-argocd.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - notifications: - enabled: True - env: - - name: foo - value: bar - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml deleted file mode 100644 index 047a16a9405..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-assert.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-redis -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -status: - readyReplicas: 1 ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -status: - readyReplicas: 1 - diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml deleted file mode 100644 index 2ccddd8293c..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml deleted file mode 100644 index 00d7c7d62d7..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: regex \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml deleted file mode 100644 index 87cb1ea3598..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/02-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - rbac: - policyMatcherMode: 'regex' diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml deleted file mode 100644 index 3053e8b23d7..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: '' \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml deleted file mode 100644 index 3053e8b23d7..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/03-try-modify.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: '' \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml deleted file mode 100644 index dd3fa0660a1..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm -data: - policy.matchMode: glob \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml b/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml deleted file mode 100644 index 3c91f213f2d..00000000000 --- a/test/openshift/e2e/parallel/1-080_validate_regex_support_argocd_rbac/04-modify-argocd.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - rbac: - policyMatcherMode: 'glob' \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-081_validate_applicationset_deployment/01-assert.yaml b/test/openshift/e2e/parallel/1-081_validate_applicationset_deployment/01-assert.yaml deleted file mode 100644 index e9b050d30ce..00000000000 --- a/test/openshift/e2e/parallel/1-081_validate_applicationset_deployment/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -spec: - template: - spec: - containers: - - ports: - - containerPort: 7000 - name: webhook - protocol: TCP - - containerPort: 8080 - name: metrics - protocol: TCP -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-applicationset-controller - namespace: openshift-gitops -spec: - ports: - - name: webhook - port: 7000 - protocol: TCP - targetPort: 7000 - - name: metrics - port: 8080 - protocol: TCP - targetPort: 8080 diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/01-assert.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/01-assert.yaml deleted file mode 100644 index 00173536321..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/01-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/01-default-node-selector.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/01-default-node-selector.yaml deleted file mode 100644 index 2ccddd8293c..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/01-default-node-selector.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/02-assert.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/02-assert.yaml deleted file mode 100644 index 39759aad55d..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/02-assert.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml deleted file mode 100644 index 67a5ad9f7f1..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/02-custom-node-placement.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: - nodePlacement: - nodeSelector: - key1: value1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/03-assert.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/03-assert.yaml deleted file mode 100644 index c41d1b1fd64..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/03-assert.yaml +++ /dev/null @@ -1,64 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml b/test/openshift/e2e/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml deleted file mode 100644 index d3e895cd909..00000000000 --- a/test/openshift/e2e/parallel/1-082_validate_node_placement/03-node-placement-with-toleration.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: basic -spec: - nodePlacement: - nodeSelector: - key1: value1 - tolerations: - - key: key1 - operator: Equal - value: value1 - effect: NoSchedule - \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-assert.yaml b/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-assert.yaml deleted file mode 100644 index 7aef4ded9cd..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: namespace-gitops-2038 -status: - phase: Available - diff --git a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-install.yaml b/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-install.yaml deleted file mode 100644 index cfc05982ac4..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: namespace-gitops-2038 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: namespace-gitops-2038 -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-assert.yaml b/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-assert.yaml deleted file mode 100644 index cc8de5a0b26..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - namespace: namespace-gitops-2038 - annotations: - foo: gitops-configmap - name: gitops-configmap - diff --git a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml b/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml deleted file mode 100644 index 2d82f3d3c33..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/02-install-kustomize-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: app-kustomize - namespace: namespace-gitops-2038 -spec: - project: default - source: - - repoURL: https://github.com/redhat-developer/gitops-operator.git - path: test/examples/kustomize-example - targetRevision: HEAD - destination: - server: 'https://kubernetes.default.svc' - namespace: namespace-gitops-2038 - syncPolicy: - automated: {} - diff --git a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/99-delete.yaml b/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/99-delete.yaml deleted file mode 100644 index 55a447e1e02..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_kustomize_namereference/99-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: namespace-gitops-2038 - diff --git a/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml b/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml deleted file mode 100644 index 1eff3b22c11..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-argocd-with-resource-customization-subkeys.yaml +++ /dev/null @@ -1,86 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - resourceIgnoreDifferences: - all: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldsManagers: - - xyz - - abc - resourceIdentifiers: - - group: apps - kind: deployments - customization: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldManagers: - - xyz - - abc - - group: batch - kind: jobs - customization: - jqPathExpressions: - - xyz - - abc - jsonPointers: - - xyz - - abc - managedFieldsManagers: - - xyz - - abc - resourceHealthChecks: - - group: certmanager.k8s.io - kind: Certificate - check: | - hs = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" - hs.message = "Waiting for certificate" - return hs - resourceActions: - - group: apps - kind: Deployment - action: | - discovery.lua: | - actions = {} - actions["restart"] = {} - return actions - definitions: - - name: restart - # Lua Script to modify the obj - action.lua: | - local os = require("os") - if obj.spec.template.metadata == nil then - obj.spec.template.metadata = {} - end - if obj.spec.template.metadata.annotations == nil then - obj.spec.template.metadata.annotations = {} - end - obj.spec.template.metadata.annotations["kubectl.kubernetes.io/restartedAt"] = os.date("!%Y-%m-%dT%XZ") - return obj \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml b/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml deleted file mode 100644 index 02b66a8bd68..00000000000 --- a/test/openshift/e2e/parallel/1-083_validate_resource_customization_subkeys/01-assert.yaml +++ /dev/null @@ -1,88 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-cm -data: - admin.enabled: "true" - application.instanceLabelKey: app.kubernetes.io/instance - application.resourceTrackingMethod: label - ga.anonymizeusers: "false" - ga.trackingid: "" - help.chatText: "" - help.chatUrl: "" - kustomize.buildOptions: "" - oidc.config: "" - resource.customizations.actions.apps_Deployment: | - discovery.lua: | - actions = {} - actions["restart"] = {} - return actions - definitions: - - name: restart - # Lua Script to modify the obj - action.lua: | - local os = require("os") - if obj.spec.template.metadata == nil then - obj.spec.template.metadata = {} - end - if obj.spec.template.metadata.annotations == nil then - obj.spec.template.metadata.annotations = {} - end - obj.spec.template.metadata.annotations["kubectl.kubernetes.io/restartedAt"] = os.date("!%Y-%m-%dT%XZ") - return obj - resource.customizations.health.certmanager.k8s.io_Certificate: | - hs = {} - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "False" then - hs.status = "Degraded" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" - hs.message = "Waiting for certificate" - return hs - resource.customizations.ignoreDifferences.all: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: - - xyz - - abc - resource.customizations.ignoreDifferences.apps_deployments: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: [] - resource.customizations.ignoreDifferences.batch_jobs: | - jqpathexpressions: - - xyz - - abc - jsonpointers: - - xyz - - abc - managedfieldsmanagers: - - xyz - - abc \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml b/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml deleted file mode 100644 index a18fcb9fece..00000000000 --- a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-argocd-ingress.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - example: example-argocd -spec: - server: - host: test-crane.apps.rh-4.12-111111.dev.openshift.org - grpc: - ingress: - enabled: true - ingress: - enabled: true - tls: - - hosts: - - test-crane diff --git a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-assert.yaml b/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-assert.yaml deleted file mode 100644 index 5632d347ddf..00000000000 --- a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: example-argocd-server diff --git a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/02-assert.yaml b/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/02-assert.yaml deleted file mode 100644 index de4465aa55f..00000000000 --- a/test/openshift/e2e/parallel/1-084_validate_status_host_ingress/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - host: test-crane.apps.rh-4.12-111111.dev.openshift.org diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-assert.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-assert.yaml deleted file mode 100644 index 8185706d1c6..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-install.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-install.yaml deleted file mode 100644 index 955aaaef8b0..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/01-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-assert.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-assert.yaml deleted file mode 100644 index 352218d8d35..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - serviceAccountName: default - automountServiceAccountToken: false - serviceAccount: default -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml deleted file mode 100644 index e76ef9c8dc8..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/02-modify-argocd.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: false - serviceaccount: default \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-assert.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-assert.yaml deleted file mode 100644 index 54eb04d1abf..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: modified-default ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - serviceAccountName: modified-default - automountServiceAccountToken: true - serviceAccount: modified-default -status: - readyReplicas: 1 - \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml deleted file mode 100644 index be0e8f43f9d..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/04-modify-serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: ServiceAccount -apiVersion: v1 -metadata: - name: modified-default ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: true - serviceaccount: modified-default \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-assert.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-assert.yaml deleted file mode 100644 index f4645c1343a..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Add checks for serviceAccountName and serviceAccount after fixing https://issues.redhat.com/browse/GITOPS-2452 -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-repo-server -spec: - template: - spec: - automountServiceAccountToken: false -status: - readyReplicas: 1 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml b/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml deleted file mode 100644 index 13e98fa5359..00000000000 --- a/test/openshift/e2e/parallel/1-087_validate_repo_server_settings/05-reset-repo-settings.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - repo: - mountsatoken: - serviceaccount: \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-assert.yaml b/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-assert.yaml deleted file mode 100644 index a481801527d..00000000000 --- a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: example-argocd-argocd-dex-server diff --git a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-install.yaml b/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-install.yaml deleted file mode 100644 index 29de2e73e7e..00000000000 --- a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/01-install.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - labels: - examples: route -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true diff --git a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml b/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml deleted file mode 100644 index 631e2d8d45e..00000000000 --- a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/02-check-clientSecret-cm.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - clientSecret=$(oc get configmap argocd-cm -n $NAMESPACE -o jsonpath='{.data.dex\.config}' | grep clientSecret | awk -F' ' '{print $2}') - if test "$clientSecret" != "\$oidc.dex.clientSecret"; then - echo "Client secret exposed!" - exit 1 - fi - exit 0 diff --git a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml b/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml deleted file mode 100644 index 138cf6ce64f..00000000000 --- a/test/openshift/e2e/parallel/1-095_validate_dex_clientsecret/03-verify-clientsecret-secret.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # This test validates the Dex Client Secret copied by the operator from dex serviceaccount token secret in to argocd-secret. - # To verify the behavior we should first get the token secret name of the dex service account. - secret=$(oc get -n $NAMESPACE sa example-argocd-argocd-dex-server -o json | jq -r '.secrets[] | select(.name | contains("token")) | .name') - - # Extract the clientSecret - expectedClientSecret=$(oc get secret $secret -n $NAMESPACE -o json | jq -r '.data.token') - - # actualClientSecret is the value of the secret in argocd-secret where argocd-operator should copy the secret from - actualClientSecret=$(oc get secret argocd-secret -o json -n $NAMESPACE | jq -r '.data."oidc.dex.clientSecret"') - - # Verify - if [[ $expectedClientSecret != $actualClientSecret ]]; then - echo "Error: Dex Client Secret for OIDC is not valid" - exit 1 - fi diff --git a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-assert.yaml b/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-assert.yaml deleted file mode 100644 index cf4e8aacbb1..00000000000 --- a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-assert.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: example-argocd-argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-install.yaml b/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-install.yaml deleted file mode 100644 index 999eb47f1a9..00000000000 --- a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/01-install.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml b/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml deleted file mode 100644 index 25defd5b710..00000000000 --- a/test/openshift/e2e/parallel/1-098_validate_dex_clientsecret/02-verify-clientsecret.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - # This test validates the Dex Client Secret copied by the operator from dex serviceaccount token secret in to argocd-secret. - # To verify the behavior we should first get the token secret name of the dex service account. - secret=$(oc get -n $NAMESPACE sa example-argocd-argocd-dex-server -o json | jq -r '.secrets' | grep token | sed 's/ "name": "//g' | sed 's/"//g') - - # Extract the clientSecret - expectedClientSecret=$(oc get secret $secret -n $NAMESPACE -o json | jq -r '.data.token') - - # actualClientSecret is the value of the secret in argocd-secret where argocd-operator should copy the secret from - actualClientSecret=$(oc get secret argocd-secret -o json -n $NAMESPACE | jq -r '.data."oidc.dex.clientSecret"') - - # Verify - if $expectedClientSecret != $actualClientSecret; then - echo "Error: Dex Client Secret for OIDC is not valid" - exit 1 - fi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-assert.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-assert.yaml deleted file mode 100644 index aadbf9f9ca4..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -status: - phase: Available ---- -kind: Deployment -apiVersion: apps/v1 -metadata: - name: example-argocd-server -spec: - replicas: 2 -status: - conditions: - - type: Available - status: 'True' - - type: Progressing - status: 'True' diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-install.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-install.yaml deleted file mode 100644 index 58dc91c4f8c..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml deleted file mode 100644 index 6e30d1c7b3f..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/02-enable-server-autoscale.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 - autoscale: - enabled: true - hpa: - minReplicas: 4 - maxReplicas: 7 - targetCPUUtilizationPercentage: 50 - scaleTargetRef: - kind: deployment - apiVersion: apps/v1 - name: example-argocd-server diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml deleted file mode 100644 index b3ddd875b67..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/03-check-server-replicas.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: sleep 45 -- script: | - set -e - serverReplicas=$(kubectl get -n $NAMESPACE deployment/example-argocd-server -o jsonpath='{.spec.replicas}') - - if [ "$serverReplicas" -ge 4 ] && [ "$serverReplicas" -le 7 ]; then - echo "server replica count matches expectation" - exit 0 - fi - exit 1 - done diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-assert.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-assert.yaml deleted file mode 100644 index 3fafb2f0b4d..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-assert.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: example-argocd-server -spec: - maxReplicas: 12 - metrics: - - resource: - name: cpu - target: - averageUtilization: 50 - type: Utilization - type: Resource - minReplicas: 8 - scaleTargetRef: - apiVersion: apps/v1 - kind: deployment - name: example-argocd-server diff --git a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml b/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml deleted file mode 100644 index 9157a38ef15..00000000000 --- a/test/openshift/e2e/parallel/1-099_validate_server_autoscale/04-update-hpa.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd -spec: - server: - replicas: 2 - autoscale: - enabled: true - hpa: - minReplicas: 8 - maxReplicas: 12 - targetCPUUtilizationPercentage: 50 - scaleTargetRef: - kind: deployment - apiVersion: apps/v1 - name: example-argocd-server diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml deleted file mode 100644 index 25a05427feb..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-service-argocd diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml deleted file mode 100644 index 25a05427feb..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/01-install.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: gitops-service-argocd diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml deleted file mode 100644 index 3ee2c131f67..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: gitops-service-argocd - namespace: gitops-service-argocd -status: - phase: Available ---- -kind: Namespace -apiVersion: v1 -metadata: - name: jane - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: jane - finalizers: - - some.random/finalizer diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml deleted file mode 100644 index f816740dff7..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/02-install.yaml +++ /dev/null @@ -1,198 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - finalizers: - - argoproj.io/finalizer - name: gitops-service-argocd - namespace: gitops-service-argocd -spec: - resourceInclusions: | - - apiGroups: - - "" - kinds: - - "PersistentVolumeClaim" - - "PersistentVolume" - - "Secret" - - "ConfigMap" - - "Pod" - - "Endpoint" - - "Service" - - "ServiceAccounts" - clusters: - - "*" - - apiGroups: - - "apps" - kinds: - - "ReplicaSet" - - "StatefulSet" - - "DaemonSet" - - "Deployment" - clusters: - - "*" - - apiGroups: - - "discovery.k8s.io" - kinds: - - "EndpointSlice" - clusters: - - "*" - - apiGroups: - - "networking.k8s.io" - kinds: - - "Ingress" - - "IngressClass" - clusters: - - "*" - - apiGroups: - - "rbac.authorization.k8s.io" - kinds: - - "RoleBinding" - - "Role" - clusters: - - "*" - - apiGroups: - - "route.openshift.io" - kinds: - - "Route" - clusters: - - "*" - - apiGroups: - - "triggers.tekton.dev" - kinds: - - "EventListener" - - "TriggerTemplate" - clusters: - - "*" - - apiGroups: - - "pipelinesascode.tekton.dev" - kinds: - - "Repository" - clusters: - - "*" - applicationSet: - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 250m - memory: 128Mi - controller: - logLevel: "debug" - processors: {} - resources: - limits: - cpu: "2" - memory: 3Gi - requests: - cpu: 250m - memory: 256Mi - env: - - name: ARGOCD_RECONCILIATION_TIMEOUT - value: 60s - sharding: {} -# dex: -# enabled: false -# openShiftOAuth: false # true -# resources: -# limits: -# cpu: 500m -# memory: 256Mi -# requests: -# cpu: 250m -# memory: 128Mi - grafana: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - route: - enabled: false - ha: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - initialSSHKnownHosts: {} - prometheus: - enabled: false - ingress: - enabled: false - route: - enabled: false - rbac: - policy: g, system:authenticated, role:admin - scopes: '[groups]' - redis: - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 250m - memory: 128Mi - repo: - logLevel: "debug" - extraRepoCommandArgs: - - --max-combined-directory-manifests-size - - 10M - resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 250m - memory: 256Mi - env: - - name: ARGOCD_RECONCILIATION_TIMEOUT - value: "60s" - server: - logLevel: "debug" - autoscale: - enabled: false - grpc: - ingress: - enabled: false - ingress: - enabled: false - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 125m - memory: 128Mi - route: - enabled: true - tls: - termination: reencrypt - service: - type: "" - tls: - ca: {} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: jane - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config-map-2 - namespace: jane - finalizers: - - some.random/finalizer -data: {} ---- diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml deleted file mode 100644 index f1b46092ae4..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/03-delete-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: kubectl delete ns jane - ignoreFailure: true - timeout: 30 diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml deleted file mode 100644 index 7b9d898b856..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: john - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml deleted file mode 100644 index 7b9d898b856..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/04-create-ns.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: john - labels: - argocd.argoproj.io/managed-by: gitops-service-argocd diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml deleted file mode 100644 index 86f043d675e..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 600 ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: my-app - namespace: gitops-service-argocd -status: - sync: - status: Synced diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml deleted file mode 100644 index b0807129715..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/05-create-app.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: my-app - namespace: gitops-service-argocd -spec: - destination: - namespace: john - server: https://kubernetes.default.svc - project: default - source: - repoURL: https://github.com/redhat-developer/gitops-operator - path: test/examples/kustomize-guestbook - targetRevision: master - syncPolicy: - automated: - prune: true - selfHeal: true diff --git a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml b/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml deleted file mode 100644 index 575eef2fe27..00000000000 --- a/test/openshift/e2e/parallel/1-102_validate_handle_terminating_namespaces/99-delete.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch cm/my-config-map-2 -n jane --type json --patch='[ { "op": "remove", "path": "/metadata/finalizers" }]'] -delete: -- apiVersion: v1 - kind: Namespace - name: gitops-service-argocd -- apiVersion: v1 - kind: Namespace - name: john diff --git a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml b/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml deleted file mode 100644 index 98ae37baf04..00000000000 --- a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-alpha_argocd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - dex: - openShiftOAuth: true - server: - route: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml b/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml deleted file mode 100644 index 110eb0637c7..00000000000 --- a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true -status: - phase: Available - sso: Running diff --git a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml b/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml deleted file mode 100644 index fd9f5918ae9..00000000000 --- a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml b/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml deleted file mode 100644 index 67165d6b510..00000000000 --- a/test/openshift/e2e/parallel/1-103_argocd_alpha_to_beta_conversion/02-errors.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true - server: - route: - enabled: true diff --git a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml b/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml deleted file mode 100644 index 567be56e84f..00000000000 --- a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-104-appsets-scm-tls-mount -spec: - applicationSet: - scmRootCAConfigMap: test-1-104-appsets-scm-tls-cm -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-applicationset-controller - namespace: test-1-104-appsets-scm-tls-mount - labels: - app.kubernetes.io/component: controller - app.kubernetes.io/managed-by: argocd - app.kubernetes.io/name: argocd-applicationset-controller - app.kubernetes.io/part-of: argocd -spec: - selector: - matchLabels: - app.kubernetes.io/name: argocd-applicationset-controller - template: - spec: - containers: - - command: - - entrypoint.sh - - argocd-applicationset-controller - - --argocd-repo-server - - argocd-repo-server.test-1-104-appsets-scm-tls-mount.svc.cluster.local:8081 - - --loglevel - - info - - --logformat - - text - - --scm-root-ca-path - - /app/tls/scm/cert - volumeMounts: - - mountPath: /app/config/ssh - name: ssh-known-hosts - - mountPath: /app/config/tls - name: tls-certs - - mountPath: /app/config/gpg/source - name: gpg-keys - - mountPath: /app/config/gpg/keys - name: gpg-keyring - - mountPath: /tmp - name: tmp - - mountPath: /app/tls/scm/ - name: appset-gitlab-scm-tls-cert - volumes: - - configMap: - defaultMode: 420 - name: argocd-ssh-known-hosts-cm - name: ssh-known-hosts - - configMap: - defaultMode: 420 - name: argocd-tls-certs-cm - name: tls-certs - - configMap: - defaultMode: 420 - name: argocd-gpg-keys-cm - name: gpg-keys - - emptyDir: {} - name: gpg-keyring - - emptyDir: {} - name: tmp - - configMap: - defaultMode: 420 - name: argocd-appset-gitlab-scm-tls-certs-cm - name: appset-gitlab-scm-tls-cert diff --git a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml b/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml deleted file mode 100644 index 68e229e2059..00000000000 --- a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-install.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-104-appsets-scm-tls-mount ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: test-1-104-appsets-scm-tls-cm - namespace: test-1-104-appsets-scm-tls-mount -data: - cert: | - -----BEGIN CERTIFICATE----- - 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 - XWyb96wrUlv+E8I= - -----END CERTIFICATE----- - ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-104-appsets-scm-tls-mount -spec: - applicationSet: - scmRootCAConfigMap: test-1-104-appsets-scm-tls-cm \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/01-assert.yaml b/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/01-assert.yaml deleted file mode 100644 index f4fb03f3b80..00000000000 --- a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/01-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - route: - enabled: true -status: - phase: Available ---- - -# Verify if the argocd-server-tls secret is created by the OpenShift's service CA. -apiVersion: v1 -kind: Secret -metadata: - name: argocd-server-tls - namespace: openshift-gitops -type: kubernetes.io/tls ---- - -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - port: - targetPort: https - tls: - insecureEdgeTerminationPolicy: Redirect - termination: reencrypt - to: - kind: Service - name: openshift-gitops-server - weight: 100 -status: - ingress: - - conditions: - - status: "True" - type: Admitted diff --git a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-assert.yaml b/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-assert.yaml deleted file mode 100644 index 0070bd255c8..00000000000 --- a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-assert.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - route: - enabled: true - tls: - termination: passthrough - insecureEdgeTerminationPolicy: None - -status: - phase: Available ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - port: - targetPort: https - tls: - insecureEdgeTerminationPolicy: None - termination: passthrough - to: - kind: Service - name: openshift-gitops-server - weight: 100 -status: - ingress: - - conditions: - - status: "True" - type: Admitted diff --git a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-update_tls.yaml b/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-update_tls.yaml deleted file mode 100644 index 9de6498896a..00000000000 --- a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/02-update_tls.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - route: - enabled: true - tls: - termination: passthrough - insecureEdgeTerminationPolicy: None \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/03-cleanup.yaml b/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/03-cleanup.yaml deleted file mode 100644 index 63a5826483e..00000000000 --- a/test/openshift/e2e/parallel/1-105_validate_default_argocd_route/03-cleanup.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patch the Argo CD CR to revert the updates to TLS Config -- script: | - kubectl patch argocd openshift-gitops -n openshift-gitops --type='json' -p='[{"op": "remove", "path": "/spec/server/route/tls"}]' -- script: sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-assert.yaml b/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-assert.yaml deleted file mode 100644 index cfb93abac96..00000000000 --- a/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-assert.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-0 -spec: - initContainers: - - name: argocd-init - image: nginx:latest - imagePullPolicy: Always - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi - containers: - - name: argocd-application-controller diff --git a/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-install.yaml b/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-install.yaml deleted file mode 100644 index bedb5834189..00000000000 --- a/test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-install.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - initContainers: - - name: argocd-init - image: nginx:latest - imagePullPolicy: Always - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-assert.yaml b/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-assert.yaml deleted file mode 100644 index ebeace11ed2..00000000000 --- a/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-assert.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - selector: - matchLabels: - app.kubernetes.io/name: argocd-server - template: - spec: - initContainers: - - name: argocd-init - image: nginx:latest - imagePullPolicy: Always - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi - containers: - - name: argocd-server diff --git a/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-install.yaml b/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-install.yaml deleted file mode 100644 index be1c0defa1f..00000000000 --- a/test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-install.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - initContainers: - - name: argocd-init - image: nginx:latest - imagePullPolicy: Always - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-assert.yaml b/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-assert.yaml deleted file mode 100644 index 31dc711ec81..00000000000 --- a/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-assert.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd ---- -apiVersion: v1 -kind: Pod -metadata: - name: argocd-application-controller-0 -spec: - containers: - - name: argocd-application-controller - - name: sidecar - image: busybox - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi diff --git a/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-install.yaml b/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-install.yaml deleted file mode 100644 index 372a693a698..00000000000 --- a/test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-install.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - controller: - sidecarContainers: - - name: sidecar - image: busybox - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-assert.yaml b/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-assert.yaml deleted file mode 100644 index b865dd30e53..00000000000 --- a/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - selector: - matchLabels: - app.kubernetes.io/name: argocd-server - template: - spec: - containers: - - name: argocd-server - - name: sidecar - image: busybox - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi diff --git a/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-install.yaml b/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-install.yaml deleted file mode 100644 index 00a1761e3b1..00000000000 --- a/test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-install.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: argocd -spec: - server: - sidecarContainers: - - name: sidecar - image: busybox - resources: - limits: - cpu: 50m - memory: 64Mi - requests: - cpu: 10m - memory: 32Mi \ No newline at end of file diff --git a/test/openshift/e2e/parallel/kuttl-test.yaml b/test/openshift/e2e/parallel/kuttl-test.yaml deleted file mode 100644 index 788001a60a3..00000000000 --- a/test/openshift/e2e/parallel/kuttl-test.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestSuite -name: gitops-operator-e2e -testDirs: - - . -suppress: - - events -parallel: 5 -timeout: 1200 -reportFormat: JSON -reportName: openshift-gitops-e2e diff --git a/test/openshift/e2e/sequential/1-002_validate_backend_service/01-assert.yaml b/test/openshift/e2e/sequential/1-002_validate_backend_service/01-assert.yaml deleted file mode 100644 index 199a89ba362..00000000000 --- a/test/openshift/e2e/sequential/1-002_validate_backend_service/01-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# We need the openshift-gitops namespace installed by default -apiVersion: v1 -kind: Namespace -metadata: - name: openshift-gitops ---- -# We need a cluster deployment in the namespace -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -status: - replicas: 1 - readyReplicas: 1 ---- -# Service for cluster exists -apiVersion: v1 -kind: Service -metadata: - name: cluster - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-002_validate_backend_service/01-check-backend-service.yaml b/test/openshift/e2e/sequential/1-002_validate_backend_service/01-check-backend-service.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml deleted file mode 100644 index 2d659ebe0d8..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-assert.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: source-ns ---- -apiVersion: v1 -kind: Namespace -metadata: - name: target-ns - labels: - argocd.argoproj.io/managed-by: source-ns ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: source-ns -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: AppProject -metadata: - name: default - namespace: source-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: target-ns ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: target-ns diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-install.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-install.yaml deleted file mode 100644 index 9514336389d..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/01-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: source-ns ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: source-ns -spec: - server: - route: - enabled: true ---- -apiVersion: v1 -kind: Namespace -metadata: - name: target-ns - labels: - argocd.argoproj.io/managed-by: source-ns diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml deleted file mode 100644 index 6b1544c0f9d..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: source-ns-openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml deleted file mode 100644 index 6b1544c0f9d..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/02-create-rbac.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -rules: -- apiGroups: - - '*' - resources: - - '*' - verbs: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: source-ns-openshift-gitops-argocd-application-controller - namespace: source-ns -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: source-ns-openshift-gitops-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml deleted file mode 100644 index ae8b9ebc84f..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-assert.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nginx - namespace: source-ns -status: - health: - status: Healthy - sync: - status: Synced diff --git a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml b/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml deleted file mode 100644 index 068dae3e813..00000000000 --- a/test/openshift/e2e/sequential/1-008_validate-4.9CI-Failures/03-create-app.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nginx - namespace: source-ns -spec: - destination: - namespace: target-ns - server: 'https://kubernetes.default.svc' - project: default - source: - path: test/examples/nginx - repoURL: 'https://github.com/redhat-developer/gitops-operator' - targetRevision: HEAD - syncPolicy: - automated: {} -status: {} diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-assert.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-assert.yaml deleted file mode 100644 index 573dc318210..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available - redis: Running ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-errors.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-errors.yaml deleted file mode 100644 index adabb658cda..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/01-errors.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis-ha - namespace: openshift-gitops ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-redis-ha-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-assert.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-assert.yaml deleted file mode 100644 index 1d147377f43..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-assert.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# HA testing will require atleast 3 node cluster - -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis-ha - namespace: openshift-gitops ---- -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available - redis: Running ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-redis-ha-server - namespace: openshift-gitops -spec: - template: - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app.kubernetes.io/name: openshift-gitops-redis-ha -status: - readyReplicas: 3 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-enable-ha.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-enable-ha.yaml deleted file mode 100644 index bd18fcb9813..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-enable-ha.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - ha: - enabled: true diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-errors.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-errors.yaml deleted file mode 100644 index c8ca45c3def..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/02-errors.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-assert.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-assert.yaml deleted file mode 100644 index 4a48673f8c0..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-assert.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available - redis: Running ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops -spec: - template: - spec: - containers: - - name: haproxy - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi - initContainers: - - name: config-init - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi -status: - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-redis-ha-server - namespace: openshift-gitops -spec: - template: - spec: - containers: - - name: redis - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi - - name: sentinel - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi - initContainers: - - name: config-init - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi -status: - readyReplicas: 3 diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-update-ha-resources.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-update-ha-resources.yaml deleted file mode 100644 index d4742ee48bf..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/03-update-ha-resources.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - ha: - enabled: true - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 200m - memory: 128Mi diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-assert.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-assert.yaml deleted file mode 100644 index 418f27fc26e..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-assert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 720 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available - redis: Running ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -status: - readyReplicas: 1 diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-disable-ha.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-disable-ha.yaml deleted file mode 100644 index 38b9606127b..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-disable-ha.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - ha: - enabled: false diff --git a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-errors.yaml b/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-errors.yaml deleted file mode 100644 index 5d73ac5cfcb..00000000000 --- a/test/openshift/e2e/sequential/1-020_validate_redis_ha_nonha/04-errors.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis-ha-haproxy - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-redis-ha-server - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-026-validate_backend_service_permissions/01-assert.yaml b/test/openshift/e2e/sequential/1-026-validate_backend_service_permissions/01-assert.yaml deleted file mode 100644 index 93dbf371da0..00000000000 --- a/test/openshift/e2e/sequential/1-026-validate_backend_service_permissions/01-assert.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - serviceAccount: gitops-service-cluster - serviceAccountName: gitops-service-cluster ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: gitops-service-cluster - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: gitops-service-cluster -rules: -- apiGroups: - - argoproj.io - resources: - - applications - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - secrets - verbs: - - get - - list - - watch ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: gitops-service-cluster -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: gitops-service-cluster -subjects: -- kind: ServiceAccount - name: gitops-service-cluster - namespace: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-026-validate_backend_service_permissions/01-check-backend-service.yaml b/test/openshift/e2e/sequential/1-026-validate_backend_service_permissions/01-check-backend-service.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml deleted file mode 100644 index a6eded59e88..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-assert.yaml +++ /dev/null @@ -1,93 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 1200 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-install.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-install.yaml deleted file mode 100644 index 0d9b35e8729..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/01-install.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# We must not use declarative update/creation for gitopsservice, because kuttl -# would delete the resource after the test finishes. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"runOnInfra": true, "tolerations": [{"effect": "NoSchedule", "key": "infra", "value": "reserved"}]}}' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-assert.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-assert.yaml deleted file mode 100644 index dc419f1680a..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-assert.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml deleted file mode 100644 index 0d8201294b2..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-custom-argocd.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-errors.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-errors.yaml deleted file mode 100644 index 89840612532..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/02-errors.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-repo-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-redis -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: argocd-application-controller -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/03-change-back.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/03-change-back.yaml deleted file mode 100644 index da1aba0f12d..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/03-change-back.yaml +++ /dev/null @@ -1,7 +0,0 @@ - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=json --patch='[{"op": "remove", "path": "/spec/tolerations"}, {"op": "remove", "path": "/spec/runOnInfra"}]' - oc patch statefulset openshift-gitops-application-controller -n openshift-gitops -p '{"spec":{"replicas":0}}' diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/04-check.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/04-check.yaml deleted file mode 100644 index 5bc157c55cc..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/04-check.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -timeout: 1200 -error: -- errors.yaml \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml b/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml deleted file mode 100644 index 277cccd5924..00000000000 --- a/test/openshift/e2e/sequential/1-028_validate_run_on_infra/errors.yaml +++ /dev/null @@ -1,89 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-assert.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-assert.yaml deleted file mode 100644 index c05075a77a1..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-assert.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-034-custom -status: - phase: Available ---- -apiVersion: v1 -kind: Namespace -metadata: - name: custom-role-namespace - labels: - argocd.argoproj.io/managed-by: test-1-034-custom ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: custom-argocd-role -rules: - - verbs: - - list - - watch - - get - apiGroups: - - '*' - resources: - - '*' ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-server -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-argocd-application-controller -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-install.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-install.yaml deleted file mode 100644 index c4cde52d606..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/01-install.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Create a new namespace -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-034-custom ---- -# Create an Argo CD instance in the new namespace -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - namespace: test-1-034-custom ---- -# Create a test namespace with managed-by label -apiVersion: v1 -kind: Namespace -metadata: - name: custom-role-namespace - labels: - argocd.argoproj.io/managed-by: test-1-034-custom ---- -# Create a sample cluster role for application-controller and server -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: custom-argocd-role -rules: - - verbs: - - list - - watch - - get - apiGroups: - - '*' - resources: - - '*' diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml deleted file mode 100644 index 51c34e1904d..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/02-patch-subscription.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Add env variables specifying custom roles -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator CONTROLLER_CLUSTER_ROLE=custom-argocd-role - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator SERVER_CLUSTER_ROLE=custom-argocd-role - - elif ! [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'`\ - --type merge --patch '{"spec": {"config": {"env": [{"name": "CONTROLLER_CLUSTER_ROLE", "value": "custom-argocd-role"},{"name": "SERVER_CLUSTER_ROLE", "value": "custom-argocd-role"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "CONTROLLER_CLUSTER_ROLE", "value": "custom-argocd-role"},{"name": "SERVER_CLUSTER_ROLE", "value": "custom-argocd-role"}]}}}' - - fi -- script: sleep 10 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/03-errors.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/03-errors.yaml deleted file mode 100644 index 2c1866eea4c..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/03-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Check if the default roles are removed from the namespace -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-application-controller - namespace: test-1-034-custom \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/04-assert.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/04-assert.yaml deleted file mode 100644 index 0fafcbabdff..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/04-assert.yaml +++ /dev/null @@ -1,56 +0,0 @@ -# Check if the Rolebindings are updated in all the namespaces -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: custom-role-namespace -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-server - namespace: test-1-034-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-server - namespace: test-1-034-custom ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-application-controller - namespace: test-1-034-custom -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: custom-argocd-role -subjects: -- kind: ServiceAccount - name: argocd-argocd-application-controller - namespace: test-1-034-custom \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/05-delete.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/05-delete.yaml deleted file mode 100644 index 5a56e8ae1e4..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/05-delete.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: argocd - namespace: test-1-034-custom -- apiVersion: v1 - kind: Namespace - name: test-1-034-custom -- apiVersion: v1 - kind: Namespace - name: custom-role-namespace -- apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRole - name: custom-argocd-role \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-034_validate_custom_roles/06-revert-patch.yaml b/test/openshift/e2e/sequential/1-034_validate_custom_roles/06-revert-patch.yaml deleted file mode 100644 index bbdcfae3ae4..00000000000 --- a/test/openshift/e2e/sequential/1-034_validate_custom_roles/06-revert-patch.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator SERVER_CLUSTER_ROLE=null - - elif ! [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]' - else - oc patch subscription/openshift-gitops-operator -n openshift-gitops-operator --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]' - fi -- script: | - # Loop to wait until SERVER_CLUSTER_ROLE is removed from the Argo CD server Deployment - for i in {1..30}; do - if oc get deployment openshift-gitops-argocd-server -n openshift-gitops -o jsonpath='{.spec.template.spec.containers[0].env}' | grep -q 'SERVER_CLUSTER_ROLE=custom-argocd-role'; then - echo "Waiting for SERVER_CLUSTER_ROLE to be removed..." - sleep 5 - else - echo "SERVER_CLUSTER_ROLE has been removed." - break - fi - done - # If after the loop the variable is still set, fail the step - if oc get deployment openshift-gitops-argocd-server -n openshift-gitops -o jsonpath='{.spec.template.spec.containers[0].env}' | grep -q 'SERVER_CLUSTER_ROLE=custom-argocd-role'; then - echo "ERROR: SERVER_CLUSTER_ROLE was not removed after waiting." - exit 1 - fi diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml deleted file mode 100644 index c2b24451f88..00000000000 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/01-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml deleted file mode 100644 index 5aaa3061a7e..00000000000 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/02-remove_secret_data.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch secret/argocd-secret -p '{"data":null}' -n openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml deleted file mode 100644 index 70d6fc9f34d..00000000000 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Check if the argocd-secret was repopulated -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - until [[ $i -eq 20 ]] - do - secret_data=$(oc get secret/argocd-secret -n openshift-gitops -o custom-columns=SECRET:.data --no-headers) - if [[ $secret_data == "" ]] - then - i=$((i+1)) - sleep 6 - else - echo "argocd-secret was repopulated" - exit 0 - fi - done - - echo "argocd-secret was not repopulated" - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml deleted file mode 100644 index 12e333c409b..00000000000 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/04-check_controller_pod_status.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Check if the openshift-gitops-operator-controller-manager pod is running -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc rollout status deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator --timeout=1m - rollout_status=$? - if [ "${rollout_status}" -ne 0 ]; then - echo "openshift-gitops-operator-controller-manager deployment was not successfully rolled out" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml b/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml deleted file mode 100644 index c6165d11500..00000000000 --- a/test/openshift/e2e/sequential/1-035_validate_argocd_secret_repopulate/05-argocd_login.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") - password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - output=$(argocd login $api_server --username admin --password $password --insecure) - - if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then - if [[ "${output}" == *"rpc error: code = Unknown desc = server.secretkey is missing" ]]; then - echo "server.secretkey is missing" - exit 1 - fi - fi - exit 0 - diff --git a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml b/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml deleted file mode 100644 index 3477e93c28f..00000000000 --- a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/01-login_argocd_api_server.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") - password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) - - # '--skip-test-tls' parameter was added in Feb 2025, to work around OpenShift Routes not supporting HTTP2 by default, along with Argo CD upstream bugs https://github.com/argoproj/argo-cd/issues/21764, and https://github.com/argoproj/argo-cd/issues/20121 - # '--skip-test-tls' should be removed once we have resolved these issues. - - output=$(argocd login $api_server --username admin --password $password --insecure --skip-test-tls) - - if ! [[ "${output}" =~ "'admin:login' logged in successfully" ]]; then - exit 1 - fi - exit 0 - diff --git a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml b/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml deleted file mode 100644 index 6039fb04ef7..00000000000 --- a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/02-create_role.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - output=$(argocd proj role create default somerole) - - if ! [[ "$output" =~ "Role 'somerole' created" ]]; then - echo "Error creating role" - exit 1 - fi - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml b/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml deleted file mode 100644 index 7a096dd9d63..00000000000 --- a/test/openshift/e2e/sequential/1-040_validate_quoted_RBAC_group_names/03-specify_group_names.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - output=$(argocd proj role add-group default somerole '"CN=foo,OU=bar,O=baz"') - - cleanup() { - argocd proj role delete default somerole - } - trap cleanup INT TERM EXIT - - if ! [[ "${output}" =~ "added to role 'somerole'" ]]; then - echo "Contains comma characters!" - exit 1 - fi diff --git a/test/openshift/e2e/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml b/test/openshift/e2e/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml deleted file mode 100644 index 0257afc12d1..00000000000 --- a/test/openshift/e2e/sequential/1-041_validate_argocd_sync_alert/01-assert.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops -spec: - groups: - - name: GitOpsOperatorArgoCD - rules: - - alert: ArgoCDSyncAlert - annotations: - summary: Argo CD application is out of sync - description: Argo CD application {{ $labels.name }} is out of sync. Check ArgoCDSyncAlert status, this alert is designed to notify that an application managed by Argo CD is out of sync. - expr: argocd_app_info{namespace="openshift-gitops",sync_status="OutOfSync"} > 0 - for: 5m - labels: - severity: warning \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/01-assert.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/01-assert.yaml deleted file mode 100644 index d26b59dcd3d..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/01-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Running ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: v1 -kind: Service -metadata: - name: argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/01-install.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/01-install.yaml deleted file mode 100644 index 9e8bc52dfc6..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/01-install.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: dex - dex: - openShiftOAuth: true \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/02-assert.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/02-assert.yaml deleted file mode 100644 index b655143521c..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/02-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Unknown \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/02-errors.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/02-errors.yaml deleted file mode 100644 index 29e4f1025ab..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/02-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argocd-dex-server ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: argocd-argocd-dex-server ---- -apiVersion: v1 -kind: Service -metadata: - name: argocd-dex-server \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/02-remove-spec-sso.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/02-remove-spec-sso.yaml deleted file mode 100644 index a19ebd02e03..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/02-remove-spec-sso.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the CR to remove .spec.sso -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "remove", "path": "/spec/sso"}]' -- script: sleep 10 diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/07-assert.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/07-assert.yaml deleted file mode 100644 index 71c1b676419..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/07-assert.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Pending - sso: Failed \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/07-errors.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/07-errors.yaml deleted file mode 100644 index 7e00cea3291..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/07-errors.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml deleted file mode 100644 index 1b7234cec5f..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/07-provider-keycloak-dex-spec.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -spec: - sso: - provider: keycloak - dex: - config: test \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/08-assert.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/08-assert.yaml deleted file mode 100644 index bf94f95293e..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/08-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd -status: - phase: Available - sso: Running ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - name: keycloak \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-050_validate_sso/08-remove-spec-dex.yaml b/test/openshift/e2e/sequential/1-050_validate_sso/08-remove-spec-dex.yaml deleted file mode 100644 index f58c6e269db..00000000000 --- a/test/openshift/e2e/sequential/1-050_validate_sso/08-remove-spec-dex.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the CR to remove .spec.sso -- script: | - oc patch -n $NAMESPACE argocd/argocd --type='json' -p='[{"op": "remove", "path": "/spec/sso/dex"}]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/01-assert.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/01-assert.yaml deleted file mode 100644 index baf2f329c9a..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/01-assert.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom - labels: - argocd.argoproj.io/managed-by: test-1-56-target ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - namespace: test-1-56-target -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-redis - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-repo-server - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-server - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-application-controller - namespace: test-1-56-target -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/01-install.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/01-install.yaml deleted file mode 100644 index ec183bee84e..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/01-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom - labels: - argocd.argoproj.io/managed-by: test-1-56-target ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd - namespace: test-1-56-target -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/02-delete.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/02-delete.yaml deleted file mode 100644 index 3e4266da0db..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/02-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: example-argocd - namespace: test-1-56-target diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/03-check.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/03-check.yaml deleted file mode 100644 index 69624aed8a6..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/03-check.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -e - label_value=$(oc get ns/test-1-56-custom -o go-template=$'{{index .metadata.labels "argocd.argoproj.io/managed-by"}}') - - echo "label value: ${label_value}" - - if [[ "${label_value}" == "test-1-56-target" ]]; then - echo "managed-by label exists, set REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION variable to delete the label" - exit 0 - fi - exit 1 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/04-add_env.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/04-add_env.yaml deleted file mode 100644 index e7669fb444b..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/04-add_env.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set the environment variable -- script: | - set -e - - if ! [ -z $NON_OLM ]; then - - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION=true - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION", "value": "true"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION", "value": "true"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/05-check.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/05-check.yaml deleted file mode 100644 index dd39153ae23..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/05-check.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION")|.value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION").value') - if [ -z $label_value ]; then - echo "REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION not set" - exit 1 - else - exit 0 - fi - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/06-assert.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/06-assert.yaml deleted file mode 100644 index 61e3efab3f1..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/06-assert.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target-2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-2 - namespace: test-1-56-target-2 -status: - phase: Available ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-redis - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-repo-server - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-argocd-2-server - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: example-argocd-2-application-controller - namespace: test-1-56-target-2 -status: - readyReplicas: 1 - replicas: 1 diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/06-install.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/06-install.yaml deleted file mode 100644 index 57780b8238b..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/06-install.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-target-2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 - labels: - argocd.argoproj.io/managed-by: test-1-56-target-2 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: example-argocd-2 - namespace: test-1-56-target-2 -spec: - server: - route: - enabled: true diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/07-delete.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/07-delete.yaml deleted file mode 100644 index f2b3b38e2c2..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/07-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: argoproj.io/v1alpha1 - kind: ArgoCD - name: example-argocd-2 - namespace: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/07-errors.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/07-errors.yaml deleted file mode 100644 index 5bd4602e1a0..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/07-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-56-custom-2 - labels: - argocd.argoproj.io/managed-by: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/08-remove_env.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/08-remove_env.yaml deleted file mode 100644 index 8f22ee530cc..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/08-remove_env.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to set an environment variable -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator REMOVE_MANAGED_BY_LABEL_ON_ARGOCD_DELETION=null - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - fi diff --git a/test/openshift/e2e/sequential/1-056_validate_managed-by/99-delete.yaml b/test/openshift/e2e/sequential/1-056_validate_managed-by/99-delete.yaml deleted file mode 100644 index df3bf9503b9..00000000000 --- a/test/openshift/e2e/sequential/1-056_validate_managed-by/99-delete.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: -- apiVersion: v1 - kind: Namespace - name: test-1-56-custom -- apiVersion: v1 - kind: Namespace - name: test-1-56-custom-2 -- apiVersion: v1 - kind: Namespace - name: test-1-56-target -- apiVersion: v1 - kind: Namespace - name: test-1-56-target-2 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml deleted file mode 100644 index d10a97921cd..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/01-assert.yaml +++ /dev/null @@ -1,65 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml deleted file mode 100644 index 1b6b57cd8b7..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-assert.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml deleted file mode 100644 index e850ace776b..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/02-custom-node-selector.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"nodeSelector": {"key1": "value1"}}}' diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml deleted file mode 100644 index 6069bc97a78..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-assert.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml deleted file mode 100644 index 7ca77f5c3c3..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/03-patch-run-on-infra.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=merge --patch='{"spec": {"runOnInfra": true, "tolerations": [{"effect": "NoSchedule", "key": "infra", "value": "reserved"}]}}' diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-change-back.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-change-back.yaml deleted file mode 100644 index 9a45ab5f8b6..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-change-back.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch gitopsservice cluster --type=json --patch='[{"op": "remove", "path": "/spec/tolerations"}, {"op": "remove", "path": "/spec/runOnInfra"}, {"op": "remove", "path": "/spec/nodeSelector"}]' - oc patch statefulset openshift-gitops-application-controller -n openshift-gitops -p '{"spec":{"replicas":0}}' diff --git a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml b/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml deleted file mode 100644 index 6069bc97a78..00000000000 --- a/test/openshift/e2e/sequential/1-071_validate_node_selectors/04-errors.yaml +++ /dev/null @@ -1,101 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cluster - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-dex-server - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: openshift-gitops-redis - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: openshift-gitops-application-controller - namespace: openshift-gitops -spec: - template: - spec: - nodeSelector: - kubernetes.io/os: linux - key1: value1 - node-role.kubernetes.io/infra: "" - tolerations: - - effect: NoSchedule - key: infra - value: reserved diff --git a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml b/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml deleted file mode 100644 index 93a363477ce..00000000000 --- a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-assert.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Refer to https://issues.redhat.com/browse/GITOPS-2664 - -# apiVersion: monitoring.coreos.com/v1 -# kind: PrometheusRule -# metadata: -# name: argocd-component-status-alert -# namespace: openshift-gitops -# spec: -# groups: -# - name: ArgoCDComponentStatus -# rules: -# - alert: ApplicationControllerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: ServerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: RepoServerNotReady -# for: 1m -# labels: -# severity: critical -# - alert: ApplicationSetControllerNotReady -# for: 5m -# labels: -# severity: warning -# - alert: DexNotReady -# for: 5m -# labels: -# severity: warning -# - alert: NotificationsControllerNotReady -# for: 5m -# labels: -# severity: warning -# - alert: RedisNotReady -# for: 5m -# labels: -# severity: warning diff --git a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml b/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml deleted file mode 100644 index 0aa6f79605e..00000000000 --- a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/01-install.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# apiVersion: argoproj.io/v1alpha1 -# kind: ArgoCD -# metadata: -# name: openshift-gitops -# namespace: openshift-gitops -# labels: -# example: argocd -# spec: -# applicationSet: -# image: test-image -# monitoring: -# enabled: true diff --git a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml b/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml deleted file mode 100644 index 6857407a8ed..00000000000 --- a/test/openshift/e2e/sequential/1-077_validate_workload_status_monitoring_alert/02-verify-alert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# commands: -# - script: sleep 10m -# - script: | -# jq '.data.alerts' <<< "$(oc -n openshift-monitoring exec -c prometheus prometheus-k8s-0 -- curl -s 'http://localhost:9090/api/v1/alerts')" > alerts.json - -# result=$(jq --arg deployment "openshift-gitops-applicationset-controller" --arg namespace $NAMESPACE '.[] | select(.labels.alertname == "ApplicationSetControllerNotReady" and .state == "firing")' alerts.json) - -# rm alerts.json - -# [[ ! -z "$result" ]] && exit 0 || exit 1 - diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml deleted file mode 100644 index fbfc9e9b451..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/01-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml deleted file mode 100644 index 3acec839413..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-add_env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=true - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "true"}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "true"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/02-errors.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml deleted file mode 100644 index c33864cdd4b..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/03-check-env.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"true"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK not set" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml deleted file mode 100644 index f8b32868c9a..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/04-disable-env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=false - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "false"}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": "false"}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml deleted file mode 100644 index 20b88d5ed60..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/05-check-env.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == '"false"' ]]; then - echo "Label value: $label_value" - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"false"' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '"false"' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK set" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml deleted file mode 100644 index bdb35197835..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/06-empty-valued-env.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK="" - elif [ -z $CI ]; then - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": ""}]}}}' - else - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "DISABLE_DEFAULT_ARGOCD_CONSOLELINK", "value": ""}]}}}' - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml deleted file mode 100644 index 46ba0958717..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/07-check-env.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - label_value=$(oc get deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator -o json | jq -r '.spec.template.spec.containers[]|select(.name=="manager")|.env[] | select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK")|.value') - if ! [[ "${label_value}" == null ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - elif [ -z $CI ]; then - label_value=$(oc get subscriptions openshift-gitops-operator -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '""' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - - else - label_value=$(oc get subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o json | jq '.spec.config.env[]|select(.name=="DISABLE_DEFAULT_ARGOCD_CONSOLELINK").value') - - if ! [[ "${label_value}" == '""' ]]; then - echo "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to ${label_value}" - exit 1 - else - exit 0 - fi - - fi diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml deleted file mode 100644 index 6e0688c3cbe..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: argocd \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml b/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml deleted file mode 100644 index 474000095a4..00000000000 --- a/test/openshift/e2e/sequential/1-078_validate_default_argocd_consoleLink/08-remove-env.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator DISABLE_DEFAULT_ARGOCD_CONSOLELINK=null - elif [ -z $CI ]; then - oc -n openshift-gitops-operator patch subscription openshift-gitops-operator --type='json' -p='[{"op": "remove", "path": "/spec/config" }]' - else - oc -n openshift-gitops-operator patch subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` --type='json' -p='[{"op": "remove", "path": "/spec/config" }]' - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-assert.yaml b/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-assert.yaml deleted file mode 100644 index de34835b614..00000000000 --- a/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-assert.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Disabling the test temporarily, refer to https://issues.redhat.com/browse/GITOPS-2650 - -# apiVersion: argoproj.io/v1alpha1 -# kind: ArgoCD -# metadata: -# name: openshift-gitops -# namespace: openshift-gitops -# status: -# phase: Available -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-redis -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-repo-server -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-server -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: openshift-gitops-applicationset-controller -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- -# apiVersion: apps/v1 -# kind: StatefulSet -# metadata: -# name: openshift-gitops-application-controller -# namespace: openshift-gitops -# status: -# readyReplicas: 1 -# replicas: 1 -# --- diff --git a/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml b/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml deleted file mode 100644 index 54917c48775..00000000000 --- a/test/openshift/e2e/sequential/1-084_validate_prune_templates/01-create-ns-managed-by.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# --- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: namespace-gitops-1672 -# labels: -# argocd.argoproj.io/managed-by: openshift-gitops \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml b/test/openshift/e2e/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml deleted file mode 100644 index 65592901a0d..00000000000 --- a/test/openshift/e2e/sequential/1-084_validate_prune_templates/02-prune-duplicateGVK-resource.yaml +++ /dev/null @@ -1,155 +0,0 @@ -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# commands: -# - script: | -# set -eou pipefail -# DIR="$(pwd)" - -# cleanup() { -# argocd logout "${api_server}" -# oc delete application app-kustomize -n openshift-gitops -# rm -rf $WORK_DIR -# } - -# WORK_DIR=`mktemp -d -p "$DIR"` - -# # check if tmp dir was created -# if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then -# echo "Could not create temp dir" -# exit 1 -# fi - -# trap cleanup INT TERM EXIT - -# # Login to apiserver -# api_server=$(oc get routes -n openshift-gitops --field-selector metadata.name=openshift-gitops-server -o jsonpath="{.items[*]['spec.host']}") -# password=$(oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data.admin\.password}' | base64 -d) -# output=$(argocd login $api_server --username admin --password $password --insecure) - -# # ensure namespace exists -# oc get ns namespace-gitops-1672 2>/dev/null || { -# oc new-project namespace-gitops-1672 -# oc label namespace namespace-gitops-1672 argocd.argoproj.io/managed-by=openshift-gitops -# } - -# # ensure template cleanup, if exists in namespace before we start tests -# oc delete template redis-template-gitops -n namespace-gitops-1672 --ignore-not-found=true - -# # Adding duplicate GVK to check prune functionality against issue #GITOPS-1672 -# cat > $WORK_DIR/app-template.yaml << EOF -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops -# annotations: -# description: "Description" -# iconClass: "icon-redis" -# tags: "database,nosql" -# objects: -# - apiVersion: v1 -# kind: Pod -# metadata: -# name: redis-master -# spec: -# containers: -# - env: -# - name: REDIS_PASSWORD -# value: xyz1234s -# image: dockerfile/redis -# name: master -# ports: -# - containerPort: 6379 -# protocol: TCP -# parameters: -# - description: Password used for Redis authentication -# from: '[A-Z0-9]{8}' -# generate: expression -# name: REDIS_PASSWORD -# labels: -# redis: master -# EOF - -# cat > $WORK_DIR/app-template2.yaml << EOF -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops2 -# annotations: -# description: "Description" -# iconClass: "icon-redis" -# tags: "database,nosql" -# objects: -# - apiVersion: v1 -# kind: Pod -# metadata: -# name: redis-master -# spec: -# containers: -# - env: -# - name: REDIS_PASSWORD -# value: xyz1234s -# image: dockerfile/redis -# name: master -# ports: -# - containerPort: 6379 -# protocol: TCP -# parameters: -# - description: Password used for Redis authentication -# from: '[A-Z0-9]{8}' -# generate: expression -# name: REDIS_PASSWORD -# labels: -# redis: master -# EOF - -# # create application.yaml -# cat </dev/null; then -# echo "Application listing failed" -# exit 1 -# fi - -# if ! argocd app sync app-kustomize --local $WORK_DIR --timeout 100 2>/dev/null; then -# echo "App didn't sync well with local flag" -# exit 1 -# fi - -# # Now delete resource from git source and try to resync back -# rm -rf $WORK_DIR/app-template.yaml - -# sleep 5 - -# # Now sync application with prune and PruneLast options enabled -# if ! argocd app sync app-kustomize --local $WORK_DIR --prune --timeout 100 2>/dev/null; then -# echo "App didn't prune or synced well with local flag" -# exit 1 -# fi - -# if oc get template redis-template-gitops -n namespace-gitops-1672 --no-headers 2>/dev/null; then -# echo "Templete is not pruned properly." -# exit 1 -# else -# echo "Test is successful, no templates found" -# exit 0 -# fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-084_validate_prune_templates/03-errors.yaml b/test/openshift/e2e/sequential/1-084_validate_prune_templates/03-errors.yaml deleted file mode 100644 index 74568964a2c..00000000000 --- a/test/openshift/e2e/sequential/1-084_validate_prune_templates/03-errors.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# --- -# apiVersion: template.openshift.io/v1 -# kind: Template -# metadata: -# name: redis-template-gitops -# namespace: namespace-gitops-1672 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-084_validate_prune_templates/04-delete.yaml b/test/openshift/e2e/sequential/1-084_validate_prune_templates/04-delete.yaml deleted file mode 100644 index 27404363fae..00000000000 --- a/test/openshift/e2e/sequential/1-084_validate_prune_templates/04-delete.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# --- -# apiVersion: kuttl.dev/v1beta1 -# kind: TestStep -# delete: -# - apiVersion: v1 -# kind: Namespace -# name: namespace-gitops-1672 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml b/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml deleted file mode 100644 index 8c63a5a640f..00000000000 --- a/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/01-install-dynamic-plugin.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - set -eo pipefail - - # Get CSV name and also OCP version. - csv_name=$(oc get csv -n openshift-gitops-operator | awk '/gitops-operator/ {print $1}') - ocp_version=$(oc version | awk '/Server Version/ {split($3,a,"-"); print a[1]}') - - if [[ ${ocp_version} =~ "4.15" ]]; then - exit 0 - fi - - # Patch the CSV to add the necessary env key:value for Dynamic Plugin - oc patch csv "${csv_name}" -n openshift-gitops-operator \ - --type='json' \ - -p='[{ - "op": "add", - "path": "/spec/install/spec/deployments/0/spec/template/spec/containers/0/env/-", - "value": { - "name": "DYNAMIC_PLUGIN_START_OCP_VERSION", - "value": "'${ocp_version}'" - } - }]' - - # Sleep 10 seconds, so the resources are launched before next assert step. - sleep 5 - - exit 0 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml b/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml deleted file mode 100644 index 300c60f485d..00000000000 --- a/test/openshift/e2e/sequential/1-085_validate_dynamic_plugin_installation/02-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: gitops-plugin - namespace: openshift-gitops -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: httpd-cfg - namespace: openshift-gitops - labels: - app: gitops-plugin - app.kubernetes.io/part-of: gitops-plugin ---- -apiVersion: v1 -kind: Secret -metadata: - name: console-serving-cert - namespace: openshift-gitops ---- -apiVersion: v1 -kind: Service -metadata: - name: gitops-plugin - namespace: openshift-gitops -spec: - ports: - - name: tcp-9001 - port: 9001 - protocol: TCP - targetPort: 9001 diff --git a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/01-assert.yaml b/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/01-assert.yaml deleted file mode 100644 index 090e14a457c..00000000000 --- a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/01-assert.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: openshift-gitops - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: openshift-gitops -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: "" - scopes: '[groups]' ---- diff --git a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-assert.yaml b/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-assert.yaml deleted file mode 100644 index 418157aad67..00000000000 --- a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-assert.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy - namespace: test-1-086-custom -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-empty - namespace: test-1-086-custom2 -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-admin - namespace: test-1-086-custom3 -spec: - server: - route: - enabled: true -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom -data: - policy.csv: "" - policy.default: role:readonly - scopes: '[groups]' ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy-empty - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom2 -data: - policy.csv: "" - policy.default: '' - scopes: '[groups]' ---- -apiVersion: v1 -kind: ConfigMap -metadata: - labels: - app.kubernetes.io/managed-by: argocd-default-policy-admin - app.kubernetes.io/name: argocd-rbac-cm - app.kubernetes.io/part-of: argocd - name: argocd-rbac-cm - namespace: test-1-086-custom3 -data: - policy.csv: "" - policy.default: 'role:admin' - scopes: '[groups]' ---- diff --git a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-install.yaml b/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-install.yaml deleted file mode 100644 index 3fe8ebdd441..00000000000 --- a/test/openshift/e2e/sequential/1-086_validate_default_argocd_role/02-install.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom2 ---- -apiVersion: v1 -kind: Namespace -metadata: - name: test-1-086-custom3 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy - namespace: test-1-086-custom -spec: - server: - route: - enabled: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-empty - namespace: test-1-086-custom2 -spec: - rbac: - defaultPolicy: '' - server: - route: - enabled: true ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd-default-policy-admin - namespace: test-1-086-custom3 -spec: - rbac: - defaultPolicy: 'role:admin' - server: - route: - enabled: true diff --git a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-assert.yaml b/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-assert.yaml deleted file mode 100644 index 395ed0ccad5..00000000000 --- a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-assert.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: argo-rollouts - namespace: openshift-gitops ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: argo-rollouts ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-admin ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-edit ---- -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: argo-rollouts-aggregate-to-view ---- -kind: Secret -apiVersion: v1 -metadata: - name: argo-rollouts-notification-secret - namespace: openshift-gitops ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: argo-rollouts - namespace: openshift-gitops -status: - readyReplicas: 1 ---- -apiVersion: v1 -kind: Service -metadata: - name: argo-rollouts-metrics - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml b/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml deleted file mode 100644 index 9c4b7529ab8..00000000000 --- a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/01-install-rolloutmanager.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager - namespace: openshift-gitops - labels: - example: example-rollout-manager -spec: {} diff --git a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/02-assert.yaml b/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/02-assert.yaml deleted file mode 100644 index 035ab5da282..00000000000 --- a/test/openshift/e2e/sequential/1-100_validate_rollouts_resources_creation/02-assert.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager - namespace: openshift-gitops -status: - phase: Available diff --git a/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-assert.yaml b/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-assert.yaml deleted file mode 100644 index dcfa4bdd417..00000000000 --- a/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-assert.yaml +++ /dev/null @@ -1,237 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: - app.kubernetes.io/component: argo-rollouts - app.kubernetes.io/name: argo-rollouts - app.kubernetes.io/part-of: argo-rollouts - name: argo-rollouts -rules: -- apiGroups: - - argoproj.io - resources: - - rollouts - - rollouts/status - - rollouts/finalizers - verbs: - - get - - list - - watch - - update - - patch -- apiGroups: - - argoproj.io - resources: - - analysisruns - - analysisruns/finalizers - - experiments - - experiments/finalizers - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - argoproj.io - resources: - - analysistemplates - - clusteranalysistemplates - verbs: - - get - - list - - watch -- apiGroups: - - apps - resources: - - replicasets - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - "" - - apps - resources: - - deployments - - podtemplates - verbs: - - get - - list - - watch - - update - - patch -- apiGroups: - - "" - resources: - - services - verbs: - - get - - list - - watch - - patch - - create - - delete -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - create - - get - - update -- apiGroups: - - "" - resources: - - secrets - - configmaps - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - pods - verbs: - - list - - update - - watch -- apiGroups: - - "" - resources: - - pods/eviction - verbs: - - create -- apiGroups: - - "" - resources: - - events - verbs: - - create - - update - - patch -- apiGroups: - - networking.k8s.io - - extensions - resources: - - ingresses - verbs: - - create - - get - - list - - watch - - patch -- apiGroups: - - batch - resources: - - jobs - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - networking.istio.io - resources: - - virtualservices - - destinationrules - verbs: - - watch - - get - - update - - patch - - list -- apiGroups: - - split.smi-spec.io - resources: - - trafficsplits - verbs: - - create - - watch - - get - - update - - patch -- apiGroups: - - getambassador.io - - x.getambassador.io - resources: - - mappings - - ambassadormappings - verbs: - - create - - watch - - get - - update - - list - - delete -- apiGroups: - - "" - resources: - - endpoints - verbs: - - get -- apiGroups: - - elbv2.k8s.aws - resources: - - targetgroupbindings - verbs: - - list - - get -- apiGroups: - - appmesh.k8s.aws - resources: - - virtualservices - verbs: - - watch - - get - - list -- apiGroups: - - appmesh.k8s.aws - resources: - - virtualnodes - - virtualrouters - verbs: - - watch - - get - - list - - update - - patch -- apiGroups: - - traefik.containo.us - - traefik.io - resources: - - traefikservices - verbs: - - watch - - get - - update -- apiGroups: - - apisix.apache.org - resources: - - apisixroutes - verbs: - - watch - - get - - update -- apiGroups: - - route.openshift.io - resources: - - routes - verbs: - - create - - watch - - get - - update - - patch - - list \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml b/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml deleted file mode 100644 index 9c4b7529ab8..00000000000 --- a/test/openshift/e2e/sequential/1-101_validate_rollout_policyrules/01-install-rollloutmanager.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: RolloutManager -metadata: - name: example-rollout-manager - namespace: openshift-gitops - labels: - example: example-rollout-manager -spec: {} diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/01-add-label-selector.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/01-add-label-selector.yaml deleted file mode 100644 index aa334315614..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/01-add-label-selector.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to add label selector in argocd-operator - -# - script: | -# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager -# - script: sleep 30 -- script: | - if ! [ -z $NON_OLM ]; then - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}' - - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}' - fi -- script: sleep 120 diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/02-errors.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/02-errors.yaml deleted file mode 100644 index d40a8ae0f91..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/02-errors.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/02-install.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/02-install.yaml deleted file mode 100644 index fb628766e68..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/02-install.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: {} \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/03-add-label.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/03-add-label.yaml deleted file mode 100644 index 79dfb0c9484..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/03-add-label.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the argocd instance with the label -- script: | - kubectl label argocd test1 foo=bar -n test-argocd - -- script: sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/03-assert.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/03-assert.yaml deleted file mode 100644 index 3e60734cb73..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/03-assert.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available ---- \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/04-assert.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/04-assert.yaml deleted file mode 100644 index 14256ec7b28..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/04-assert.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd -status: - phase: Available ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/04-install.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/04-install.yaml deleted file mode 100644 index 9bbcca51ec1..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/04-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/05-remove-label.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/05-remove-label.yaml deleted file mode 100644 index 4ef30373835..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/05-remove-label.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the argocd instance by removing the label -- script: | - kubectl label argocd test1 foo- -n test-argocd -- script: sleep 30 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-assert.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/06-assert.yaml deleted file mode 100644 index 0fbedd777c9..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[email]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-errors.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/06-errors.yaml deleted file mode 100644 index d3116edd134..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-errors.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: argocd-rbac-cm - namespace: test-argocd -data: - policy.csv: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - policy.default: role:readonly - scopes: '[people]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-install.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/06-install.yaml deleted file mode 100644 index 989a1b0cf6c..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/06-install.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1beta1 -kind: ArgoCD -metadata: - name: test1 - namespace: test-argocd - labels: - example: basic -spec: - rbac: - policy: | - g, system:cluster-admins, role:admin - g, cluster-admins, role:admin - scopes: '[people]' diff --git a/test/openshift/e2e/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml b/test/openshift/e2e/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml deleted file mode 100644 index 8f467e0264b..00000000000 --- a/test/openshift/e2e/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -# patches the subscription to remove label-selector from argocd-operator -# - script: | -# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager -# - script: sleep 30 - -- script: | - if ! [ -z $NON_OLM ]; then - - oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager - - elif [ -z $CI ]; then - - oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - else - - oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \ - --type json --patch '[{"op": "remove", "path": "/spec/config"}]' - fi -- script: sleep 120 \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/01-assert.yaml b/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/01-assert.yaml deleted file mode 100644 index 3ced5219d81..00000000000 --- a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/01-assert.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: openshift-gitops - namespace: openshift-gitops -status: - phase: Available ---- -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - openshift.io/cluster-monitoring: 'true' ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-read - namespace: openshift-gitops ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-prometheus-k8s-read-binding - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-disable-metrics.yaml b/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-disable-metrics.yaml deleted file mode 100644 index 3ca2a69120f..00000000000 --- a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-disable-metrics.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# We must not use declarative update/creation for gitopsservice, because kuttl -# would delete the resource after the test finishes. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd openshift-gitops -n openshift-gitops --type='json' -p='[{"op": "replace", "path": "/spec/monitoring/disableMetrics", "value": true}]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-errors.yaml b/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-errors.yaml deleted file mode 100644 index 402a30a934c..00000000000 --- a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/02-errors.yaml +++ /dev/null @@ -1,42 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - openshift.io/cluster-monitoring: 'true' ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-read - namespace: openshift-gitops ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-prometheus-k8s-read-binding - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-assert.yaml b/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-assert.yaml deleted file mode 100644 index 402a30a934c..00000000000 --- a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-assert.yaml +++ /dev/null @@ -1,42 +0,0 @@ -kind: Namespace -apiVersion: v1 -metadata: - name: openshift-gitops - labels: - openshift.io/cluster-monitoring: 'true' ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-repo-server - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: openshift-gitops-server - namespace: openshift-gitops ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-read - namespace: openshift-gitops ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: openshift-gitops-prometheus-k8s-read-binding - namespace: openshift-gitops ---- -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - name: gitops-operator-argocd-alerts - namespace: openshift-gitops diff --git a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-enable-metrics.yaml b/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-enable-metrics.yaml deleted file mode 100644 index 7cda5fd9e57..00000000000 --- a/test/openshift/e2e/sequential/1-106_validate_argocd_metrics_controller/03-enable-metrics.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# We must not use declarative update/creation for gitopsservice, because kuttl -# would delete the resource after the test finishes. -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - oc patch argocd openshift-gitops -n openshift-gitops --type='json' -p='[{"op": "replace", "path": "/spec/monitoring/disableMetrics", "value": false}]' \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-assert.yaml b/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-assert.yaml deleted file mode 100644 index 6a6b1bf07d9..00000000000 --- a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 300 ---- -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - labels: - example: basic -spec: - ha: - enabled: true -status: - redis: Running \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-install.yaml b/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-install.yaml deleted file mode 100644 index 87951fc0f74..00000000000 --- a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-install.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ArgoCD -metadata: - name: argocd - labels: - example: basic -spec: - ha: - enabled: true \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/02-check-ha-redis-server-ssc.yaml b/test/openshift/e2e/sequential/1-107_validate_redis_ssc/02-check-ha-redis-server-ssc.yaml deleted file mode 100644 index b0025b99524..00000000000 --- a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/02-check-ha-redis-server-ssc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}") - actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}") - expected_scc="restricted-v2" - - if [[ "$actual_scc" != "$expected_scc" ]]; then - echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'" - exit 1 - else - echo "SCC check passed: '$actual_scc'" - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/03-check-ha-proxy-ssc.yaml b/test/openshift/e2e/sequential/1-107_validate_redis_ssc/03-check-ha-proxy-ssc.yaml deleted file mode 100644 index fb2540bf6d3..00000000000 --- a/test/openshift/e2e/sequential/1-107_validate_redis_ssc/03-check-ha-proxy-ssc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: -- script: | - pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha-haproxy -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}") - actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}") - expected_scc="restricted-v2" - - if [[ "$actual_scc" != "$expected_scc" ]]; then - echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'" - exit 1 - else - echo "SCC check passed: '$actual_scc'" - fi \ No newline at end of file diff --git a/test/openshift/e2e/sequential/kuttl-test.yaml b/test/openshift/e2e/sequential/kuttl-test.yaml deleted file mode 100644 index aa2259170fe..00000000000 --- a/test/openshift/e2e/sequential/kuttl-test.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestSuite -name: gitops-operator-e2e -testDirs: - - . -suppress: - - events -timeout: 720 -parallel: 1 -reportFormat: JSON -reportName: openshift-gitops-e2e