diff --git a/.gitignore b/.gitignore index 9d4ef10b514e..e80e6f6fe5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ kuttl-test.json # ignore vendor vendor/ .vscode/ +.DS_Store diff --git a/Dockerfile b/Dockerfile index 8c6c8ca4e392..1dd2628abb74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,9 @@ COPY controllers/ controllers/ COPY common/ common/ COPY version/ version/ -# Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager ./cmd/main.go +# Build - Use TARGETARCH to build for the correct architecture +ARG TARGETARCH +RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} go build -a -o manager ./cmd/main.go # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details diff --git a/Makefile b/Makefile index 5b96ac93fa0b..b8be5ed038ad 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,8 @@ IMG ?= $(IMAGE):$(VERSION) # Set the Operator SDK version to use. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. OPERATOR_SDK_VERSION ?= v1.35.0 - +# Set the path to Operator SDK - OPERATOR_SDK_VERSION will be ignored. +OPERATOR_SDK ?= bin/operator-sdk # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -131,19 +132,6 @@ test-e2e: manifests generate fmt vet ## Run e2e tests. test-metrics: go test -timeout 30m ./test/e2e -ginkgo.focus="Argo CD metrics controller" -coverprofile cover.out -ginkgo.v -.PHONY: operator-sdk -OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk -operator-sdk: ## Download operator-sdk locally if necessary. -ifeq (,$(wildcard $(OPERATOR_SDK))) - @{ \ - set -e ;\ - mkdir -p $(dir $(OPERATOR_SDK)) ;\ - OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ - chmod +x $(OPERATOR_SDK) ;\ - } -endif - .PHONY: test-route test-route: go test -timeout 30m ./test/e2e -ginkgo.focus="Argo CD ConsoleLink controller" -coverprofile cover.out -ginkgo.v @@ -164,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 210m -r ./test/openshift/e2e/ginkgo/sequential + $(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 @@ -211,7 +180,7 @@ build: generate fmt vet ## Build manager binary. .PHONY: run run: manifests generate fmt vet ## Run a controller from your host. - CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES=argo-rollouts,test-rom-ns-1,rom-ns-1,openshift-gitops ARGOCD_CLUSTER_CONFIG_NAMESPACES="openshift-gitops, argocd-e2e-cluster-config, argocd-test-impersonation-1-046, argocd-agent-principal-1-051, argocd-agent-agent-1-052, appset-argocd, appset-old-ns, appset-new-ns, ns-hosting-principal, ns-hosting-managed-agent, ns-hosting-autonomous-agent" REDIS_CONFIG_PATH="build/redis" go run ./cmd/main.go + CLUSTER_SCOPED_ARGO_ROLLOUTS_NAMESPACES=argo-rollouts,test-rom-ns-1,rom-ns-1,openshift-gitops ARGOCD_CLUSTER_CONFIG_NAMESPACES="openshift-gitops, argocd-e2e-cluster-config, argocd-test-impersonation-1-046, argocd-agent-principal-1-051, argocd-agent-agent-1-052, appset-argocd, appset-old-ns, appset-new-ns, ns-hosting-principal, ns-hosting-managed-agent, ns-hosting-autonomous-agent, appset-argocd-clusterrole" REDIS_CONFIG_PATH="build/redis" go run ./cmd/main.go .PHONY: docker-build docker-build: test ## Build container image with the manager. @@ -223,27 +192,17 @@ docker-push: ## Push container image with the manager. ##@ Build Dependencies -## Location to install dependencies to -LOCALBIN ?= $(shell pwd)/bin -$(LOCALBIN): - mkdir -p $(LOCALBIN) +# Do not use OPERATOR_SDK variable not to overwrite the user provided path +bin/operator-sdk: + mkdir -p bin + curl -sSLo bin/operator-sdk \ + https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$(shell go env GOOS)_$(shell go env GOARCH) + chmod +x bin/operator-sdk +# Install to bin/operator-sdk unless already there or explicit OPERATOR_SDK provided .PHONY: operator-sdk -OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk -operator-sdk: ## Download operator-sdk locally if necessary. -ifeq (,$(wildcard $(OPERATOR_SDK))) -ifeq (,$(shell which operator-sdk 2>/dev/null)) - @{ \ - set -e ;\ - mkdir -p $(dir $(OPERATOR_SDK)) ;\ - OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ - curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\ - chmod +x $(OPERATOR_SDK) ;\ - } -else -OPERATOR_SDK = $(shell which operator-sdk) -endif -endif +operator-sdk: $(OPERATOR_SDK) + @$(OPERATOR_SDK) version ifndef ignore-not-found ignore-not-found = false @@ -271,6 +230,10 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. $(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=true -f - +.PHONY: olm-deploy +olm-deploy: ## Build the operator bundle and deploy it to OpenShift through OLM + ./hack/scripts/olm-deploy.sh + CONTROLLER_GEN = $(shell pwd)/bin/controller-gen .PHONY: controller-gen controller-gen: ## Download controller-gen locally if necessary. @@ -368,7 +331,7 @@ gosec: go_sec .PHONY: lint lint: golangci_lint $(GOLANGCI_LINT) --version - GOMAXPROCS=2 $(GOLANGCI_LINT) run --fix --verbose --timeout 300s + $(GOLANGCI_LINT) run --fix --verbose --timeout 300s GO_SEC = $(shell pwd)/bin/gosec diff --git a/build/redis/haproxy.cfg.tpl b/build/redis/haproxy.cfg.tpl index 8b0b2b8f0b97..0952c8c76596 100644 --- a/build/redis/haproxy.cfg.tpl +++ b/build/redis/haproxy.cfg.tpl @@ -24,7 +24,7 @@ backend check_if_redis_is_master_0 {{- else}} tcp-check connect ssl {{- end}} - tcp-check send "AUTH replace-with-redis-auth"\r\n + tcp-check send "AUTH __REPLACE_DEFAULT_AUTH__"\r\n tcp-check expect string +OK tcp-check send PING\r\n tcp-check expect string +PONG @@ -50,7 +50,7 @@ backend check_if_redis_is_master_1 {{- else}} tcp-check connect ssl {{- end}} - tcp-check send "AUTH replace-with-redis-auth"\r\n + tcp-check send "AUTH __REPLACE_DEFAULT_AUTH__"\r\n tcp-check expect string +OK tcp-check send PING\r\n tcp-check expect string +PONG @@ -76,7 +76,7 @@ backend check_if_redis_is_master_2 {{- else}} tcp-check connect ssl {{- end}} - tcp-check send "AUTH replace-with-redis-auth"\r\n + tcp-check send "AUTH __REPLACE_DEFAULT_AUTH__"\r\n tcp-check expect string +OK tcp-check send PING\r\n tcp-check expect string +PONG @@ -108,7 +108,7 @@ backend bk_redis_master {{- else}} tcp-check connect ssl {{- end}} - tcp-check send "AUTH replace-with-redis-auth"\r\n + tcp-check send "AUTH __REPLACE_DEFAULT_AUTH__"\r\n tcp-check expect string +OK tcp-check send PING\r\n tcp-check expect string +PONG diff --git a/build/redis/haproxy_init.sh.tpl b/build/redis/haproxy_init.sh.tpl index 9956b1ed417c..4c912300dd1c 100644 --- a/build/redis/haproxy_init.sh.tpl +++ b/build/redis/haproxy_init.sh.tpl @@ -33,6 +33,12 @@ if [ -z "$ANNOUNCE_IP2" ]; then fi sed -i "s/REPLACE_ANNOUNCE2/$ANNOUNCE_IP2/" "$HAPROXY_CONF" -auth=$(cat /redis-initial-pass/admin.password) -sed -i "s/replace-with-redis-auth/$auth/" "$HAPROXY_CONF" +AUTH="$(cat /app/config/redis-auth/auth)" +if [ -z "${AUTH}" ]; then + echo "Error: Redis password not mounted correctly" + exit 1 +fi +echo "Setting redis auth values.." +ESCAPED_AUTH=$(echo "${AUTH}" | sed -e 's/[\/&]/\\&/g'); +sed -i "s/__REPLACE_DEFAULT_AUTH__/${ESCAPED_AUTH}/" "$HAPROXY_CONF" diff --git a/build/redis/init.sh.tpl b/build/redis/init.sh.tpl index d92592234d58..408ebd242855 100644 --- a/build/redis/init.sh.tpl +++ b/build/redis/init.sh.tpl @@ -132,10 +132,15 @@ setup_defaults() { redis_ping() { set +e + AUTH="$(cat /app/config/redis-auth/auth)" + if [ -z "$AUTH" ]; then + echo "Error: Redis password not mounted correctly" + exit 1 + fi if [ "$REDIS_PORT" -eq 0 ]; then - redis-cli -h "${MASTER}" -a "${AUTH}" --no-auth-warning -p "${REDIS_TLS_PORT}" --tls --cacert /app/config/redis/tls/tls.crt ping + env REDISCLI_AUTH="${AUTH}" redis-cli -h "${MASTER}" -p "${REDIS_TLS_PORT}" --tls --cacert /app/config/redis/tls/tls.crt ping else - redis-cli -h "${MASTER}" -a "${AUTH}" --no-auth-warning -p "${REDIS_PORT}" ping + env REDISCLI_AUTH="${AUTH}" redis-cli -h "${MASTER}" -p "${REDIS_PORT}" ping fi set -e } @@ -170,7 +175,7 @@ find_master() { if [ "$SENTINEL_PORT" -eq 0 ]; then echo " on sentinel (${SERVICE}:${SENTINEL_TLS_PORT}), sentinel grp (${MASTER_GROUP})" echo " $(date).." - if redis-cli -h "${SERVICE}" -p "${SENTINEL_TLS_PORT}" --tls --cacert /app/config/redis/tls/tls.crt sentinel failover "${MASTER_GROUP}" | grep -q 'NOGOODSLAVE' ; then + if redis-cli -h "${SERVICE}" -p "${SENTINEL_TLS_PORT}" --tls --cacert /app/config/redis/tls/tls.crt sentinel failover "${MASTER_GROUP}" | grep -q 'NOGOODSLAVE' ; then echo " $(date) Failover returned with 'NOGOODSLAVE'" echo "Setting defaults for this pod.." setup_defaults @@ -179,7 +184,7 @@ find_master() { else echo " on sentinel (${SERVICE}:${SENTINEL_PORT}), sentinel grp (${MASTER_GROUP})" echo " $(date).." - if redis-cli -h "${SERVICE}" -p "${SENTINEL_PORT}" sentinel failover "${MASTER_GROUP}" | grep -q 'NOGOODSLAVE' ; then + if redis-cli -h "${SERVICE}" -p "${SENTINEL_PORT}" sentinel failover "${MASTER_GROUP}" | grep -q 'NOGOODSLAVE'; then echo " $(date) Failover returned with 'NOGOODSLAVE'" echo "Setting defaults for this pod.." setup_defaults @@ -252,16 +257,19 @@ else setup_defaults fi -if [ "${AUTH:-}" ]; then - echo "Setting redis auth values.." - ESCAPED_AUTH=$(echo "${AUTH}" | sed -e 's/[\/&]/\\&/g'); - sed -i "s/replace-default-auth/${ESCAPED_AUTH}/" "${REDIS_CONF}" "${SENTINEL_CONF}" +AUTH="$(cat /app/config/redis-auth/auth)" +if [ -z "${AUTH}" ]; then + echo "Error: Redis password not mounted correctly" + exit 1 fi +echo "Setting redis auth values.." +ESCAPED_AUTH=$(echo "${AUTH}" | sed -e 's/[\/&]/\\&/g'); +sed -i "s/__REPLACE_DEFAULT_AUTH__/${ESCAPED_AUTH}/" "${REDIS_CONF}" "${SENTINEL_CONF}" if [ "${SENTINELAUTH:-}" ]; then echo "Setting sentinel auth values" ESCAPED_AUTH_SENTINEL=$(echo "$SENTINELAUTH" | sed -e 's/[\/&]/\\&/g'); - sed -i "s/replace-default-sentinel-auth/${ESCAPED_AUTH_SENTINEL}/" "$SENTINEL_CONF" + sed -i "s/__REPLACE_DEFAULT_SENTINEL_AUTH__/${ESCAPED_AUTH_SENTINEL}/" "$SENTINEL_CONF" fi echo "$(date) Ready..." diff --git a/build/redis/redis.conf.tpl b/build/redis/redis.conf.tpl index 7e1ddbf4bbf3..368c3f56b595 100644 --- a/build/redis/redis.conf.tpl +++ b/build/redis/redis.conf.tpl @@ -20,7 +20,4 @@ rdbcompression yes repl-diskless-sync yes save "" protected-mode no -requirepass replace-default-auth -masterauth replace-default-auth - - +aclfile /app/config/redis-auth/users.acl diff --git a/build/redis/redis_liveness.sh.tpl b/build/redis/redis_liveness.sh.tpl index 7b7d1caa7f71..99e6a998978f 100644 --- a/build/redis/redis_liveness.sh.tpl +++ b/build/redis/redis_liveness.sh.tpl @@ -1,6 +1,10 @@ +redis_pwd="$(cat /app/config/redis-auth/auth)" +if [ -z "$redis_pwd" ]; then + echo "Error: Redis password not mounted correctly" + exit 1 +fi response=$( - redis-cli \ - -a "${AUTH}" --no-auth-warning \ + env REDISCLI_AUTH="${redis_pwd}" redis-cli \ -h localhost \ -p 6379 \ {{- if eq .UseTLS "true"}} diff --git a/build/redis/redis_readiness.sh.tpl b/build/redis/redis_readiness.sh.tpl index 29e7d58c3b15..2702c93523e7 100644 --- a/build/redis/redis_readiness.sh.tpl +++ b/build/redis/redis_readiness.sh.tpl @@ -1,6 +1,10 @@ +redis_pwd="$(cat /app/config/redis-auth/auth)" +if [ -z "$redis_pwd" ]; then + echo "Error: Redis password not mounted correctly" + exit 1 +fi response=$( - redis-cli \ - -a "${AUTH}" --no-auth-warning \ + env REDISCLI_AUTH="${redis_pwd}" redis-cli \ -h localhost \ -p 6379 \ {{- if eq .UseTLS "true"}} @@ -9,7 +13,7 @@ response=$( {{- end}} ping ) -if [ "$response" != "PONG" ] ; then +if [ "$response" != "PONG" ]; then echo "$response" exit 1 fi diff --git a/build/redis/sentinel.conf.tpl b/build/redis/sentinel.conf.tpl index 130539a66072..9f9eb532ac5c 100644 --- a/build/redis/sentinel.conf.tpl +++ b/build/redis/sentinel.conf.tpl @@ -15,4 +15,4 @@ bind 0.0.0.0 sentinel failover-timeout argocd 180000 maxclients 10000 sentinel parallel-syncs argocd 5 - sentinel auth-pass argocd replace-default-auth + sentinel auth-pass argocd __REPLACE_DEFAULT_AUTH__ diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 0d49b03634d1..07bb811ee86a 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -168,6 +168,16 @@ metadata: } } }, + { + "apiVersion": "argoproj.io/v1beta1", + "kind": "NamespaceManagement", + "metadata": { + "name": "namespacemanagement-sample" + }, + "spec": { + "managedBy": "argocd-ns" + } + }, { "apiVersion": "pipelines.openshift.io/v1alpha1", "kind": "GitopsService", @@ -849,7 +859,7 @@ spec: containers: - args: - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 + - --metrics-bind-address=:8443 - --leader-elect command: - /usr/local/bin/manager @@ -875,6 +885,12 @@ spec: - containerPort: 9443 name: webhook-server protocol: TCP + - containerPort: 8443 + name: metrics + protocol: TCP + - containerPort: 8081 + name: health + protocol: TCP readinessProbe: httpGet: path: /readyz @@ -889,44 +905,10 @@ spec: - 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 - protocol: TCP - 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: diff --git a/cmd/main.go b/cmd/main.go index 45145c547102..32bbb1b4427c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -70,6 +70,7 @@ import ( "github.com/redhat-developer/gitops-operator/controllers/argocd/openshift" "github.com/redhat-developer/gitops-operator/controllers/util" k8sruntime "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/controller-runtime/pkg/metrics/filters" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" //+kubebuilder:scaffold:imports ) @@ -148,8 +149,9 @@ func main() { webhookServer := webhook.NewServer(webhookServerOptions) metricsServerOptions := metricsserver.Options{ - BindAddress: metricsAddr, - TLSOpts: []func(*tls.Config){disableHTTP2}, + BindAddress: metricsAddr, + TLSOpts: []func(*tls.Config){disableHTTP2}, + FilterProvider: filters.WithAuthenticationAndAuthorization, } // Set default manager options @@ -258,13 +260,11 @@ func main() { argocdprovisioner.Register(openshift.ReconcilerHook, openshift.BuilderHook) if err = (&argocdprovisioner.ReconcileArgoCD{ - Client: client, - Scheme: mgr.GetScheme(), - LabelSelector: labelSelectorFlag, - K8sClient: k8sClient, - LocalUsers: &argocdprovisioner.LocalUsersInfo{ - TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{}, - }, + Client: client, + Scheme: mgr.GetScheme(), + LabelSelector: labelSelectorFlag, + K8sClient: k8sClient, + LocalUsers: argocdprovisioner.NewLocalUsersInfo(), FipsConfigChecker: argoutil.NewLinuxFipsConfigChecker(), }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "Argo CD") diff --git a/common/common.go b/common/common.go index 26206b81b09b..2cbf75c3fe7a 100644 --- a/common/common.go +++ b/common/common.go @@ -30,9 +30,9 @@ const ( // InfraNodeLabelSelector is a nodeSelector for infrastructure nodes in Openshift InfraNodeLabelSelector = "node-role.kubernetes.io/infra" // Default console plugin image - DefaultConsoleImage = "quay.io/redhat-developer/gitops-console-plugin" + DefaultConsoleImage = "quay.io/redhat-user-workloads/rh-openshift-gitops-tenant/console-plugin-rhel9" // Default console plugin version - DefaultConsoleVersion = "v0.1.0" + DefaultConsoleVersion = "main" // Default console plugin installation OCP version DefaultDynamicPluginStartOCPVersion = "4.15.0" // ImagePullPolicyEnvVar is the environment variable for configuring image pull policy diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 4002b7d08288..5e95ce2f276a 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -24,11 +24,12 @@ bases: # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. - ../prometheus +# Protect the /metrics endpoint with controller-runtime authn/authz. +# If you comment out manager_metrics_patch.yaml, also comment out metrics_service.yaml, +# metrics_role.yaml, metrics_role_binding.yaml, and metrics_reader_clusterrole.yaml +# in ../rbac/kustomization.yaml so the metrics Service is disabled as well. patchesStrategicMerge: -# Protect the /metrics endpoint by putting it behind auth. -# If you want your controller-manager to expose the /metrics -# endpoint w/o any authn/z, please comment the following line. -- manager_auth_proxy_patch.yaml +- manager_metrics_patch.yaml # Mount the controller config file for loading manager configurations # through a ComponentConfig type diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml deleted file mode 100644 index 2e59d771aef3..000000000000 --- a/config/default/manager_auth_proxy_patch.yaml +++ /dev/null @@ -1,57 +0,0 @@ -# This patch inject a sidecar container which is a HTTP proxy for the -# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews. -apiVersion: apps/v1 -kind: Deployment -metadata: - name: controller-manager - namespace: system -spec: - selector: - matchLabels: - control-plane: gitops-operator - template: - spec: - containers: - - name: kube-rbac-proxy - image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.15 - 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 - ports: - - containerPort: 8443 - protocol: TCP - 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 - - name: manager - args: - - "--health-probe-bind-address=:8081" - - "--metrics-bind-address=127.0.0.1:8080" - - "--leader-elect" - volumes: - # Secret created by the service CA operator. - # We assume that the Kubernetes service exposing the application's pods has the - # "service.beta.openshift.io/serving-cert-secret-name: kube-rbac-proxy-tls" - # annotation. - - name: kube-rbac-proxy-tls - secret: - secretName: kube-rbac-proxy-tls diff --git a/config/default/manager_metrics_patch.yaml b/config/default/manager_metrics_patch.yaml new file mode 100644 index 000000000000..fd3be311cc09 --- /dev/null +++ b/config/default/manager_metrics_patch.yaml @@ -0,0 +1,24 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system +spec: + selector: + matchLabels: + control-plane: gitops-operator + template: + spec: + containers: + - name: manager + args: + - "--health-probe-bind-address=:8081" + - "--metrics-bind-address=:8443" + - "--leader-elect" + ports: + - name: metrics + containerPort: 8443 + protocol: TCP + - name: health + containerPort: 8081 + protocol: TCP diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 1798d0f8e838..caf6b6eee785 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -9,10 +9,11 @@ resources: - role_binding.yaml - leader_election_role.yaml - leader_election_role_binding.yaml -# Comment the following 4 lines if you want to disable -# the auth proxy (https://github.com/brancz/kube-rbac-proxy) -# which protects your /metrics endpoint. -- auth_proxy_service.yaml -- auth_proxy_role.yaml -- auth_proxy_role_binding.yaml -# - auth_proxy_client_clusterrole.yaml +# These resources expose /metrics over HTTPS on port 8443 and grant the +# controller-runtime authn/authz permissions required by manager_metrics_patch.yaml. +# Comment these lines together with manager_metrics_patch.yaml if you want to +# disable secure metrics for the controller-manager. +- metrics_service.yaml +- metrics_role.yaml +- metrics_role_binding.yaml +# - metrics_reader_clusterrole.yaml diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/metrics_reader_clusterrole.yaml similarity index 100% rename from config/rbac/auth_proxy_client_clusterrole.yaml rename to config/rbac/metrics_reader_clusterrole.yaml diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/metrics_role.yaml similarity index 93% rename from config/rbac/auth_proxy_role.yaml rename to config/rbac/metrics_role.yaml index 2c5e79556555..1db66f0abace 100644 --- a/config/rbac/auth_proxy_role.yaml +++ b/config/rbac/metrics_role.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: proxy-role + name: metrics-role rules: - nonResourceURLs: - "/metrics" diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/metrics_role_binding.yaml similarity index 81% rename from config/rbac/auth_proxy_role_binding.yaml rename to config/rbac/metrics_role_binding.yaml index ec7acc0a1b79..88ede78fe671 100644 --- a/config/rbac/auth_proxy_role_binding.yaml +++ b/config/rbac/metrics_role_binding.yaml @@ -1,11 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: proxy-rolebinding + name: metrics-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: proxy-role + name: metrics-role subjects: - kind: ServiceAccount name: controller-manager diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/metrics_service.yaml similarity index 100% rename from config/rbac/auth_proxy_service.yaml rename to config/rbac/metrics_service.yaml diff --git a/config/samples/argoproj.io_v1beta1_namespacemanagement.yaml b/config/samples/argoproj.io_v1beta1_namespacemanagement.yaml new file mode 100644 index 000000000000..fb965c856675 --- /dev/null +++ b/config/samples/argoproj.io_v1beta1_namespacemanagement.yaml @@ -0,0 +1,6 @@ +apiVersion: argoproj.io/v1beta1 +kind: NamespaceManagement +metadata: + name: namespacemanagement-sample +spec: + managedBy: argocd-ns \ No newline at end of file diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 0c7cc7858118..988b921e3ad9 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -8,4 +8,5 @@ resources: - argoproj.io_v1alpha1_notificationsconfiguration.yaml - argoproj.io_v1alpha1_rollout.yaml - argoproj.io_v1alpha1_rolloutmanager.yaml +- argoproj.io_v1beta1_namespacemanagement.yaml #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/controllers/gitopsservice_controller.go b/controllers/gitopsservice_controller.go index 3838801befff..bf8d602bb9cc 100644 --- a/controllers/gitopsservice_controller.go +++ b/controllers/gitopsservice_controller.go @@ -61,7 +61,7 @@ var logs = logf.Log.WithName("controller_gitopsservice") // defaults must some somewhere else.. var ( port int32 = 8080 - backendImage string = "quay.io/redhat-developer/gitops-backend:v0.0.1" + backendImage string = "quay.io/redhat-user-workloads/rh-openshift-gitops-tenant/gitops-rhel9:main" backendImageEnvName = "BACKEND_IMAGE" serviceName = "cluster" insecureEnvVar = "INSECURE" @@ -76,6 +76,7 @@ const ( // PodSecurityLabelSyncLabel enables OpenShift to manage pod-security.kubernetes.io/* on the namespace. PodSecurityLabelSyncLabel = "security.openshift.io/scc.podSecurityLabelSync" PodSecurityLabelSyncLabelValue = "true" + kamResourceName = "kam" ) // SetupWithManager sets up the controller with the Manager. @@ -262,6 +263,8 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil Namespace: namespace, } + r.cleanKAMResources(ctx, reqLogger) + if !r.DisableDefaultInstall { // Create/reconcile the default Argo CD instance, unless default install is disabled if result, err := r.reconcileDefaultArgoCDInstance(instance, reqLogger); err != nil { @@ -315,6 +318,44 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil } } +// Detect the unsupported KAM components across Deployments , Routes , Services and deletes them to perform cleanup as KAM is no longer supported since 1.15 +func (r *ReconcileGitopsService) cleanKAMResources(ctx context.Context, reqLogger logr.Logger) { + + // KAM Deployment + cleanupKAMDeployment := &appsv1.Deployment{} + if err := r.Client.Get(ctx, types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, cleanupKAMDeployment); err == nil { + reqLogger.Info("Detected unsupported KAM Deployment, deleting", "Name", kamResourceName, "Namespace", serviceNamespace) + if err := r.Client.Delete(ctx, cleanupKAMDeployment); err != nil && !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to delete KAM Deployment", "Name", kamResourceName, "Namespace", serviceNamespace) + } + } else if !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to retrieve KAM Deployment", "Name", kamResourceName, "Namespace", serviceNamespace) + } + + // KAM Service + cleanupKAMService := &corev1.Service{} + if err := r.Client.Get(ctx, types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, cleanupKAMService); err == nil { + reqLogger.Info("Detected unsupported KAM Service, deleting", "Name", kamResourceName, "Namespace", serviceNamespace) + if err := r.Client.Delete(ctx, cleanupKAMService); err != nil && !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to delete KAM Service", "Name", kamResourceName, "Namespace", serviceNamespace) + } + } else if !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to retrieve KAM Service", "Name", kamResourceName, "Namespace", serviceNamespace) + } + + // KAM Route + cleanupKAMRoute := &routev1.Route{} + if err := r.Client.Get(ctx, types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, cleanupKAMRoute); err == nil { + reqLogger.Info("Detected unsupported KAM Route, deleting", "Name", kamResourceName, "Namespace", serviceNamespace) + if err := r.Client.Delete(ctx, cleanupKAMRoute); err != nil && !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to delete KAM Route", "Name", kamResourceName, "Namespace", serviceNamespace) + } + } else if !errors.IsNotFound(err) { + reqLogger.Error(err, "Failed to retrieve KAM Route", "Name", kamResourceName, "Namespace", serviceNamespace) + } + +} + func (r *ReconcileGitopsService) ensureDefaultArgoCDInstanceDoesntExist() error { defaultArgoCDInstance, err := argocd.NewCR(common.ArgoCDInstanceName, serviceNamespace, r.Client) diff --git a/controllers/gitopsservice_controller_test.go b/controllers/gitopsservice_controller_test.go index 2950bc2a76a2..cfc7c6be07c5 100644 --- a/controllers/gitopsservice_controller_test.go +++ b/controllers/gitopsservice_controller_test.go @@ -869,6 +869,132 @@ func TestReconcileBackend_DefaultRequestsAndLimits(t *testing.T) { assert.Equal(t, deployment.Spec.Template.Spec.Containers[0].Resources.Limits["cpu"], resourcev1.MustParse("500m")) } +// Tests for KAM component cleanup +// No resources exist +func TestCleanKAMResources_NoResourcesExist(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + fakeClient := fake.NewClientBuilder().WithScheme(s).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + // No KAM resources exist - function should be a silent no-op + reconciler.cleanKAMResources(context.TODO(), reqLogger) +} + +// Deployment exist +func TestCleanKAMResources_DeploymentExist(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + + kamDeploy := &appsv1.Deployment{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(kamDeploy).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + reconciler.cleanKAMResources(context.TODO(), reqLogger) + + err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &appsv1.Deployment{}) + if !errors.IsNotFound(err) { + t.Fatalf("expected KAM Deployment to be deleted , got err: %v", err) + } +} + +// Service exist +func TestCleanKAMResources_ServiceExist(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + kamService := &corev1.Service{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(kamService).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + reconciler.cleanKAMResources(context.TODO(), reqLogger) + + err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &corev1.Service{}) + if !errors.IsNotFound(err) { + t.Fatalf("expected KAM Service to be deleted , got err: %v", err) + } +} + +// Route exist +func TestCleanKAMResources_RouteExist(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + kamRoute := &routev1.Route{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(kamRoute).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + reconciler.cleanKAMResources(context.TODO(), reqLogger) + + err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &routev1.Route{}) + if !errors.IsNotFound(err) { + t.Fatalf("expected KAM Route to be deleted , got err: %v", err) + } +} + +// All Resources exist +func TestCleanKAMResources_AllResourcesExist(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + kamDeploy := &appsv1.Deployment{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + kamService := &corev1.Service{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + kamRoute := &routev1.Route{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(kamDeploy, kamService, kamRoute).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + reconciler.cleanKAMResources(context.TODO(), reqLogger) + + if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &appsv1.Deployment{}); !errors.IsNotFound(err) { + t.Fatalf("expected KAM Deployment to be deleted , got err: %v", err) + } + if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &corev1.Service{}); !errors.IsNotFound(err) { + t.Fatalf("expected KAM Service to be deleted , got err: %v", err) + } + if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: kamResourceName, Namespace: serviceNamespace}, &routev1.Route{}); !errors.IsNotFound(err) { + t.Fatalf("expected KAM Route to be deleted , got err: %v", err) + } +} + +// Idempotency +func TestCleanKAMResources_Idempotent(t *testing.T) { + logf.SetLogger(zap.New(zap.UseDevMode(true))) + s := scheme.Scheme + addKnownTypesToScheme(s) + kamDeploy := &appsv1.Deployment{ + ObjectMeta: v1.ObjectMeta{Name: kamResourceName, Namespace: serviceNamespace}, + } + fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(kamDeploy).Build() + reconciler := newReconcileGitOpsService(fakeClient, s) + reqLogger := logs.WithValues("Request.Namespace", "test", "Request.Name", "test") + + // First call - deletes the KAM resource + reconciler.cleanKAMResources(context.TODO(), reqLogger) + + // Second call - must not panic even if the resources are already deleted + reconciler.cleanKAMResources(context.TODO(), reqLogger) + +} + func addKnownTypesToScheme(scheme *runtime.Scheme) { scheme.AddKnownTypes(configv1.GroupVersion, &configv1.ClusterVersion{}) scheme.AddKnownTypes(pipelinesv1alpha1.GroupVersion, &pipelinesv1alpha1.GitopsService{}) diff --git a/go.mod b/go.mod index 1d8dd51773ae..d9ff3e7b8a74 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518 + github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 github.com/hashicorp/go-version v1.7.0 github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 @@ -98,7 +99,6 @@ require ( github.com/google/go-github/v75 v75.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect - github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect diff --git a/hack/non-olm-install/install-gitops-operator.sh b/hack/non-olm-install/install-gitops-operator.sh index af0f543e0cd0..e9370a8db4e1 100755 --- a/hack/non-olm-install/install-gitops-operator.sh +++ b/hack/non-olm-install/install-gitops-operator.sh @@ -253,16 +253,6 @@ spec: openshift.io/scc: restricted-v2 spec: containers: - - name: kube-rbac-proxy - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - readOnlyRootFilesystem: true - runAsNonRoot: true - seccompProfile: - type: RuntimeDefault - name: manager securityContext: allowPrivilegeEscalation: false diff --git a/hack/scripts/README.md b/hack/scripts/README.md index 42daca4545fc..0ef3eb440726 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/olm-deploy.sh b/hack/scripts/olm-deploy.sh new file mode 100755 index 000000000000..150eb4d39f49 --- /dev/null +++ b/hack/scripts/olm-deploy.sh @@ -0,0 +1,125 @@ +#!/usr/bin/env bash +# https://github.com/olivergondza/bash-strict-mode +set -eEuo pipefail +trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" + +SUBSCRIPTION_NAME="openshift-gitops-operator" +OPERATOR_NAMESPACE="openshift-gitops-operator" +VERSION="$(git describe --tags --dirty | sed 's/^v//')-$(date '+%Y%m%d-%H%M%S')" + +function build_bundles() { + export VERSION + make build docker-build docker-push bundle bundle-build bundle-push catalog-build catalog-push +} + +function install_catalog_source() { + oc apply -f - <&2 "Waiting for catalog source to be ready... ($i)" + yaml=$(oc get -o yaml CatalogSource devel-gitops-service-source -n openshift-marketplace --ignore-not-found) + if [ "$(yq '.status.connectionState.lastObservedState' <<< "$yaml")" == "READY" ]; then + echo >&2 "Catalog source is ready" + return 0 + fi + + sleep 5 + done + + echo >&2 "Timeout waiting for catalog source to be ready. Current state:" + echo >&2 "$yaml" + return 1 +} + +function delete_operator() { + oc delete subscription "$SUBSCRIPTION_NAME" -n "$OPERATOR_NAMESPACE" --ignore-not-found + readarray -t ogs < <(oc get operatorgroup -n "$OPERATOR_NAMESPACE" -o name --ignore-not-found) + if [[ ${#ogs[@]} -gt 0 ]]; then + oc delete -n "$OPERATOR_NAMESPACE" "${ogs[@]}" + fi + oc delete csv -n "$OPERATOR_NAMESPACE" -l "operators.coreos.com/${SUBSCRIPTION_NAME}.${OPERATOR_NAMESPACE}" --ignore-not-found + + readarray -t pods < <(oc get pod -n "$OPERATOR_NAMESPACE" -o name --ignore-not-found) + if [[ ${#pods[@]} -gt 0 ]]; then + # Pods might stop existing before query and delete, so ignoring not found ones + oc delete -n "$OPERATOR_NAMESPACE" "${pods[@]}" --ignore-not-found + fi + oc delete ns "$OPERATOR_NAMESPACE" --ignore-not-found +} + +function install_operator() { + oc create ns "$OPERATOR_NAMESPACE" + oc apply -f - <&2 "Waiting for operator to start... ($i)" + out=$(oc get pods -n "$OPERATOR_NAMESPACE" --ignore-not-found --no-headers) + echo "$out" + if [[ "$out" =~ "Running" ]]; then + echo >&2 "Operator is ready" + return 0 + fi + sleep 5 + done + + echo >&2 "Timeout waiting for operator to start. Current state:" + echo >&2 "$out" + oc events -n "$OPERATOR_NAMESPACE" >&2 + return 1 +} + +# When calling this script, specify environment variable pointing to, e.g.: +# "IMAGE=quay.io/(your username)/gitops-operator" make olm-deploy +# - The make targets will push to a number of repositories in your quay.io account +# - Ensure that the docker/podman credentials you are using have push access to those repositories. e.g: (...)/gitops-operator, (...)/gitops-operator-bundle, (...)/gitops-operator-catalog. + +function main() { + if [ ! -v IMAGE ]; then + echo >&2 "Variable IMAGE not specified" + exit 1 + fi + + echo >&2 "Deploying version $VERSION" + + build_bundles + install_catalog_source + delete_operator + install_operator +} + +main "$@" 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 3eefb53ed36f..000000000000 --- 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 c5958fee3fb8..f546f5784256 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.9 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 c44dd23490fe..32c1161cc17c --- 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 8af2ab90ed18..000000000000 --- 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/scripts/run-rollouts-e2e-tests.sh b/scripts/run-rollouts-e2e-tests.sh index d0bb66b6534d..4d1088c75976 100755 --- a/scripts/run-rollouts-e2e-tests.sh +++ b/scripts/run-rollouts-e2e-tests.sh @@ -217,7 +217,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager" # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh': # - It should always point to the same argo-rollouts-manager commit that is referenced in go.mod of gitops-operator (which will usually be the most recent argo-rollouts-manager commit) -TARGET_ROLLOUT_MANAGER_COMMIT=1824164aac67c5eb8e331238ec9f602809537ab4 +TARGET_ROLLOUT_MANAGER_COMMIT=25ad7d58a5c7dc400876ece381f9adc6148b0ad7 # This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh': # - It should always point to the same argo-rollouts-manager commit that is referenced in the version of argo-rollouts-manager that is in go.mod diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index c6295965f784..b39fcfb2d893 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -168,12 +168,10 @@ var _ = BeforeSuite(func() { Expect(err).ToNot(HaveOccurred()) err = (&argocdprovisioner.ReconcileArgoCD{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - K8sClient: k8sClient, - LocalUsers: &argocdprovisioner.LocalUsersInfo{ - TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{}, - }, + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + K8sClient: k8sClient, + LocalUsers: argocdprovisioner.NewLocalUsersInfo(), }).SetupWithManager(mgr) Expect(err).NotTo(HaveOccurred()) diff --git a/test/examples/Readme.md b/test/examples/Readme.md index 17da52c0af1d..2e9899a1b0f9 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/examples/image-updater/deployment.yaml b/test/examples/image-updater/deployment.yaml new file mode 100644 index 000000000000..c0a34b1b339b --- /dev/null +++ b/test/examples/image-updater/deployment.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: e2e-registry +spec: + replicas: 1 + selector: + matchLabels: + app: test-app-005 + component: argocd-image-updater-e2e + template: + metadata: + labels: + app: test-app-005 + component: argocd-image-updater-e2e + spec: + containers: + - name: test + image: quay.io/devtools_gitops/guestbook_go:1.0.0 \ No newline at end of file diff --git a/test/examples/image-updater/kustomization.yaml b/test/examples/image-updater/kustomization.yaml new file mode 100644 index 000000000000..ff6d7ee7eca5 --- /dev/null +++ b/test/examples/image-updater/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - deployment.yaml \ No newline at end of file diff --git a/test/nondefaulte2e/suite_test.go b/test/nondefaulte2e/suite_test.go index 6214a566acf4..a0a4c14b4739 100644 --- a/test/nondefaulte2e/suite_test.go +++ b/test/nondefaulte2e/suite_test.go @@ -155,12 +155,10 @@ var _ = BeforeSuite(func() { Expect(err).ToNot(HaveOccurred()) err = (&argocdprovisioner.ReconcileArgoCD{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - K8sClient: k8sClient, - LocalUsers: &argocdprovisioner.LocalUsersInfo{ - TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{}, - }, + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + K8sClient: k8sClient, + LocalUsers: argocdprovisioner.NewLocalUsersInfo(), }).SetupWithManager(mgr) Expect(err).NotTo(HaveOccurred()) diff --git a/test/openshift/e2e/README.md b/test/openshift/e2e/README.md index c211df1c2254..937c569bb4fb 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/ginkgo/fixture/agent/fixture.go b/test/openshift/e2e/ginkgo/fixture/agent/fixture.go index 60a417231fc6..22589ff840b0 100644 --- a/test/openshift/e2e/ginkgo/fixture/agent/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/agent/fixture.go @@ -323,7 +323,7 @@ func VerifyExpectedResourcesExist(params VerifyExpectedResourcesExistParams) { Name: params.SecretNames.RedisInitialPasswordSecretName, Namespace: params.Namespace.Name, }, - }, "30s", "2s").Should(k8sFixture.ExistByName()) + }, "60s", "2s").Should(k8sFixture.ExistByName()) } Eventually(params.ServiceAccount).Should(k8sFixture.ExistByName()) diff --git a/test/openshift/e2e/ginkgo/fixture/application/fixture.go b/test/openshift/e2e/ginkgo/fixture/application/fixture.go index b44d9d4a9c66..6e18849f896e 100644 --- a/test/openshift/e2e/ginkgo/fixture/application/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/application/fixture.go @@ -1,6 +1,9 @@ package application import ( + "fmt" + "regexp" + . "github.com/onsi/gomega" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" "k8s.io/client-go/util/retry" @@ -83,6 +86,40 @@ func HaveSyncStatusCode(expected appv1alpha1.SyncStatusCode) matcher.GomegaMatch } +func HaveNoConditions() matcher.GomegaMatcher { + return expectedCondition(func(app *appv1alpha1.Application) bool { + count := len(app.Status.Conditions) + if count == 0 { + return true + } + + GinkgoWriter.Printf("HaveNoConditions - have: %+v\n", app.Status.Conditions) + return false + }) +} + +func HaveConditionMatching(conditionType appv1alpha1.ApplicationConditionType, messagePattern string) matcher.GomegaMatcher { + pattern := regexp.MustCompile(messagePattern) + + return expectedCondition(func(app *appv1alpha1.Application) bool { + conditions := app.Status.Conditions + var found []string + for _, condition := range conditions { + found = append(found, fmt.Sprintf(" - %s/%s", condition.Type, condition.Message)) + + if condition.Type == conditionType && pattern.MatchString(condition.Message) { + return true + } + } + + GinkgoWriter.Printf("HaveConditionMatching - expected: %s/%s; current(%d):\n", conditionType, messagePattern, len(conditions)) + for _, f := range found { + GinkgoWriter.Println(f) + } + return false + }) +} + // Update will keep trying to update object until it succeeds, or times out. func Update(obj *appv1alpha1.Application, modify func(*appv1alpha1.Application)) { k8sClient, _ := utils.GetE2ETestKubeClient() diff --git a/test/openshift/e2e/ginkgo/fixture/argocd/fixture.go b/test/openshift/e2e/ginkgo/fixture/argocd/fixture.go index 239be3a33ca4..cc0318969d64 100644 --- a/test/openshift/e2e/ginkgo/fixture/argocd/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/argocd/fixture.go @@ -191,32 +191,33 @@ func HaveExternalAuthenticationCondition(expected metav1.Condition) matcher.Gome func HaveCondition(condition metav1.Condition) matcher.GomegaMatcher { return fetchArgoCD(func(argocd *argov1beta1api.ArgoCD) bool { - if len(argocd.Status.Conditions) != 1 { - GinkgoWriter.Println("HaveCondition: length is zero") + length := len(argocd.Status.Conditions) + if length != 1 { + GinkgoWriter.Printf("HaveCondition: length is %d\n", length) return false } instanceCondition := argocd.Status.Conditions[0] - GinkgoWriter.Println("HaveCondition - Message:", instanceCondition.Message, condition.Message) + GinkgoWriter.Printf("HaveCondition - Message: '%s' / actual: '%s'\n", condition.Message, instanceCondition.Message) if instanceCondition.Message != condition.Message { GinkgoWriter.Println("HaveCondition: message does not match") return false } - GinkgoWriter.Println("HaveCondition - Reason:", instanceCondition.Reason, condition.Reason) + GinkgoWriter.Printf("HaveCondition - Reason: '%s' / actual: '%s'\n", condition.Reason, instanceCondition.Reason) if instanceCondition.Reason != condition.Reason { GinkgoWriter.Println("HaveCondition: reason does not match") return false } - GinkgoWriter.Println("HaveCondition - Status:", instanceCondition.Status, condition.Status) + GinkgoWriter.Printf("HaveCondition - Status: '%s' / actual: '%s'\n", condition.Status, instanceCondition.Status) if instanceCondition.Status != condition.Status { GinkgoWriter.Println("HaveCondition: status does not match") return false } - GinkgoWriter.Println("HaveCondition - Type:", instanceCondition.Type, condition.Type) + GinkgoWriter.Printf("HaveCondition - Type: '%s' / actual: '%s'\n", condition.Type, instanceCondition.Type) if instanceCondition.Type != condition.Type { GinkgoWriter.Println("HaveCondition: type does not match") return false diff --git a/test/openshift/e2e/ginkgo/fixture/argocdclient/fixture.go b/test/openshift/e2e/ginkgo/fixture/argocdclient/fixture.go new file mode 100644 index 000000000000..188f2b4210ed --- /dev/null +++ b/test/openshift/e2e/ginkgo/fixture/argocdclient/fixture.go @@ -0,0 +1,199 @@ +/* +Copyright 2026. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package argocdclient + +import ( + "crypto/tls" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "strings" + "sync" + "time" + + "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" + "github.com/gorilla/websocket" +) + +// TerminalClient represents a test client for terminal WebSocket connections. +type TerminalClient struct { + wsConn *websocket.Conn + mu sync.Mutex + closed bool + output strings.Builder + outputMu sync.Mutex +} + +// ExecTerminal opens a terminal session to a pod via WebSocket. +// This replicates the behavior of the ArgoCD UI when a user opens a terminal session to an application. +// ArgoCD decides which shell to use based on the configured allowed shells. +func ExecTerminal(endpoint, token string, app *v1alpha1.Application, namespace, podName, container string) (*TerminalClient, error) { + u := &url.URL{ + Scheme: "wss", + Host: endpoint, + Path: "/terminal", + } + + q := u.Query() + q.Set("pod", podName) + q.Set("container", container) + q.Set("appName", app.Name) + q.Set("appNamespace", app.Namespace) + q.Set("projectName", app.Spec.Project) + q.Set("namespace", namespace) + u.RawQuery = q.Encode() + + dialer := websocket.Dialer{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, // #nosec G402 + }, + } + + headers := http.Header{} + headers.Set("Cookie", fmt.Sprintf("argocd.token=%s", token)) + + wsConn, resp, err := dialer.Dial(u.String(), headers) + if err != nil { + if resp != nil { + defer resp.Body.Close() + body, _ := io.ReadAll(resp.Body) + return nil, fmt.Errorf("failed to connect to terminal WebSocket: %w (status: %d, body: %s)", err, resp.StatusCode, string(body)) + } + return nil, fmt.Errorf("failed to connect to terminal WebSocket: %w", err) + } + + session := &TerminalClient{ + wsConn: wsConn, + } + + go session.readOutput() + + return session, nil +} + +// terminalMessage is the JSON message format used by ArgoCD terminal WebSocket +type terminalMessage struct { + Operation string `json:"operation"` + Data string `json:"data"` + Rows uint16 `json:"rows"` + Cols uint16 `json:"cols"` +} + +// readOutput continuously reads output from the WebSocket connection +func (s *TerminalClient) readOutput() { + for { + _, message, err := s.wsConn.ReadMessage() + if err != nil { + // Connection closed or error + return + } + + if len(message) < 1 { + continue + } + + // Parse JSON message + var msg terminalMessage + if err := json.Unmarshal(message, &msg); err != nil { + continue + } + + switch msg.Operation { + case "stdout": + s.outputMu.Lock() + s.output.WriteString(msg.Data) + s.outputMu.Unlock() + } + } +} + +// SendInput sends input to the terminal session +func (s *TerminalClient) SendInput(input string) error { + s.mu.Lock() + defer s.mu.Unlock() + + if s.closed { + return errors.New("session is closed") + } + + // ArgoCD terminal uses JSON messages (includes rows/cols like the UI) + msg, err := json.Marshal(terminalMessage{ + Operation: "stdin", + Data: input, + Rows: 24, + Cols: 80, + }) + if err != nil { + return err + } + return s.wsConn.WriteMessage(websocket.TextMessage, msg) +} + +// SendResize sends a terminal resize message +func (s *TerminalClient) SendResize(cols, rows uint16) error { + s.mu.Lock() + defer s.mu.Unlock() + + if s.closed { + return errors.New("session is closed") + } + + // ArgoCD terminal uses JSON messages + msg, err := json.Marshal(terminalMessage{ + Operation: "resize", + Cols: cols, + Rows: rows, + }) + if err != nil { + return err + } + return s.wsConn.WriteMessage(websocket.TextMessage, msg) +} + +// GetOutput returns all captured output so far +func (s *TerminalClient) GetOutput() string { + s.outputMu.Lock() + defer s.outputMu.Unlock() + return s.output.String() +} + +// WaitForOutput waits until the output contains the expected string or timeout +func (s *TerminalClient) WaitForOutput(expected string, timeout time.Duration) bool { + deadline := time.Now().Add(timeout) + for time.Now().Before(deadline) { + if strings.Contains(s.GetOutput(), expected) { + return true + } + time.Sleep(100 * time.Millisecond) + } + return false +} + +// Close closes the terminal session +func (s *TerminalClient) Close() error { + s.mu.Lock() + defer s.mu.Unlock() + + if s.closed { + return nil + } + s.closed = true + return s.wsConn.Close() +} diff --git a/test/openshift/e2e/ginkgo/fixture/clusterrole/fixture.go b/test/openshift/e2e/ginkgo/fixture/clusterrole/fixture.go index 7c3ea8700e93..83f2048b28c1 100644 --- a/test/openshift/e2e/ginkgo/fixture/clusterrole/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/clusterrole/fixture.go @@ -2,6 +2,7 @@ package clusterrole import ( "context" + "reflect" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -32,6 +33,13 @@ func Update(obj *rbacv1.ClusterRole, modify func(*rbacv1.ClusterRole)) { } +func HaveRules(expectedRules []rbacv1.PolicyRule) matcher.GomegaMatcher { + return fetchRole(func(cr *rbacv1.ClusterRole) bool { + GinkgoWriter.Println("HaveRules - Expected:", expectedRules, "/ Actual:", cr.Rules) + return reflect.DeepEqual(expectedRules, cr.Rules) + }) +} + // This is intentionally NOT exported, for now. Create another function in this file/package that calls this function, and export that. // //nolint:unused diff --git a/test/openshift/e2e/ginkgo/fixture/k8s/fixture.go b/test/openshift/e2e/ginkgo/fixture/k8s/fixture.go index ec5177996202..7f1f3486e49d 100644 --- a/test/openshift/e2e/ginkgo/fixture/k8s/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/k8s/fixture.go @@ -98,15 +98,23 @@ func NotHaveLabelWithValue(key string, value string) matcher.GomegaMatcher { // ExistByName checks if the given k8s resource exists, when retrieving it by name/namespace. // - It does NOT check if the resource content matches. It only checks that a resource of that type and name exists. func ExistByName() matcher.GomegaMatcher { + return ExistByNameWithClient(nil) +} - return WithTransform(func(k8sObject client.Object) bool { - k8sClient, _, err := utils.GetE2ETestKubeClientWithError() - if err != nil { - GinkgoWriter.Println(err) - return false - } +// ExistByNameWithClient checks if the given k8s resource exists, when retrieving it by name/namespace. +// - It does NOT check if the resource content matches. It only checks that a resource of that type and name exists. +// +// NOTE: you probably want to instead use ExistByName() +func ExistByNameWithClient(k8sClient client.Client) matcher.GomegaMatcher { + if k8sClient == nil { + var err error + k8sClient, _, err = utils.GetE2ETestKubeClientWithError() + Expect(err).ToNot(HaveOccurred()) + Expect(k8sClient).ShouldNot(BeNil()) + } - err = k8sClient.Get(context.Background(), client.ObjectKeyFromObject(k8sObject), k8sObject) + return WithTransform(func(k8sObject client.Object) bool { + err := k8sClient.Get(context.Background(), client.ObjectKeyFromObject(k8sObject), k8sObject) if err != nil { GinkgoWriter.Println("Object does not exists in ExistByName:", k8sObject.GetName(), err) } else { diff --git a/test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go b/test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go index 06c03df01b46..2b2913814925 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-019_validate_volume_mounts_test.go @@ -76,6 +76,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { {Name: "plugins-home", MountPath: "/home/argocd"}, {Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"}, {Name: "tmp", MountPath: "/tmp"}, + {Name: "redis-initial-pass", MountPath: "/app/config/redis-auth/"}, })) Expect(argocdServerDepl.Spec.Template.Spec.Volumes).To(Equal([]corev1.Volume{ @@ -130,6 +131,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { EmptyDir: &corev1.EmptyDirVolumeSource{}, }, }, + { + Name: "redis-initial-pass", + VolumeSource: corev1.VolumeSource{ + Secret: &corev1.SecretVolumeSource{ + SecretName: "argocd-redis-initial-password", + DefaultMode: ptr.To(int32(420)), + Items: []corev1.KeyToPath{ + {Key: "auth", Path: "auth"}, + {Key: "auth_username", Path: "auth_username"}, + }, + }, + }, + }, })) By("verifying volumemounts and volumes of Argo CD Repo server") @@ -145,6 +159,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { {Name: "argocd-repo-server-tls", MountPath: "/app/config/reposerver/tls"}, {Name: "argocd-operator-redis-tls", MountPath: "/app/config/reposerver/tls/redis"}, {Name: "plugins", MountPath: "/home/argocd/cmp-server/plugins"}, + {Name: "redis-initial-pass", MountPath: "/app/config/redis-auth/"}, {Name: "tmp", MountPath: "/tmp"}, })) @@ -203,6 +218,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { EmptyDir: &corev1.EmptyDirVolumeSource{}, }, }, + { + Name: "redis-initial-pass", + VolumeSource: corev1.VolumeSource{ + Secret: &corev1.SecretVolumeSource{ + SecretName: "argocd-redis-initial-password", + DefaultMode: ptr.To(int32(420)), + Items: []corev1.KeyToPath{ + {Key: "auth", Path: "auth"}, + {Key: "auth_username", Path: "auth_username"}, + }, + }, + }, + }, { Name: "tmp", VolumeSource: corev1.VolumeSource{ EmptyDir: &corev1.EmptyDirVolumeSource{}, @@ -221,6 +249,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { {Name: "argocd-home", MountPath: "/home/argocd"}, {Name: "argocd-cmd-params-cm", MountPath: "/home/argocd/params"}, {Name: "argocd-application-controller-tmp", MountPath: "/tmp"}, + {Name: "redis-initial-pass", MountPath: "/app/config/redis-auth/"}, })) Expect(applControllerSS.Spec.Template.Spec.Volumes).To(Equal([]corev1.Volume{ @@ -264,6 +293,19 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { EmptyDir: &corev1.EmptyDirVolumeSource{}, }, }, + { + Name: "redis-initial-pass", + VolumeSource: corev1.VolumeSource{ + Secret: &corev1.SecretVolumeSource{ + SecretName: "argocd-redis-initial-password", + DefaultMode: ptr.To(int32(420)), + Items: []corev1.KeyToPath{ + {Key: "auth", Path: "auth"}, + {Key: "auth_username", Path: "auth_username"}, + }, + }, + }, + }, })) By("adding volume to applicationset controller, and verifying volumemounts and volumes are set on Deployment") diff --git a/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go b/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go index 49d4c5930e1a..afe912ca5a70 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-065_validate_redis_ha_anti_affinity_test.go @@ -71,7 +71,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) By("waiting for ArgoCD CR to be reconciled and the instance to be ready") - Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD, "10m", "5s").Should(argocdFixture.BeAvailable()) By("verifying redis HA server exists and has the appropriate anti-affinity") redisHAStatefulSet := &appsv1.StatefulSet{ diff --git a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go index ca678c0e61e1..758eeeb54b62 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-066_validate_redis_secure_comm_no_autotls_no_ha_test.go @@ -22,6 +22,7 @@ import ( "time" argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" + "github.com/argoproj-labs/argocd-operator/controllers/argoutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" @@ -142,7 +143,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { By("expecting redis-server to have desired container process command/arguments") - expectedString := "--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" + expectedString := "--save \"\" --appendonly no --aclfile /app/config/redis-auth/users.acl --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" if !fixture.IsUpstreamOperatorTests() { // Downstream operator adds these arguments @@ -175,5 +176,72 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { }) + It("verify redis credential distribution", func() { + + By("creating simple Argo CD instance") + ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() + + argoCD := &argov1beta1api.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: ns.Name}, + Spec: argov1beta1api.ArgoCDSpec{}, + } + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("waiting for ArgoCD CR to be reconciled and the instance to be ready") + Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) + + By("verify redis creds are correctly passed to pods") + const expectedMsg = "Loading Redis credentials from mounted directory: /app/config/redis-auth/" + expectedComponents := []string{ + "statefulset/" + argoCD.Name + "-" + "application-controller", + "deployment/" + argoCD.Name + "-" + "repo-server", + "deployment/" + argoCD.Name + "-" + "server", + } + for _, component := range expectedComponents { + logOutput, err := osFixture.ExecCommandWithOutputParam(false, true, + "kubectl", "logs", component, "-n", ns.Name, + ) + Expect(err).ToNot(HaveOccurred(), "Output: "+logOutput) + Expect(logOutput).To(ContainSubstring(expectedMsg)) + // This is how redis disconnect manifests + Expect(logOutput).ToNot(ContainSubstring("manifest cache error")) + Expect(logOutput).ToNot(ContainSubstring("WRONGPASS")) + + mountedFiles, err := osFixture.ExecCommandWithOutputParam(false, true, + "kubectl", "exec", component, "-n", ns.Name, "--", "ls", "-1", argoutil.RedisAuthMountPath, + ) + Expect(err).ToNot(HaveOccurred(), "Output: "+logOutput) + Expect(mountedFiles).ToNot(ContainSubstring("users.acl")) + } + + By("verifying redis password is correct") + redisInitialSecret := &corev1.Secret{} + redisPwdSecretKey := client.ObjectKey{ + Name: argoutil.GetSecretNameWithSuffix(argoCD, "redis-initial-password"), + Namespace: ns.Name, + } + Expect(k8sClient.Get(ctx, redisPwdSecretKey, redisInitialSecret)).Should(Succeed()) + expectedRedisPwd := string(redisInitialSecret.Data["auth"]) + Expect(expectedRedisPwd).ShouldNot(Equal("")) + + redisPingOut, err := osFixture.ExecCommandWithOutputParam(false, false, + "kubectl", "exec", "-n", ns.Name, "-c", "redis", "deployment/argocd-redis", "--", + "redis-cli", "-a", expectedRedisPwd, "--no-auth-warning", "ping", + ) + + Expect(err).ToNot(HaveOccurred(), "Output: "+redisPingOut) + Expect(redisPingOut).NotTo(ContainSubstring("NOAUTH Authentication required")) + Expect(redisPingOut).To(ContainSubstring("PONG")) + + By("verifying redis rejects unauthenticated requests") + redisPingOut, err = osFixture.ExecCommandWithOutputParam(false, false, + "kubectl", "exec", "-n", ns.Name, "-c", "redis", "deployment/argocd-redis", "--", + "redis-cli", "ping", // no auth provided + ) + + Expect(err).ToNot(HaveOccurred(), "Output: "+redisPingOut) + Expect(redisPingOut).To(ContainSubstring("NOAUTH Authentication required")) + Expect(redisPingOut).NotTo(ContainSubstring("PONG")) + }) }) }) diff --git a/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go index 54d256960232..cf840f168d95 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-067_validate_redis_secure_comm_no_autotls_ha_test.go @@ -21,6 +21,7 @@ import ( "os" argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" + "github.com/argoproj-labs/argocd-operator/controllers/argoutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" @@ -84,7 +85,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // In BeAvailable() we wait 15 seconds for ArgoCD CR to be reconciled, this SHOULD be enough time. By("waiting for ArgoCD CR to be reconciled and the instance to be ready") - Eventually(argoCD, "5m", "10s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD, "10m", "10s").Should(argocdFixture.BeAvailable()) deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"} for _, deplName := range deploymentsShouldExist { @@ -175,19 +176,24 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } By("extracting the contents of /data/conf/sentinel.conf and checking it contains expected values") - sentinelConf, err := osFixture.ExecCommandWithOutputParam(false, true, "kubectl", "exec", "-i", "pod/argocd-redis-ha-server-0", "-n", ns.Name, "-c", "redis", "--", "cat", "/data/conf/sentinel.conf") + sentinelConf, err := osFixture.ExecCommandWithOutputParam( + false, true, + "kubectl", "exec", "-i", "pod/argocd-redis-ha-server-0", "-n", ns.Name, "-c", "redis", + "--", "cat", "/data/conf/sentinel.conf", + ) Expect(err).ToNot(HaveOccurred()) expectedSentinelConfig := []string{ "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\"", + // Dynamic changes to the config file can result in doublequotes added unpredictably + `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 _, line := range expectedSentinelConfig { - Expect(sentinelConf).To(ContainSubstring(line)) + Expect(sentinelConf).To(MatchRegexp(line)) } repoServerDepl := &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "argocd-repo-server", Namespace: ns.Name}} @@ -210,8 +216,80 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { Expect(applicationControllerSS).To(statefulsetFixture.HaveContainerCommandSubstring("argocd-application-controller --operation-processors 10 --redis argocd-redis-ha-haproxy."+ns.Name+".svc.cluster.local:6379 --redis-use-tls --redis-ca-certificate /app/config/controller/tls/redis/tls.crt --repo-server argocd-repo-server."+ns.Name+".svc.cluster.local:8081 --status-processors 20 --kubectl-parallelism-limit 10 --loglevel info --logformat text", 0), "TLS .spec.template.spec.containers.command for argocd-application-controller statefulsets is wrong") - }) + It("verify redis HA credential distribution", func() { + By("verifying we are running on a cluster with at least 3 nodes. This is required for Redis HA") + nodeFixture.ExpectHasAtLeastXNodes(3) + + By("creating simple Argo CD instance") + ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() + + argoCD := &argov1beta1api.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: ns.Name}, + Spec: argov1beta1api.ArgoCDSpec{ + HA: argov1beta1api.ArgoCDHASpec{ + Enabled: true, + }, + }, + } + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("waiting for ArgoCD CR to be reconciled and the instance to be ready") + Eventually(argoCD, "10m", "10s").Should(argocdFixture.BeAvailable()) + + By("verify redis creds are correctly passed to pods") + const expectedMsg = "Loading Redis credentials from mounted directory: /app/config/redis-auth/" + expectedComponents := []string{ + "statefulset/" + argoCD.Name + "-" + "application-controller", + "deployment/" + argoCD.Name + "-" + "repo-server", + "deployment/" + argoCD.Name + "-" + "server", + } + for _, component := range expectedComponents { + logOutput, err := osFixture.ExecCommandWithOutputParam(false, true, + "kubectl", "logs", component, "-n", ns.Name, + ) + Expect(err).ToNot(HaveOccurred(), "Output: "+logOutput) + Expect(logOutput).To(ContainSubstring(expectedMsg)) + // This is how redis disconnect manifests + Expect(logOutput).ToNot(ContainSubstring("manifest cache error")) + Expect(logOutput).ToNot(ContainSubstring("WRONGPASS")) + + mountedFiles, err := osFixture.ExecCommandWithOutputParam(false, true, + "kubectl", "exec", component, "-n", ns.Name, "--", "ls", "-1", argoutil.RedisAuthMountPath, + ) + Expect(err).ToNot(HaveOccurred(), "Output: "+logOutput) + Expect(mountedFiles).ToNot(ContainSubstring("users.acl")) + } + + By("verifying redis password is correct") + redisInitialSecret := &corev1.Secret{} + redisPwdSecretKey := client.ObjectKey{ + Name: argoutil.GetSecretNameWithSuffix(argoCD, "redis-initial-password"), + Namespace: ns.Name, + } + Expect(k8sClient.Get(ctx, redisPwdSecretKey, redisInitialSecret)).Should(Succeed()) + expectedRedisPwd := string(redisInitialSecret.Data["auth"]) + Expect(expectedRedisPwd).ShouldNot(Equal("")) + + redisPingOut, err := osFixture.ExecCommandWithOutputParam(false, false, + "kubectl", "exec", "-n", ns.Name, "-c", "redis", "pod/argocd-redis-ha-server-0", "--", + "redis-cli", "-a", expectedRedisPwd, "--no-auth-warning", "ping", + ) + + Expect(err).ToNot(HaveOccurred(), "Output: "+redisPingOut) + Expect(redisPingOut).NotTo(ContainSubstring("NOAUTH Authentication required")) + Expect(redisPingOut).To(ContainSubstring("PONG")) + + By("verifying redis rejects unauthenticated requests") + redisPingOut, err = osFixture.ExecCommandWithOutputParam(false, false, + "kubectl", "exec", "-n", ns.Name, "-c", "redis", "pod/argocd-redis-ha-server-0", "--", + "redis-cli", "ping", // no auth provided + ) + + Expect(err).ToNot(HaveOccurred(), "Output: "+redisPingOut) + Expect(redisPingOut).To(ContainSubstring("NOAUTH Authentication required")) + Expect(redisPingOut).NotTo(ContainSubstring("PONG")) + }) }) }) diff --git a/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go b/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go index 7c8cce09c90e..b7fa85a1fdd7 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-069_validate_redis_secure_comm_autotls_ha_test.go @@ -81,7 +81,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { expectComponentsAreRunning := func() { By("waiting for ArgoCD CR to be reconciled and the instance to be ready") - Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD, "10m", "5s").Should(argocdFixture.BeAvailable()) deploymentsShouldExist := []string{"argocd-redis-ha-haproxy", "argocd-server", "argocd-repo-server"} for _, depl := range deploymentsShouldExist { @@ -111,7 +111,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } By("waiting for ArgoCD CR to be reconciled and the instance to be ready") - Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD, "10m", "5s").Should(argocdFixture.BeAvailable()) expectComponentsAreRunning() diff --git a/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go b/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go index fe4fc6de6c9a..b27411f9fd1e 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-096-validate_home_env_argocd_controller_test.go @@ -23,7 +23,6 @@ import ( k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/statefulset" appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -36,9 +35,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { }) - It("verifies openshift-gitops app controller StatefulSet container has expected HOME and REDIS_PASSWORD values", func() { + It("verifies openshift-gitops app controller StatefulSet container has expected HOME env var and redis-initial-pass volume mount", func() { - By("verifying openshift-gitops-application-controller StatefulSet has the expected values for HOME and REDIS_PASSWORD") + By("verifying openshift-gitops-application-controller StatefulSet has the expected value for HOME") ss := &appsv1.StatefulSet{ ObjectMeta: metav1.ObjectMeta{ Name: "openshift-gitops-application-controller", @@ -49,29 +48,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { Expect(ss).Should(statefulset.HaveContainerWithEnvVar("HOME", "/home/argocd", 0)) + By("verifying REDIS_PASSWORD env var is no longer set (replaced by redis-initial-pass volume mount)") container := ss.Spec.Template.Spec.Containers[0] - match := false - - for _, env := range container.Env { - if env.Name != "REDIS_PASSWORD" { - continue + Expect(container.Env).NotTo(ContainElement( + HaveField("Name", "REDIS_PASSWORD"), + ), "REDIS_PASSWORD should not be set") + + By("verifying redis-initial-pass volume mount is present") + hasRedisAuthMount := false + for _, vm := range container.VolumeMounts { + if vm.Name == "redis-initial-pass" && vm.MountPath == "/app/config/redis-auth/" { + hasRedisAuthMount = true + break } - - Expect(env).To(Equal(corev1.EnvVar{ - Name: "REDIS_PASSWORD", - ValueFrom: &corev1.EnvVarSource{ - SecretKeyRef: &corev1.SecretKeySelector{ - LocalObjectReference: corev1.LocalObjectReference{ - Name: "openshift-gitops-redis-initial-password", - }, - Key: "admin.password", - }, - }, - })) - match = true } - - Expect(match).To(BeTrue()) + Expect(hasRedisAuthMount).To(BeTrue()) }) diff --git a/test/openshift/e2e/ginkgo/parallel/1-118_validate_redis_ssc_test.go b/test/openshift/e2e/ginkgo/parallel/1-118_validate_redis_ssc_test.go index 93773be9bd26..537f0a2c036d 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-118_validate_redis_ssc_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-118_validate_redis_ssc_test.go @@ -69,8 +69,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { }, } Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) - Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) - Eventually(argoCD, "5m", "5s").Should(argocdFixture.HaveRedisStatus("Running")) + Eventually(argoCD, "10m", "5s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD, "10m", "5s").Should(argocdFixture.HaveRedisStatus("Running")) By("verifying argocd-redis-ha pod defaults to expected SCC") Eventually(func() bool { diff --git a/test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go b/test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go index fbe37cce0998..29966e1d71fc 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-121_validate_image_updater_test.go @@ -143,8 +143,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { Spec: appv1alpha1.ApplicationSpec{ Project: "default", Source: &appv1alpha1.ApplicationSource{ - RepoURL: "https://github.com/argoproj-labs/argocd-image-updater/", - Path: "test/e2e/testdata/005-public-guestbook", + RepoURL: "https://github.com/redhat-developer/gitops-operator", + Path: "test/examples/image-updater", TargetRevision: "HEAD", }, Destination: appv1alpha1.ApplicationDestination{ @@ -176,7 +176,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { Images: []imageUpdaterApi.ImageConfig{ { Alias: "guestbook", - ImageName: "quay.io/dkarpele/my-guestbook:~29437546.0", + ImageName: "quay.io/devtools_gitops/guestbook_go:~29437546.0", CommonUpdateSettings: &imageUpdaterApi.CommonUpdateSettings{ UpdateStrategy: &updateStrategy, }, @@ -207,7 +207,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // Return an empty string to signify the condition is not yet met. return "" - }, "10m", "10s").Should(Equal("quay.io/dkarpele/my-guestbook:29437546.0"), "Image Updater did not update the Application image within timeout") + }, "10m", "10s").Should(Equal("quay.io/devtools_gitops/guestbook_go:29437546.0"), "Image Updater did not update the Application image within timeout") }) }) }) diff --git a/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go b/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go index 3847fbec388e..565f6f14b3a9 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-037_validate_applicationset_in_any_namespace_test.go @@ -7,20 +7,26 @@ import ( "github.com/argoproj-labs/argocd-operator/api/v1beta1" "github.com/argoproj-labs/argocd-operator/common" + "github.com/argoproj/gitops-engine/pkg/health" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" + applicationFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/application" + appprojectFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/appproject" argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" + clusterroleFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/clusterrole" deploymentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment" k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" namespaceFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/namespace" roleFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/role" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" + appv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -45,7 +51,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { AfterEach(func() { fixture.OutputDebugOnFail("appset-argocd", "appset-old-ns", "appset-new-ns", "appset-namespace-scoped", "target-ns-1-037", - "team-1", "team-2", "team-frontend", "team-backend", "team-3", "other-ns") + "team-1", "team-2", "team-frontend", "team-backend", "team-3", "other-ns", "appset-argocd-clusterrole", "appset-target-ns") // Clean up namespaces created for _, namespaceCleanupFunction := range cleanupFunctions { @@ -973,5 +979,220 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }) + It("verifies ApplicationSet clusterrole rules and creates appset/app in another namespace", func() { + + fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", "openshift-gitops, argocd-e2e-cluster-config, appset-argocd-clusterrole,appset-target-ns") + + By("creating Argo CD namespace and target source namespace") + argoNamespace, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("appset-argocd-clusterrole") + cleanupFunctions = append(cleanupFunctions, cleanupFunc) + + targetNS, cleanupFunc := fixture.CreateNamespaceWithCleanupFunc("appset-target-ns") + cleanupFunctions = append(cleanupFunctions, cleanupFunc) + + By("creating Argo CD instance with source namespaces") + argoCD := &v1beta1.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{ + Name: "appset-example", + Namespace: argoNamespace.Name, + }, + Spec: v1beta1.ArgoCDSpec{ + SourceNamespaces: []string{ + targetNS.Name, + }, + ApplicationSet: &v1beta1.ArgoCDApplicationSet{ + SourceNamespaces: []string{ + targetNS.Name, + }, + SCMProviders: []string{ + "github.com", + }, + }, + }, + } + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + Eventually(argoCD, "5m", "5s").Should(argocdFixture.BeAvailable()) + Eventually(argoCD).Should(argocdFixture.HaveApplicationSetControllerStatus("Running")) + + By("2) verifying that the appset deployment contains matching namespace in the command") + appsetDeployment := &appsv1.Deployment{ + ObjectMeta: metav1.ObjectMeta{ + Name: "appset-example-applicationset-controller", + Namespace: argoCD.Namespace, + }, + } + Eventually(appsetDeployment).Should(k8sFixture.ExistByName()) + + // Verify that target namespace is included + Eventually(appsetDeployment).Should(deploymentFixture.HaveContainerCommandSubstring("--applicationset-namespaces", 0)) + + appProject := &appv1alpha1.AppProject{ + ObjectMeta: metav1.ObjectMeta{ + Name: "default", + Namespace: argoCD.Namespace, + }, + } + Eventually(appProject).Should(k8sFixture.ExistByName()) + appprojectFixture.Update(appProject, func(appProject *appv1alpha1.AppProject) { + appProject.Spec.SourceNamespaces = append(appProject.Spec.SourceNamespaces, targetNS.Name) + }) + + By("verifying ApplicationSet controller ClusterRole has expected rules") + appsetClusterRole := &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: argoCD.Name + "-" + argoCD.Namespace + "-" + common.ArgoCDApplicationSetControllerComponent, + }, + } + Eventually(appsetClusterRole, "5m", "10s").Should(k8sFixture.ExistByName()) + Eventually(appsetClusterRole, "5m", "10s").Should(clusterroleFixture.HaveRules([]rbacv1.PolicyRule{ + { + APIGroups: []string{"argoproj.io"}, + Resources: []string{ + "applications", + "applicationsets", + "applicationsets/finalizers", + }, + Verbs: []string{ + "create", + "delete", + "get", + "list", + "patch", + "update", + "watch", + }, + }, + { + APIGroups: []string{"argoproj.io"}, + Resources: []string{ + "appprojects", + }, + Verbs: []string{ + "get", + "list", + "watch", + }, + }, + { + APIGroups: []string{"argoproj.io"}, + Resources: []string{ + "applicationsets/status", + }, + Verbs: []string{ + "get", + "patch", + "update", + }, + }, + { + APIGroups: []string{""}, + Resources: []string{ + "events", + }, + Verbs: []string{ + "create", + "get", + "list", + "patch", + "watch", + }, + }, + { + APIGroups: []string{""}, + Resources: []string{ + "secrets", + "configmaps", + }, + Verbs: []string{ + "get", + "list", + "watch", + }, + }, + { + APIGroups: []string{"coordination.k8s.io"}, + Resources: []string{ + "leases", + }, + Verbs: []string{ + "create", + }, + }, + { + APIGroups: []string{"coordination.k8s.io"}, + Resources: []string{ + "leases", + }, + Verbs: []string{ + "get", + "update", + "create", + }, + ResourceNames: []string{ + "58ac56fa.applicationsets.argoproj.io", + }, + }, + })) + + By("creating an ApplicationSet in the target namespace") + appset := &unstructured.Unstructured{ + Object: map[string]interface{}{ + "apiVersion": "argoproj.io/v1alpha1", + "kind": "ApplicationSet", + "metadata": map[string]interface{}{ + "name": "guestbook-appset", + "namespace": targetNS.Name, + }, + "spec": map[string]interface{}{ + "generators": []interface{}{ + map[string]interface{}{ + "list": map[string]interface{}{ + "elements": []interface{}{ + map[string]interface{}{ + "name": "guestbook", + }, + }, + }, + }, + }, + "template": map[string]interface{}{ + "metadata": map[string]interface{}{ + "name": "{{name}}", + }, + "spec": map[string]interface{}{ + "project": "default", + "source": map[string]interface{}{ + "repoURL": "https://github.com/argoproj/argocd-example-apps.git", + "targetRevision": "HEAD", + "path": "guestbook", + }, + "destination": map[string]interface{}{ + "server": "https://kubernetes.default.svc", + "namespace": targetNS.Name, + }, + }, + }, + }, + }, + } + Expect(k8sClient.Create(ctx, appset)).To(Succeed()) + Eventually(appset).Should(k8sFixture.ExistByName()) + + By("verifying ApplicationSet generates Application in target namespace") + generatedApp := &appv1alpha1.Application{ + ObjectMeta: metav1.ObjectMeta{ + Name: "guestbook", + Namespace: targetNS.Name, + }, + } + Eventually(generatedApp, "5m", "10s").Should(k8sFixture.ExistByName()) + Eventually(generatedApp, "5m", "10s").Should(applicationFixture.HaveHealthStatusCode(health.HealthStatusMissing)) + Eventually(generatedApp, "5m", "10s").Should(applicationFixture.HaveSyncStatusCode(appv1alpha1.SyncStatusCodeOutOfSync)) + By("Cleaning up the ApplicationSet") + Expect(k8sClient.Delete(ctx, appset)).To(Succeed()) + Eventually(appset).Should(k8sFixture.NotExistByName()) + }) + }) }) diff --git a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go index 8477d8cd21df..d602471edfce 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go @@ -198,6 +198,13 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, } + principalNetworkPolicy = &networkingv1.NetworkPolicy{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-agent-principal-network-policy", argoCDName), + Namespace: ns.Name, + }, + } + // List environment variables with expected values for the principal deployment expectedEnvVariables = map[string]string{ argocdagent.EnvArgoCDPrincipalLogLevel: "info", @@ -383,10 +390,9 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Expect(container.Env).To(ContainElement(corev1.EnvVar{Name: key, Value: value}), "Environment variable %s should be set to %s", key, value) } - Expect(container.Env).To(ContainElement(And( - HaveField("Name", argocdagent.EnvRedisPassword), - HaveField("ValueFrom.SecretKeyRef", Not(BeNil())), - )), "REDIS_PASSWORD should be set with valueFrom.secretKeyRef") + Expect(container.Env).NotTo(ContainElement( + HaveField("Name", "REDIS_PASSWORD"), + ), "REDIS_PASSWORD should not be set") By("Disable principal") @@ -405,7 +411,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { By("Create ArgoCD instance") - argoCD.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.0" + argoCD.Spec.ArgoCDAgent.Principal.Image = common.ArgoCDAgentPrincipalDefaultImageName Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) By("Verify expected resources are created for principal pod") @@ -416,7 +422,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.0")) + Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName)) By("Verify environment variables are set correctly") @@ -435,7 +441,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { ac.Spec.ArgoCDAgent.Principal.LogFormat = "json" ac.Spec.ArgoCDAgent.Principal.Server.KeepAliveMinInterval = "60s" ac.Spec.ArgoCDAgent.Principal.Server.EnableWebSocket = ptr.To(true) - ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1" + ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.8.1" ac.Spec.ArgoCDAgent.Principal.Namespace.AllowedNamespaces = []string{"agent-managed", "agent-autonomous"} ac.Spec.ArgoCDAgent.Principal.Namespace.EnableNamespaceCreate = ptr.To(true) @@ -482,7 +488,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { if container == nil { return false } - return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.5.1" + return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.8.1" }, "120s", "5s").Should(BeTrue(), "Principal deployment should have the updated image") By("verify that deployment is in Ready state") @@ -710,6 +716,141 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { }, "30s", "2s").Should(Equal(corev1.ServiceTypeLoadBalancer)) }) + It("should deploy principal via namespace-scoped ArgoCD instance and verify cluster role and cluster role binding are not created", func() { + + By("Create namespace-scoped ArgoCD instance") + + // Create namespace for hosting namespace-scoped ArgoCD instance with principal + nsScoped, cleanupFuncScoped := fixture.CreateNamespaceWithCleanupFunc("argocd-agent-principal-ns-scoped-1-051") + defer cleanupFuncScoped() + + // Update namespace in ArgoCD CR + argoCD.Namespace = nsScoped.Name + + // Update namespace in resource references + serviceAccount.Namespace = nsScoped.Name + role.Namespace = nsScoped.Name + roleBinding.Namespace = nsScoped.Name + principalDeployment.Namespace = nsScoped.Name + principalRoute.Namespace = nsScoped.Name + clusterRole.Name = fmt.Sprintf("%s-%s-agent-principal", argoCDName, nsScoped.Name) + clusterRoleBinding.Name = fmt.Sprintf("%s-%s-agent-principal", argoCDName, nsScoped.Name) + + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("Verify namespace-scoped resources are created for principal") + + Eventually(serviceAccount, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(role, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(roleBinding, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(principalDeployment, "30s", "2s").Should(k8sFixture.ExistByName()) + for _, serviceName := range serviceNames { + service := &corev1.Service{ + ObjectMeta: metav1.ObjectMeta{ + Name: serviceName, + Namespace: nsScoped.Name, + }, + } + Eventually(service, "30s", "2s").Should(k8sFixture.ExistByName(), + "Service '%s' should exist in namespace '%s'", serviceName, nsScoped.Name) + } + + By("Verify ClusterRole and ClusterRoleBinding are not created") + Consistently(clusterRole, "10s", "1s").Should(k8sFixture.NotExistByName(), + "ClusterRole '%s' should not exist for namespace-scoped ArgoCD instance", clusterRole.Name) + + Consistently(clusterRoleBinding, "10s", "1s").Should(k8sFixture.NotExistByName(), + "ClusterRoleBinding '%s' should not exist for namespace-scoped ArgoCD instance", clusterRoleBinding.Name) + + By("Delete ArgoCD instance") + Expect(k8sClient.Delete(ctx, argoCD)).To(Succeed()) + Eventually(func() bool { + err := k8sClient.Get(ctx, client.ObjectKey{Name: argoCD.Name, Namespace: argoCD.Namespace}, argoCD) + return err != nil + }, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted") + }) + + It("should delete existing cluster role and cluster role binding if ArgoCD instance is namespace-scoped", func() { + + By("Create namespace-scoped ArgoCD instance namespace") + + // Create namespace for hosting namespace-scoped ArgoCD instance with principal + nsScoped, cleanupFuncScoped := fixture.CreateNamespaceWithCleanupFunc("argocd-agent-principal-ns-scoped-1-051") + defer cleanupFuncScoped() + + // Update namespace in ArgoCD CR + argoCD.Namespace = nsScoped.Name + + // Update namespace in resource references + serviceAccount.Namespace = nsScoped.Name + role.Namespace = nsScoped.Name + roleBinding.Namespace = nsScoped.Name + principalDeployment.Namespace = nsScoped.Name + principalRoute.Namespace = nsScoped.Name + clusterRole.Name = fmt.Sprintf("%s-%s-agent-principal", argoCDName, nsScoped.Name) + clusterRoleBinding.Name = fmt.Sprintf("%s-%s-agent-principal", argoCDName, nsScoped.Name) + + By("Pre-create ClusterRole and ClusterRoleBinding before ArgoCD instance") + + preExistingClusterRole := &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: clusterRole.Name, + Labels: map[string]string{ + "app.kubernetes.io/name": "test", + }, + }, + } + Expect(k8sClient.Create(ctx, preExistingClusterRole)).To(Succeed()) + + preExistingClusterRoleBinding := &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: clusterRoleBinding.Name, + Labels: map[string]string{ + "app.kubernetes.io/name": "test", + }, + }, + Subjects: []rbacv1.Subject{ + { + Kind: rbacv1.ServiceAccountKind, + Name: "default", + Namespace: nsScoped.Name, + }, + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: rbacv1.GroupName, + Kind: "ClusterRole", + Name: clusterRole.Name, + }, + } + Expect(k8sClient.Create(ctx, preExistingClusterRoleBinding)).To(Succeed()) + + By("Verify pre-existing ClusterRole and ClusterRoleBinding exist") + + Eventually(clusterRole, "30s", "1s").Should(k8sFixture.ExistByName(), + "Pre-existing ClusterRole '%s' should exist before ArgoCD instance creation", clusterRole.Name) + Eventually(clusterRoleBinding, "30s", "1s").Should(k8sFixture.ExistByName(), + "Pre-existing ClusterRoleBinding '%s' should exist before ArgoCD instance creation", clusterRoleBinding.Name) + + By("Create namespace-scoped ArgoCD instance with principal") + + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("Verify pre-existing ClusterRole and ClusterRoleBinding are deleted") + + Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName(), + "ClusterRole '%s' should be deleted for namespace-scoped ArgoCD instance", clusterRole.Name) + + Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName(), + "ClusterRoleBinding '%s' should be deleted for namespace-scoped ArgoCD instance", clusterRoleBinding.Name) + + By("Delete ArgoCD instance") + Expect(k8sClient.Delete(ctx, argoCD)).To(Succeed()) + Eventually(func() bool { + err := k8sClient.Get(ctx, client.ObjectKey{Name: argoCD.Name, Namespace: argoCD.Namespace}, argoCD) + return err != nil + }, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted") + }) + It("should create principal NetworkPolicy if principal is enabled", func() { By("Create ArgoCD instance with principal enabled") diff --git a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go index 1daf0001a69d..0ff34a638ae5 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go @@ -346,10 +346,9 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Expect(container.Env).To(ContainElement(corev1.EnvVar{Name: key, Value: value}), "Environment variable %s should be set to %s", key, value) } - Expect(container.Env).To(ContainElement(And( - HaveField("Name", agent.EnvRedisPassword), - HaveField("ValueFrom.SecretKeyRef", Not(BeNil())), - )), "REDIS_PASSWORD should be set with valueFrom.secretKeyRef") + Expect(container.Env).NotTo(ContainElement( + HaveField("Name", "REDIS_PASSWORD"), + ), "REDIS_PASSWORD should not be set") By("Verify custom environment variable is present") @@ -372,7 +371,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { By("Create ArgoCD instance") - argoCD.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.0" + argoCD.Spec.ArgoCDAgent.Agent.Image = common.ArgoCDAgentAgentDefaultImageName Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) By("Verify expected resources are created for agent pod") @@ -383,7 +382,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal("quay.io/argoprojlabs/argocd-agent:v0.5.0")) + Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) By("Verify environment variables are set correctly") @@ -400,7 +399,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { ac.Spec.ArgoCDAgent.Agent.LogLevel = "trace" ac.Spec.ArgoCDAgent.Agent.LogFormat = "json" - ac.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1" + ac.Spec.ArgoCDAgent.Agent.Image = "quay.io/argoprojlabs/argocd-agent:v0.8.1" ac.Spec.ArgoCDAgent.Agent.Client.KeepAliveInterval = "60s" ac.Spec.ArgoCDAgent.Agent.Client.EnableWebSocket = ptr.To(true) @@ -430,7 +429,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { if container == nil { return false } - return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.5.1" + return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.8.1" }, "120s", "5s").Should(BeTrue(), "Agent deployment should have the updated image") By("Verify environment variables are updated correctly") @@ -451,5 +450,139 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Expect(container.Env).To(ContainElement(corev1.EnvVar{Name: key, Value: value}), "Environment variable %s should be set to %s", key, value) } }) + + It("should deploy agent via namespace-scoped ArgoCD instance and verify cluster role and cluster role binding are not created", func() { + + By("Create namespace-scoped ArgoCD instance") + + // Create namespace for hosting namespace-scoped ArgoCD instance with agent + nsScoped, cleanupFuncScoped := fixture.CreateNamespaceWithCleanupFunc("argocd-agent-agent-ns-scoped-1-052") + defer cleanupFuncScoped() + + // Update namespace in ArgoCD CR + argoCD.Namespace = nsScoped.Name + + // Update namespace in resource references + serviceAccount.Namespace = nsScoped.Name + role.Namespace = nsScoped.Name + roleBinding.Namespace = nsScoped.Name + agentDeployment.Namespace = nsScoped.Name + clusterRole.Name = fmt.Sprintf("%s-%s-agent-agent", argoCDName, nsScoped.Name) + clusterRoleBinding.Name = fmt.Sprintf("%s-%s-agent-agent", argoCDName, nsScoped.Name) + + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("Verify namespace-scoped resources are created for agent") + + Eventually(serviceAccount, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(role, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(roleBinding, "30s", "2s").Should(k8sFixture.ExistByName()) + Eventually(agentDeployment, "30s", "2s").Should(k8sFixture.ExistByName()) + for _, serviceName := range serviceNames { + service := &corev1.Service{ + ObjectMeta: metav1.ObjectMeta{ + Name: serviceName, + Namespace: nsScoped.Name, + }, + } + Eventually(service, "30s", "2s").Should(k8sFixture.ExistByName(), + "Service '%s' should exist in namespace '%s'", serviceName, nsScoped.Name) + } + + By("Verify ClusterRole and ClusterRoleBinding are not created") + + Consistently(clusterRole, "30s", "1s").Should(k8sFixture.NotExistByName(), + "ClusterRole '%s' should not exist for namespace-scoped ArgoCD instance", clusterRole.Name) + + Consistently(clusterRoleBinding, "30s", "1s").Should(k8sFixture.NotExistByName(), + "ClusterRoleBinding '%s' should not exist for namespace-scoped ArgoCD instance", clusterRoleBinding.Name) + + By("Delete ArgoCD instance") + Expect(k8sClient.Delete(ctx, argoCD)).To(Succeed()) + Eventually(func() bool { + err := k8sClient.Get(ctx, client.ObjectKey{Name: argoCD.Name, Namespace: argoCD.Namespace}, argoCD) + return err != nil + }, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted") + }) + + It("should delete existing cluster role and cluster role binding if ArgoCD instance is namespace-scoped", func() { + + By("Create namespace-scoped ArgoCD instance namespace") + + // Create namespace for hosting namespace-scoped ArgoCD instance with agent + nsScoped, cleanupFuncScoped := fixture.CreateNamespaceWithCleanupFunc("argocd-agent-agent-ns-scoped-1-052") + defer cleanupFuncScoped() + + // Update namespace in ArgoCD CR + argoCD.Namespace = nsScoped.Name + + // Update namespace in resource references + serviceAccount.Namespace = nsScoped.Name + role.Namespace = nsScoped.Name + roleBinding.Namespace = nsScoped.Name + agentDeployment.Namespace = nsScoped.Name + clusterRole.Name = fmt.Sprintf("%s-%s-agent-agent", argoCDName, nsScoped.Name) + clusterRoleBinding.Name = fmt.Sprintf("%s-%s-agent-agent", argoCDName, nsScoped.Name) + + By("Pre-create ClusterRole and ClusterRoleBinding before ArgoCD instance") + + preExistingClusterRole := &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: clusterRole.Name, + Labels: map[string]string{ + "app.kubernetes.io/name": "test", + }, + }, + } + Expect(k8sClient.Create(ctx, preExistingClusterRole)).To(Succeed()) + + preExistingClusterRoleBinding := &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: clusterRoleBinding.Name, + Labels: map[string]string{ + "app.kubernetes.io/name": "test", + }, + }, + Subjects: []rbacv1.Subject{ + { + Kind: rbacv1.ServiceAccountKind, + Name: "default", + Namespace: nsScoped.Name, + }, + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: rbacv1.GroupName, + Kind: "ClusterRole", + Name: clusterRole.Name, + }, + } + Expect(k8sClient.Create(ctx, preExistingClusterRoleBinding)).To(Succeed()) + + By("Verify pre-existing ClusterRole and ClusterRoleBinding exist") + + Eventually(clusterRole, "10s", "1s").Should(k8sFixture.ExistByName(), + "Pre-existing ClusterRole '%s' should exist before ArgoCD instance creation", clusterRole.Name) + Eventually(clusterRoleBinding, "10s", "1s").Should(k8sFixture.ExistByName(), + "Pre-existing ClusterRoleBinding '%s' should exist before ArgoCD instance creation", clusterRoleBinding.Name) + + By("Create namespace-scoped ArgoCD instance with agent") + + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("Verify pre-existing ClusterRole and ClusterRoleBinding are deleted") + + Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName(), + "ClusterRole '%s' should be deleted for namespace-scoped ArgoCD instance", clusterRole.Name) + + Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName(), + "ClusterRoleBinding '%s' should be deleted for namespace-scoped ArgoCD instance", clusterRoleBinding.Name) + + By("Delete ArgoCD instance") + Expect(k8sClient.Delete(ctx, argoCD)).To(Succeed()) + Eventually(func() bool { + err := k8sClient.Get(ctx, client.ObjectKey{Name: argoCD.Name, Namespace: argoCD.Namespace}, argoCD) + return err != nil + }, "60s", "2s").Should(BeTrue(), "ArgoCD should be deleted") + }) }) }) diff --git a/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go b/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go index 63b05440cd79..c651e12b65bb 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-053_validate_argocd_agent_principal_connected_test.go @@ -17,8 +17,16 @@ limitations under the License. package sequential import ( + "bufio" "context" + "crypto/tls" + "encoding/json" "fmt" + "io" + "net/http" + "net/url" + "os/exec" + "strings" "time" . "github.com/onsi/ginkgo/v2" @@ -26,20 +34,25 @@ import ( "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" appFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/application" deploymentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment" + k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" + osFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/os" fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/argoproj/argo-cd/v3/pkg/apiclient/application" argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" "github.com/argoproj/gitops-engine/pkg/health" argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" "github.com/argoproj-labs/argocd-operator/common" + argocdFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/argocd" agentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/agent" ) @@ -111,7 +124,7 @@ const ( namespaceManagedAgent = "ns-hosting-managed-agent" namespaceAutonomousAgent = "ns-hosting-autonomous-agent" - // Namespaces hosting application resources in managed and autonomous clusters + // Namespaces hosting application resources in managed and autonomous clusters (e.g. this is where the deployments etc, are deployed by Argo CD) managedAgentApplicationNamespace = "ns-hosting-app-in-managed-cluster" autonomousAgentApplicationNamespace = "ns-hosting-app-in-autonomous-cluster" @@ -308,16 +321,220 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Eventually(application, "180s", "5s").Should(appFixture.HaveHealthStatusCode(health.HealthStatusHealthy), "Application should be healthy") } + runResourceProxyTest := func(argoEndpoint string, password string, app argocdv1alpha1.Application, agentK8sClient client.Client, agentInstallNamespace string) { + + // This test is based on test/e2e/rp_test.go from argocd-agent repo + + cleanupFunc := createRBACForResourceProxyTest(agentK8sClient, agentInstallNamespace) + defer cleanupFunc() + + Eventually(func() bool { + + // Getting an existing resource belonging to the synced app through Argo's + // API must result in success. + resource, err := getResourceForResourceProxyTest(argoEndpoint, password, &app, + "apps", "v1", "Deployment", app.Spec.Destination.Namespace, "spring-petclinic") + if err != nil { + GinkgoWriter.Println("error from getResourceForResourceProxyTest", err) + return false + } + napp := &appsv1.Deployment{} + if err := json.Unmarshal([]byte(resource), napp); err != nil { + GinkgoWriter.Println("unable to unmarshal resource", err) + return false + } + return napp.Kind == "Deployment" && napp.Name == "spring-petclinic" + }, "2m", "5s").Should(BeTrue()) + + // Getting a non-existing resource must result in failure + _, err := getResourceForResourceProxyTest(argoEndpoint, password, &app, + "apps", "v1", "Deployment", app.Spec.Destination.Namespace, "spring-petclinic-backend") + Expect(err).To(HaveOccurred()) + } + + // runRedisTest is based on redis_proxy_test.go E2E test in argocd-agent + // - This test will verify argo cd resourcetree API shows child resources (e.g. pods), which is only possible if redis proxy is working as expected. + runRedisTest := func(argoEndpoint string, password string, managedAgent bool, appOnPrincipal argocdv1alpha1.Application, agentK8sClient client.Client) { + + argocdClient, sessionToken, closer, err := argocdFixture.CreateArgoCDAPIClient(context.Background(), argoEndpoint, password) + Expect(err).ToNot(HaveOccurred()) + defer closer.Close() + + closer, appClient, err := argocdClient.NewApplicationClient() + Expect(err).ToNot(HaveOccurred()) + defer closer.Close() + + cancellableContext, cancelFunc := context.WithCancel(context.Background()) + defer cancelFunc() + + injectedRedisPwd, err := osFixture.ExecCommandWithOutputParam( + false, false, + "kubectl", "exec", "deployment/argocd-hub-agent-principal", "-n", namespaceAgentPrincipal, + "--", "cat", "/app/config/redis-auth/auth", + ) + Expect(err).NotTo(HaveOccurred()) + Expect(strings.TrimSpace(injectedRedisPwd)).ToNot(BeEmpty()) + + principalEnv, err := osFixture.ExecCommandWithOutputParam( + false, false, + "kubectl", "exec", "deployment/argocd-hub-agent-principal", "-n", namespaceAgentPrincipal, + "--", "cat", "/proc/1/environ", + ) + Expect(err).NotTo(HaveOccurred()) + Expect(principalEnv).To(ContainSubstring("REDIS_CREDS_DIR_PATH=/app/config/redis-auth/")) + Expect(principalEnv).NotTo(ContainSubstring("REDIS_PASSWORD")) + + resourceTreeURL := "https://" + argoEndpoint + "/api/v1/stream/applications/" + appOnPrincipal.Name + "/resource-tree?appNamespace=" + appOnPrincipal.Namespace + + // Wait for successful connection to resource tree event source API, on principal Argo CD + // - this allows us to stream an application's resource change events (e.g. pod created/deleted) + var msgChan chan string + Eventually(func() bool { + var err error + msgChan, err = argocdFixture.StreamFromArgoCDEventSourceURL(cancellableContext, resourceTreeURL, sessionToken) + if err != nil { + GinkgoWriter.Println("streamFromEventSource returned error:", err) + return false + } + return true + + }, 5*time.Minute, 5*time.Second).Should(BeTrue()) + + Expect(msgChan).ToNot(BeNil()) + + deploymentNamespace := autonomousAgentApplicationNamespace + if managedAgent { + deploymentNamespace = managedAgentApplicationNamespace + } + + // Find pod (deployed by Argo CD ) in agent deployment namespace + var podList corev1.PodList + Eventually(func() bool { + err := agentK8sClient.List(context.Background(), &podList, client.InNamespace(deploymentNamespace)) + if err != nil { + GinkgoWriter.Println(err) + return false + } + + numPods := len(podList.Items) + // should (only be) one pod + if numPods != 1 { + GinkgoWriter.Println("Waiting for 1 pods: ", numPods) + } + return numPods == 1 + + }, "30s", "5s").Should(BeTrue()) + + // Locate pod + var oldPod corev1.Pod + for idx := range podList.Items { + pod := podList.Items[idx] + if strings.Contains(pod.Name, "spring-petclinic") { + oldPod = pod + break + } + } + Expect(oldPod.Name).ToNot(BeEmpty()) + + // Ensure that the pod appears in the resource tree value returned by Argo CD server (this will only be true if redis proxy is working) + Eventually(func() bool { + tree, err := appClient.ResourceTree(context.Background(), &application.ResourcesQuery{ + ApplicationName: &appOnPrincipal.Name, + AppNamespace: &appOnPrincipal.Namespace, + }) + + if err != nil { + GinkgoWriter.Println("error on ResourceTree:", err) + return false + } + if tree == nil { + GinkgoWriter.Println("tree is nil") + return false + } + + for _, node := range tree.Nodes { + if node.Kind == "Pod" && node.Name == oldPod.Name { + return true + } + } + return false + }, time.Second*60, time.Second*5).Should(BeTrue()) + + // Delete pod on managed agent cluster + err = agentK8sClient.Delete(context.Background(), &oldPod) + Expect(err).ToNot(HaveOccurred()) + + // Wait for new pod to be created, to replace the old one that was deleted + var newPod corev1.Pod + Eventually(func() bool { + var podList corev1.PodList + err := agentK8sClient.List(context.Background(), &podList, client.InNamespace(deploymentNamespace)) + if err != nil { + GinkgoWriter.Println("error on list:", err) + return false + } + + for idx := range podList.Items { + pod := podList.Items[idx] + if strings.Contains(pod.Name, "spring-petclinic") && pod.Name != oldPod.Name { + newPod = pod + break + } + } + + return newPod.Name != "" + + }, time.Second*30, time.Second*5).Should(BeTrue()) + + // Verify the name of the new pod exists in what has been sent from the channel (this will only be true if redis proxy subscription is working) + Eventually(func() bool { + for { + // drain channel looking for name of new pod + GinkgoWriter.Println("Awaiting message") + select { + case msg := <-msgChan: + GinkgoWriter.Println("Processing message:", msg) + if strings.Contains(msg, newPod.Name) { + GinkgoWriter.Println("new pod name found:", newPod.Name) + return true + } + default: + return false + } + } + }, time.Second*30, time.Second*5).Should(BeTrue()) + + // Ensure that the pod appears in the new resource tree value returned by Argo CD server + tree, err := appClient.ResourceTree(context.Background(), &application.ResourcesQuery{ + ApplicationName: &appOnPrincipal.Name, + AppNamespace: &appOnPrincipal.Namespace, + Project: &appOnPrincipal.Spec.Project, + }) + Expect(err).ToNot(HaveOccurred()) + Expect(tree).ToNot(BeNil()) + + matchFound := false + for _, node := range tree.Nodes { + if node.Kind == "Pod" && node.Name == newPod.Name { + matchFound = true + break + } + } + Expect(matchFound).To(BeTrue()) + } + // This test verifies that: // 1. A cluster-scoped ArgoCD instance with principal component enabled and a cluster-scoped ArgoCD instance // with agent component enabled are deployed in both "managed" and "autonomous" modes. // 2. Each agent successfully connects to the principal. // 3. Applications can be deployed in both modes, and are verified to be healthy and in sync. + // 4. Redis proxy can be accessed, and it contains data from child resources (e.g. pod), for both managed, and autonomous. + // 5. Resource proxy can be accessed, and it contains data from agent resources. // This validates the core connectivity and basic workflow of agent-principal architecture, including RBAC, connection, and application propagation. It("Should deploy ArgoCD principal and agent instances in both modes and verify they are working as expected", func() { By("Deploy principal and verify it starts successfully") - deployPrincipal(ctx, k8sClient, registerCleanup) + deployPrincipal(ctx, k8sClient, registerCleanup, false) By("Deploy managed agent and verify it starts successfully") deployAgent(ctx, k8sClient, registerCleanup, argov1beta1api.AgentModeManaged) @@ -334,16 +551,57 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { By("Create AppProject for autonomous agent in " + namespaceAutonomousAgent) Expect(k8sClient.Create(ctx, buildAppProjectResource(namespaceAutonomousAgent, argov1beta1api.AgentModeAutonomous))).To(Succeed()) + applicationOfManagedAgent := buildApplicationResource(applicationNameManagedAgent, + managedAgentClusterName, managedAgentClusterName, argoCDAgentInstanceNameAgent, argov1beta1api.AgentModeManaged) By("Deploy application for managed mode") - deployAndValidateApplication(buildApplicationResource(applicationNameManagedAgent, - managedAgentClusterName, managedAgentClusterName, argoCDAgentInstanceNameAgent, argov1beta1api.AgentModeManaged)) + deployAndValidateApplication(applicationOfManagedAgent) + + portForwardCleanup := portForward(namespaceAgentPrincipal, "service/argocd-hub-server", "8443:https") + cleanupFuncs = append(cleanupFuncs, portForwardCleanup) + + principalArgocdPassword := argocdFixture.GetInitialAdminSecretPassword(argoCDAgentInstanceNamePrincipal, namespaceAgentPrincipal, k8sClient) + + By("Running resource proxy test for managed") + // The principal's application is very similar to 'applicationOfManagedAgent' but in a different namespace, and with a different appproject. + // - Since the resource proxy interfaces with principal, we need to give it an Application that matches the principal-side Application + appOnPrincipal := applicationOfManagedAgent.DeepCopy() + appOnPrincipal.Namespace = managedAgentClusterName + appOnPrincipal.Spec.Project = "agent-app-project" + runResourceProxyTest("127.0.0.1:8443", principalArgocdPassword, *appOnPrincipal, k8sClient, namespaceManagedAgent) + + By("Running redis test for managed") + runRedisTest("127.0.0.1:8443", principalArgocdPassword, true, *applicationOfManagedAgent, k8sClient) + + applicationOfAutonomousAgent := buildApplicationResource(applicationNameAutonomousAgent, + namespaceAutonomousAgent, autonomousAgentClusterName, argoCDAgentInstanceNameAgent, argov1beta1api.AgentModeAutonomous) By("Deploy application for autonomous mode") - deployAndValidateApplication(buildApplicationResource(applicationNameAutonomousAgent, - namespaceAutonomousAgent, autonomousAgentClusterName, argoCDAgentInstanceNameAgent, argov1beta1api.AgentModeAutonomous)) + deployAndValidateApplication(applicationOfAutonomousAgent) + + By("Running resource proxy test for autonomous") + // The principal's application is very similar to 'applicationOfManagedAgent' but in a different namespace, and with a different appproject. + // - Since the resource proxy interfaces with principal, we need to give it an Application that matches the principal-side Application + appOnPrincipal = applicationOfAutonomousAgent.DeepCopy() + appOnPrincipal.Namespace = autonomousAgentClusterName + appOnPrincipal.Spec.Project = "autonomous-cluster-in-hub-agent-app-project" // "agent-app-project" + runResourceProxyTest("127.0.0.1:8443", principalArgocdPassword, *appOnPrincipal, k8sClient, namespaceAutonomousAgent) + + By("Running redis test for autonomous") + + // The principal's application is the same as 'applicationOfAutonomousAgent', but in a different namespace. (The spec isn't needed) + // - Since the redis proxy interfaces with principal, we need to give it an Application that matches the principal-side Application + appOnPrincipal = applicationOfAutonomousAgent.DeepCopy() + appOnPrincipal.Namespace = "autonomous-cluster-in-hub" + appOnPrincipal.Spec = argocdv1alpha1.ApplicationSpec{} + + runRedisTest("127.0.0.1:8443", principalArgocdPassword, false, *appOnPrincipal, k8sClient) + }) AfterEach(func() { + + fixture.OutputDebugOnFail(namespaceAgentPrincipal, namespaceManagedAgent, namespaceAutonomousAgent, managedAgentClusterName, autonomousAgentClusterName, managedAgentApplicationNamespace, autonomousAgentApplicationNamespace) + By("Cleanup cluster-scoped resources") _ = k8sClient.Delete(ctx, clusterRolePrincipal) _ = k8sClient.Delete(ctx, clusterRoleBindingPrincipal) @@ -369,7 +627,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { // This function deploys the principal ArgoCD instance and waits for it to be ready. // It creates the required secrets for the principal and verifies that the principal deployment is in Ready state. // It also verifies that the principal logs contain the expected messages. -func deployPrincipal(ctx context.Context, k8sClient client.Client, registerCleanup func(func())) { +func deployPrincipal(ctx context.Context, k8sClient client.Client, registerCleanup func(func()), enableServerRoute bool) { GinkgoHelper() nsPrincipal, cleanup := fixture.CreateNamespaceWithCleanupFunc(namespaceAgentPrincipal) @@ -384,6 +642,12 @@ func deployPrincipal(ctx context.Context, k8sClient client.Client, registerClean waitForLoadBalancer = false } + if enableServerRoute { + argoCDInstance.Spec.Server.Route = argov1beta1api.ArgoCDRouteSpec{ + Enabled: true, + } + } + Expect(k8sClient.Create(ctx, argoCDInstance)).To(Succeed()) By("Wait for principal service to be ready and use LoadBalancer hostname/IP when available") @@ -438,7 +702,7 @@ func deployPrincipal(ctx context.Context, k8sClient client.Client, registerClean Eventually(&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{ Name: deploymentNameAgentPrincipal, - Namespace: nsPrincipal.Name}}, "120s", "5s").Should(deploymentFixture.HaveReadyReplicas(1)) + Namespace: nsPrincipal.Name}}, "240s", "5s").Should(deploymentFixture.HaveReadyReplicas(1)) By("Verify principal logs contain expected messages") @@ -529,7 +793,7 @@ func buildArgoCDResource(argoCDName string, componentType argov1beta1api.AgentCo Principal: &argov1beta1api.PrincipalSpec{ Enabled: ptr.To(true), Auth: "mtls:CN=([^,]+)", - LogLevel: "info", + LogLevel: "debug", Image: common.ArgoCDAgentPrincipalDefaultImageName, Namespace: &argov1beta1api.PrincipalNamespaceSpec{ AllowedNamespaces: []string{ @@ -575,7 +839,7 @@ func buildArgoCDResource(argoCDName string, componentType argov1beta1api.AgentCo Agent: &argov1beta1api.AgentSpec{ Enabled: ptr.To(true), Creds: "mtls:any", - LogLevel: "info", + LogLevel: "debug", Image: common.ArgoCDAgentAgentDefaultImageName, Client: &argov1beta1api.AgentClientSpec{ PrincipalServerAddress: "", // will be set in the test @@ -678,3 +942,214 @@ func buildApplicationResource(applicationName, nsName, agentName, argocdInstance } return application } + +func portForward(namespace string, subject string, port string) func() { + + cmdArgs := []string{"kubectl", "port-forward", "-n", namespace, subject, port} + + GinkgoWriter.Println("executing command:", cmdArgs) + + // #nosec G204 + cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...) + + // Create pipes for stdout and stderr to stream output in real-time + stdout, err := cmd.StdoutPipe() + Expect(err).ToNot(HaveOccurred()) + + stderr, err := cmd.StderrPipe() + Expect(err).ToNot(HaveOccurred()) + + // Channel to signal when port-forward is ready (after seeing "Forwarding from" messages) + ready := make(chan struct{}) + + // streamOutput reads from a pipe and writes to GinkgoWriter in real-time. + // It signals readiness when it sees the expected "Forwarding from" message. + streamOutput := func(pipe io.Reader, signalReady func()) { + defer GinkgoRecover() + + // 'kubectl port-forward' will print this output indicating it has successfully started port-forwarding: + // Forwarding from 127.0.0.1:8443 -> 8080 + // Forwarding from [::1]:8443 -> 8080 + + scanner := bufio.NewScanner(pipe) + for scanner.Scan() { + line := scanner.Text() + GinkgoWriter.Println("port-forward:", line) + + // Signal ready when we see the first "Forwarding from" message + if signalReady != nil && strings.HasPrefix(line, "Forwarding from") { + signalReady() + signalReady = nil // Only signal once + } + } + if scanErr := scanner.Err(); scanErr != nil { + GinkgoWriter.Println("port-forward scanner error:", scanErr) + } + } + + // Start the command + err = cmd.Start() + Expect(err).ToNot(HaveOccurred()) + + // Stream stdout (with ready signaling) and stderr in separate goroutines + go streamOutput(stdout, func() { close(ready) }) + go streamOutput(stderr, nil) + + // Wait for the process to complete in a separate goroutine + go func() { + defer GinkgoRecover() + + err := cmd.Wait() + if err != nil && !strings.Contains(err.Error(), "killed") && !strings.Contains(err.Error(), "signal: killed") { + GinkgoWriter.Println("port-forward process error:", err) + } + }() + + // Wait for the port-forward to be ready before returning + select { + case <-ready: + GinkgoWriter.Println("port-forward is ready") + case <-time.After(60 * time.Second): + Fail("timed out waiting for port-forward to be ready") + } + + return func() { + + GinkgoWriter.Println("terminating port forward") + + if cmd.Process != nil { + err := cmd.Process.Kill() + if err != nil && !strings.Contains(err.Error(), "process already finished") { + GinkgoWriter.Println("error on process kill:", err) + } + } + } + +} + +func createRBACForResourceProxyTest(agentK8sClient client.Client, agentInstallNamespace string) func() { + ctx := context.Background() + resourceProxyClusterRole := &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: "resource-proxy-e2e-test-cluster-role", + }, + Rules: []rbacv1.PolicyRule{ + { + APIGroups: []string{"apps"}, + Resources: []string{"deployments"}, + Verbs: []string{"get", "list", "watch"}, + }, + }, + } + resourceProxyClusterRoleGet := resourceProxyClusterRole.DeepCopy() + if err := agentK8sClient.Get(ctx, client.ObjectKeyFromObject(resourceProxyClusterRoleGet), resourceProxyClusterRoleGet); err == nil { + Expect(agentK8sClient.Delete(ctx, resourceProxyClusterRoleGet)).To(Succeed()) + } else if !apierrors.IsNotFound(err) { + Expect(err).ToNot(HaveOccurred()) + } + Expect(agentK8sClient.Create(ctx, resourceProxyClusterRole)).To(Succeed()) + + resourceProxyClusterRoleBinding := &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: "resource-proxy-e2e-test-cluster-role-binding", + }, + Subjects: []rbacv1.Subject{ + { + Kind: "ServiceAccount", + Name: "argocd-spoke-agent-agent", + Namespace: agentInstallNamespace, + }, + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: "rbac.authorization.k8s.io", + Kind: "ClusterRole", + Name: resourceProxyClusterRole.Name, + }, + } + resourceProxyClusterRoleBindingGet := resourceProxyClusterRoleBinding.DeepCopy() + if err := agentK8sClient.Get(ctx, client.ObjectKeyFromObject(resourceProxyClusterRoleBindingGet), resourceProxyClusterRoleBindingGet); err == nil { + Expect(agentK8sClient.Delete(ctx, resourceProxyClusterRoleBindingGet)).To(Succeed()) + } else if !apierrors.IsNotFound(err) { + Expect(err).ToNot(HaveOccurred()) + } + Expect(agentK8sClient.Create(ctx, resourceProxyClusterRoleBinding)).To(Succeed()) + + return func() { + Expect(agentK8sClient.Delete(ctx, resourceProxyClusterRole)).To(Succeed()) + Eventually(resourceProxyClusterRole).Should(k8sFixture.NotExistByName()) + + Expect(agentK8sClient.Delete(ctx, resourceProxyClusterRoleBinding)).To(Succeed()) + Eventually(resourceProxyClusterRoleBinding).Should(k8sFixture.NotExistByName()) + + } +} + +func getResourceForResourceProxyTest(endpointURL string, password string, app *argocdv1alpha1.Application, group, version, kind, namespace, name string) (string, error) { + + _, sessionToken, closer, err := argocdFixture.CreateArgoCDAPIClient(context.Background(), endpointURL, password) + if err != nil { + return "", fmt.Errorf("unable to create argocd api client: %v", err) + } + defer closer.Close() + + c := &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, + }, + }, + } + + reqURL := constructURLForResourceProxyTest(endpointURL, + "appNamespace", app.Namespace, + "project", app.Spec.Project, + "namespace", namespace, + "resourceName", name, + "group", group, + "version", version, + "kind", kind, + ) + reqURL.Path = fmt.Sprintf("/api/v1/applications/%s/resource", app.Name) + + GinkgoWriter.Println("resourceProxyURL:", *reqURL) + + req := http.Request{Method: http.MethodGet, URL: reqURL, Header: make(http.Header)} + + req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", sessionToken)) + + resp, err := c.Do(&req) + if err != nil { + return "", err + } + defer resp.Body.Close() + if resp.StatusCode != 200 { + return "", fmt.Errorf("expected HTTP 200, got %d", resp.StatusCode) + } + type manifestResponse struct { + Manifest string `json:"manifest"` + } + manifest := &manifestResponse{} + jsonData, err := io.ReadAll(resp.Body) + if err != nil { + return "", err + } + err = json.Unmarshal(jsonData, manifest) + if err != nil { + return "", err + } + return manifest.Manifest, nil +} + +func constructURLForResourceProxyTest(endpoint string, params ...string) *url.URL { + u := &url.URL{Scheme: "https", Host: endpoint} + if len(params)%2 == 0 { + q := make(url.Values) + for i := 0; i < len(params)-1; i += 2 { + q.Add(params[i], params[i+1]) + } + u.RawQuery = q.Encode() + } else if len(params) != 0 { + panic("params must be given in pairs") + } + return u +} diff --git a/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go b/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go new file mode 100644 index 000000000000..0fbdd45c3528 --- /dev/null +++ b/test/openshift/e2e/ginkgo/sequential/1-059_validate_argocd_agent_terminal_streaming_test.go @@ -0,0 +1,341 @@ +/* +Copyright 2026. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package sequential + +import ( + "context" + "fmt" + "strings" + "time" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" + agentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/agent" + appFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/application" + argocdClient "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocdclient" + deploymentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment" + k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" + routeFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/route" + fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" + + argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" + "github.com/argoproj/gitops-engine/pkg/health" + + argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" + argocdFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/argocd" + + routev1 "github.com/openshift/api/route/v1" + + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +// This test validates that terminal streaming works through the ArgoCD agent architecture +// on OpenShift. It exercises the full terminal flow: +var _ = Describe("GitOps Operator Sequential E2E Tests", func() { + Context("1-059_validate_argocd_agent_terminal_streaming", func() { + var ( + k8sClient client.Client + ctx context.Context + cleanupFuncs []func() + registerCleanup func(func()) + + clusterRolePrincipal *rbacv1.ClusterRole + clusterRoleBindingPrincipal *rbacv1.ClusterRoleBinding + clusterRoleManagedAgent *rbacv1.ClusterRole + clusterRoleBindingManagedAgent *rbacv1.ClusterRoleBinding + adminCRBManagedAgent *rbacv1.ClusterRoleBinding + adminCRBAgentAgent *rbacv1.ClusterRoleBinding + ) + + BeforeEach(func() { + if !fixture.EnvLocalRun() { + fixture.EnsureSequentialCleanSlate() + fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", + "openshift-gitops, "+namespaceAgentPrincipal+", "+namespaceManagedAgent) + } + + k8sClient, _ = fixtureUtils.GetE2ETestKubeClient() + ctx = context.Background() + cleanupFuncs = nil + registerCleanup = func(fn func()) { + if fn != nil { + cleanupFuncs = append(cleanupFuncs, fn) + } + } + + // create required cluster roles and cluster role bindings for the test + adminCRBManagedAgent = &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-admin-crb", namespaceManagedAgent), + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: rbacv1.GroupName, + Kind: "ClusterRole", + Name: "admin", + }, + Subjects: []rbacv1.Subject{ + { + Kind: rbacv1.ServiceAccountKind, + Name: fmt.Sprintf("%s-argocd-application-controller", argoCDAgentInstanceNameAgent), + Namespace: namespaceManagedAgent, + }, + }, + } + Expect(k8sClient.Create(ctx, adminCRBManagedAgent)).To(Succeed()) + + adminCRBAgentAgent = &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-agent-agent-admin-crb", namespaceManagedAgent), + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: rbacv1.GroupName, + Kind: "ClusterRole", + Name: "admin", + }, + Subjects: []rbacv1.Subject{ + { + Kind: rbacv1.ServiceAccountKind, + Name: fmt.Sprintf("%s-agent-agent", argoCDAgentInstanceNameAgent), + Namespace: namespaceManagedAgent, + }, + }, + } + Expect(k8sClient.Create(ctx, adminCRBAgentAgent)).To(Succeed()) + + clusterRolePrincipal = &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-%s-agent-principal", argoCDAgentInstanceNamePrincipal, namespaceAgentPrincipal), + }, + } + + clusterRoleBindingPrincipal = &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-%s-agent-principal", argoCDAgentInstanceNamePrincipal, namespaceAgentPrincipal), + }, + } + + clusterRoleManagedAgent = &rbacv1.ClusterRole{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-%s-agent-agent", argoCDAgentInstanceNameAgent, namespaceManagedAgent), + }, + } + clusterRoleBindingManagedAgent = &rbacv1.ClusterRoleBinding{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-%s-agent-agent", argoCDAgentInstanceNameAgent, namespaceManagedAgent), + }, + } + + // create required namespaces for the test + _, cleanupFuncClusterManaged := fixture.CreateNamespaceWithCleanupFunc(managedAgentClusterName) + registerCleanup(cleanupFuncClusterManaged) + + _, cleanupFuncClusterAutonomous := fixture.CreateNamespaceWithCleanupFunc(autonomousAgentClusterName) + registerCleanup(cleanupFuncClusterAutonomous) + + _, cleanupFuncManagedApplication := fixture.CreateClusterScopedManagedNamespaceWithCleanupFunc( + managedAgentApplicationNamespace, argoCDAgentInstanceNameAgent) + registerCleanup(cleanupFuncManagedApplication) + }) + + It("Should open a terminal session to a pod deployed via ArgoCD agent and execute commands", func() { + + By("Deploy principal with server route enabled and verify it starts successfully") + deployPrincipal(ctx, k8sClient, registerCleanup, true) + + By("Enable exec feature in ArgoCD server configuration") + enableExecInArgoCD(ctx, k8sClient, argoCDAgentInstanceNamePrincipal, namespaceAgentPrincipal) + + By("Wait for ArgoCD server to restart with exec enabled") + Eventually(&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-server", argoCDAgentInstanceNamePrincipal), + Namespace: namespaceAgentPrincipal, + }}, "120s", "5s").Should(deploymentFixture.HaveReadyReplicas(1)) + + By("Deploy managed agent and verify it starts successfully") + deployAgent(ctx, k8sClient, registerCleanup, argov1beta1api.AgentModeManaged) + + By("Wait for agent repo-server to be ready before creating applications") + Eventually(&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-repo-server", argoCDAgentInstanceNameAgent), + Namespace: namespaceManagedAgent, + }}, "180s", "5s").Should(deploymentFixture.HaveReadyReplicas(1)) + + By("Verify principal is connected to managed agent") + agentFixture.VerifyLogs(deploymentNameAgentPrincipal, namespaceAgentPrincipal, []string{ + fmt.Sprintf("Mapped cluster %s to agent %s", managedAgentClusterName, managedAgentClusterName), + fmt.Sprintf("Updated connection status to 'Successful' in Cluster: '%s' mapped with Agent: '%s'", + managedAgentClusterName, managedAgentClusterName), + }) + + By("Create AppProject for managed agent in " + namespaceAgentPrincipal) + Expect(k8sClient.Create(ctx, buildAppProjectResource(namespaceAgentPrincipal, argov1beta1api.AgentModeManaged))).To(Succeed()) + + application := buildApplicationResource("terminal-app", + managedAgentClusterName, managedAgentClusterName, argoCDAgentInstanceNameAgent, argov1beta1api.AgentModeManaged) + + By("Deploy application for terminal testing") + Expect(k8sClient.Create(ctx, application)).To(Succeed()) + + By("Verify application is synced and healthy") + Eventually(application, "180s", "5s").Should(appFixture.HaveSyncStatusCode(argocdv1alpha1.SyncStatusCodeSynced), + "Application should be synced") + Eventually(application, "180s", "5s").Should(appFixture.HaveHealthStatusCode(health.HealthStatusHealthy), + "Application should be healthy") + + By("Wait for ArgoCD server Route to be created") + serverRoute := &routev1.Route{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-server", argoCDAgentInstanceNamePrincipal), + Namespace: namespaceAgentPrincipal, + }, + } + Eventually(serverRoute, "120s", "5s").Should(k8sFixture.ExistByName()) + Eventually(serverRoute, "120s", "5s").Should(routeFixture.HaveAdmittedIngress()) + + // Create ArgoCD client using the ArgoCD server Route and admin password. + // ArgoCD Client is acting as a browser and trying to open a terminal session + // to the application in the managed-cluster. + By("Get ArgoCD admin password and login via Route") + argoEndpoint := serverRoute.Spec.Host + GinkgoWriter.Printf("ArgoCD server Route host: %s\n", argoEndpoint) + + password := argocdFixture.GetInitialAdminSecretPassword(argoCDAgentInstanceNamePrincipal, namespaceAgentPrincipal, k8sClient) + _, sessionToken, closer, err := argocdFixture.CreateArgoCDAPIClient(ctx, argoEndpoint, password) + Expect(err).ToNot(HaveOccurred()) + defer closer.Close() + + // Find the application pod which we want to open a terminal session for. + By("Find a running pod in the application namespace") + var podName, containerName string + Eventually(func() bool { + pods := &corev1.PodList{} + if err := k8sClient.List(ctx, pods, client.InNamespace(managedAgentApplicationNamespace)); err != nil { + GinkgoWriter.Println("Failed to list pods:", err) + return false + } + for _, p := range pods.Items { + if strings.Contains(p.Name, "spring-petclinic") && + p.Status.Phase == corev1.PodRunning && len(p.Spec.Containers) > 0 { + podName = p.Name + containerName = p.Spec.Containers[0].Name + return true + } + } + return false + }, "60s", "5s").Should(BeTrue(), "expected a running spring-petclinic pod in %s", managedAgentApplicationNamespace) + + // Open a terminal session with ArgoCD Server API. + // This replicates the behavior of the ArgoCD UI when a user opens a terminal + // session to an application. This is done by sending a resize message to the + // shell and then sending commands to the shell. The shell will execute the + // command and stream the output back to the principal. The principal will then + // stream the output back to the UI. + GinkgoWriter.Printf("Opening terminal session to pod %s, container %s\n", podName, containerName) + + // We use WebSoket for Test to ArgoCD Server communication. + // Then internally agent will first try Web-socket to pods/exec + // and if that fails, it will fallback to SPDY. + By("Open terminal session via ArgoCD WebSocket API") + var session *argocdClient.TerminalClient + Eventually(func() error { + var err error + session, err = argocdClient.ExecTerminal(argoEndpoint, sessionToken, application, managedAgentApplicationNamespace, podName, containerName) + return err + }, "30s", "5s").Should(Succeed(), "failed to open terminal session") + defer session.Close() + + // Send a resize message first, this is required by the shell to render the + // output content accordingly. + err = session.SendResize(80, 24) + Expect(err).ToNot(HaveOccurred(), "failed to send resize") + + // Wait for shell to initialize by checking for any output + Eventually(func() bool { + return len(session.GetOutput()) > 0 + }, 10*time.Second, 1*time.Second).Should(BeTrue(), "shell did not initialize") + + // Test 1: Run 'pwd' command + err = session.SendInput("pwd; echo PWD_DONE\n") + Expect(err).ToNot(HaveOccurred(), "failed to send pwd command") + found := session.WaitForOutput("PWD_DONE", 10*time.Second) + Expect(found).To(BeTrue(), "expected to find 'PWD_DONE' in pwd output, got: %s", session.GetOutput()) + GinkgoWriter.Println("Test 1 passed: pwd command executed successfully") + + // Test 2: Run 'whoami' command + err = session.SendInput("whoami; echo WHOAMI_DONE\n") + Expect(err).ToNot(HaveOccurred(), "failed to send whoami command") + found = session.WaitForOutput("whoami", 10*time.Second) + Expect(found).To(BeTrue(), "expected whoami output in terminal, got: %s", session.GetOutput()) + GinkgoWriter.Println("Test 2 passed: whoami command executed successfully") + + // Test 3: Run 'ls' command - should list files + err = session.SendInput("ls; echo LS_DONE\n") + Expect(err).ToNot(HaveOccurred(), "failed to send ls command") + found = session.WaitForOutput("LS_DONE", 10*time.Second) + Expect(found).To(BeTrue(), "expected to find 'LS_DONE' in ls output, got: %s", session.GetOutput()) + GinkgoWriter.Println("Test 3 passed: ls command executed successfully") + + GinkgoWriter.Println("All terminal commands executed successfully.") + }) + + AfterEach(func() { + fixture.OutputDebugOnFail(namespaceAgentPrincipal, namespaceManagedAgent, managedAgentClusterName, managedAgentApplicationNamespace) + + By("Cleanup cluster-scoped resources") + _ = k8sClient.Delete(ctx, clusterRolePrincipal) + _ = k8sClient.Delete(ctx, clusterRoleBindingPrincipal) + _ = k8sClient.Delete(ctx, clusterRoleManagedAgent) + _ = k8sClient.Delete(ctx, clusterRoleBindingManagedAgent) + _ = k8sClient.Delete(ctx, adminCRBManagedAgent) + _ = k8sClient.Delete(ctx, adminCRBAgentAgent) + + By("Cleanup namespaces created in this test") + for i := len(cleanupFuncs) - 1; i >= 0; i-- { + cleanupFuncs[i]() + } + }) + }) +}) + +// enableExecInArgoCD configures the ArgoCD CR to enable the web-based terminal. +// through spec.extraConfig and grant the admin role exec permission via spec.rbac.policy. +func enableExecInArgoCD(ctx context.Context, k8sClient client.Client, argocdName, namespace string) { + GinkgoHelper() + + argoCD := &argov1beta1api.ArgoCD{} + Expect(k8sClient.Get(ctx, types.NamespacedName{ + Name: argocdName, + Namespace: namespace, + }, argoCD)).To(Succeed()) + + if argoCD.Spec.ExtraConfig == nil { + argoCD.Spec.ExtraConfig = map[string]string{} + } + argoCD.Spec.ExtraConfig["exec.enabled"] = "true" + argoCD.Spec.ExtraConfig["exec.shells"] = "bash,sh,ash,/bin/bash,/bin/sh,/bin/ash" + + execPolicy := "p, role:admin, exec, create, */*, allow" + argoCD.Spec.RBAC.Policy = &execPolicy + + Expect(k8sClient.Update(ctx, argoCD)).To(Succeed()) +} diff --git a/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go b/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go new file mode 100644 index 000000000000..05697b75322f --- /dev/null +++ b/test/openshift/e2e/ginkgo/sequential/1-084_validate_prune_templates.go @@ -0,0 +1,206 @@ +package sequential + +import ( + "context" + "os" + "path/filepath" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + argov1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" + "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" + "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" + fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" + + corev1 "k8s.io/api/core/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +var _ = Describe("GitOps Operator Sequential E2E Tests", func() { + + Context("1-084_validate_prune_templates", func() { + var ( + k8sClient client.Client + ctx context.Context + ns *corev1.Namespace + cleanupFunc func() + ) + + BeforeEach(func() { + fixture.EnsureSequentialCleanSlate() + k8sClient, _ = fixtureUtils.GetE2ETestKubeClient() + ctx = context.Background() + + ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() + + // permissions + err := k8sClient.Get(ctx, client.ObjectKeyFromObject(ns), ns) + Expect(err).ToNot(HaveOccurred()) + + if ns.Labels == nil { + ns.Labels = make(map[string]string) + } + ns.Labels["argocd.argoproj.io/managed-by"] = "openshift-gitops" + Expect(k8sClient.Update(ctx, ns)).To(Succeed()) + }) + + AfterEach(func() { + defer cleanupFunc() + fixture.OutputDebugOnFail(ns) + }) + + It("validates that resources with duplicate GVKs can be pruned successfully with local sync", func() { + By("creating a temp dir for git repo") + workDir, err := os.MkdirTemp("", "gitops-prune-test") + Expect(err).ToNot(HaveOccurred()) + DeferCleanup(func() { + _ = os.RemoveAll(workDir) + }) + + By("writing two OpenShift Templates (duplicate GVKs) to the working dir") + template1 := `--- +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 +` + template2 := `--- +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 +` + err = os.WriteFile(filepath.Join(workDir, "app-template.yaml"), []byte(template1), 0600) + Expect(err).ToNot(HaveOccurred()) + + err = os.WriteFile(filepath.Join(workDir, "app-template2.yaml"), []byte(template2), 0600) + Expect(err).ToNot(HaveOccurred()) + + By("logging into the Argo CD CLI") + err = argocd.LogInToDefaultArgoCDInstance() + Expect(err).ToNot(HaveOccurred(), "Failed to login to Argo CD") + + By("Creating ArgoCD Application CR using the typed schema") + appName := "app-kustomize-" + ns.Name + + app := &argov1alpha1.Application{ + ObjectMeta: metav1.ObjectMeta{ + Name: appName, + Namespace: "openshift-gitops", + }, + Spec: argov1alpha1.ApplicationSpec{ + Project: "default", + Source: &argov1alpha1.ApplicationSource{ + RepoURL: "file://" + workDir + ".git", + Path: ".", + TargetRevision: "HEAD", + }, + Destination: argov1alpha1.ApplicationDestination{ + Server: "https://kubernetes.default.svc", + Namespace: ns.Name, + }, + SyncPolicy: &argov1alpha1.SyncPolicy{ + SyncOptions: argov1alpha1.SyncOptions{"PruneLast=true"}, + }, + }, + } + + Expect(k8sClient.Create(ctx, app)).To(Succeed()) + + DeferCleanup(func() { + _ = k8sClient.Delete(ctx, app) + }) + + By("syncing the application using the local dir") + out, err := argocd.RunArgoCDCLI("app", "sync", appName, "--local", workDir, "--timeout", "100") + Expect(err).ToNot(HaveOccurred(), "Failed to sync app with local flag: %s", out) + + By("verifying both templates were created") + tmplObj := &unstructured.Unstructured{} + tmplObj.SetGroupVersionKind(schema.GroupVersionKind{Group: "template.openshift.io", Version: "v1", Kind: "Template"}) + + Eventually(func() error { + return k8sClient.Get(ctx, client.ObjectKey{Name: "redis-template-gitops", Namespace: ns.Name}, tmplObj) + }, "2m", "5s").Should(Succeed()) + + Eventually(func() error { + return k8sClient.Get(ctx, client.ObjectKey{Name: "redis-template-gitops2", Namespace: ns.Name}, tmplObj) + }, "2m", "5s").Should(Succeed()) + + By("deleting one template from the local source directory") + err = os.Remove(filepath.Join(workDir, "app-template.yaml")) + Expect(err).ToNot(HaveOccurred()) + + By("syncing the application again this time with the prune flag enabled") + out, err = argocd.RunArgoCDCLI("app", "sync", appName, "--local", workDir, "--prune", "--timeout", "100") + Expect(err).ToNot(HaveOccurred(), "Failed to sync and prune app: %s", out) + + By("verifying the deleted template was pruned from the cluster") + Eventually(func() bool { + err := k8sClient.Get(ctx, client.ObjectKey{Name: "redis-template-gitops", Namespace: ns.Name}, tmplObj) + return k8serrors.IsNotFound(err) + }, "2m", "5s").Should(BeTrue(), "Expected redis-template-gitops to be pruned, but it still exists") + + By("verifying the remaining template still exists") + err = k8sClient.Get(ctx, client.ObjectKey{Name: "redis-template-gitops2", Namespace: ns.Name}, tmplObj) + Expect(err).ToNot(HaveOccurred(), "Expected redis-template-gitops2 to still exist") + }) + }) +}) diff --git a/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go b/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go new file mode 100644 index 000000000000..d822b57d8be4 --- /dev/null +++ b/test/openshift/e2e/ginkgo/sequential/1-092_validate_workload_status_monitoring_alert.go @@ -0,0 +1,216 @@ +package sequential + +import ( + "context" + "encoding/json" + "os/exec" + + argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" + argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" + k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" + fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +var _ = Describe("GitOps Operator Sequential E2E Tests", func() { + + Context("1-092_validate_workload_status_monitoring_alert", func() { + var ( + k8sClient client.Client + ctx context.Context + nsCluster *corev1.Namespace + nsNamespaced *corev1.Namespace + cleanupFunc func() + ) + + BeforeEach(func() { + fixture.EnsureSequentialCleanSlate() + k8sClient, _ = fixtureUtils.GetE2ETestKubeClient() + ctx = context.Background() + + nsCluster = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "openshift-gitops"}} + nsNamespaced, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() + }) + + AfterEach(func() { + defer cleanupFunc() + fixture.OutputDebugOnFail(nsNamespaced) + }) + + It("validates monitoring setup, alert rule creation, and teardown", func() { + const ( + // picking image that exists to avoid ImagePullBackOff but should fail to run as an ApplicationSet controller + invalidImage = "quay.io/libpod/alpine:latest" + prometheusRuleName = "argocd-component-status-alert" + clusterInstanceName = "openshift-gitops" + ) + + ruleCluster := &monitoringv1.PrometheusRule{ + ObjectMeta: metav1.ObjectMeta{Name: prometheusRuleName, Namespace: nsCluster.Name}, + } + ruleNamespaced := &monitoringv1.PrometheusRule{ + ObjectMeta: metav1.ObjectMeta{Name: prometheusRuleName, Namespace: nsNamespaced.Name}, + } + appSetDeplCluster := &appsv1.Deployment{ + ObjectMeta: metav1.ObjectMeta{Name: clusterInstanceName + "-applicationset-controller", Namespace: nsCluster.Name}, + } + appSetDeplNamespaced := &appsv1.Deployment{ + ObjectMeta: metav1.ObjectMeta{Name: "argocd-applicationset-controller", Namespace: nsNamespaced.Name}, + } + uwmConfigMap := &corev1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{Name: "cluster-monitoring-config", Namespace: "openshift-monitoring"}, + Data: map[string]string{"config.yaml": "enableUserWorkload: true\n"}, + } + + By("labeling the namespace for monitoring") + // prometheus will only scrape user workload namespaces that have this label + err := k8sClient.Get(ctx, client.ObjectKeyFromObject(nsNamespaced), nsNamespaced) + Expect(err).NotTo(HaveOccurred()) + + if nsNamespaced.Labels == nil { + nsNamespaced.Labels = make(map[string]string) + } + nsNamespaced.Labels["openshift.io/cluster-monitoring"] = "true" + err = k8sClient.Update(ctx, nsNamespaced) + Expect(err).NotTo(HaveOccurred()) + + By("enabling user workload monitoring in the cluster monitoring config map") + existingCM := &corev1.ConfigMap{} + err = k8sClient.Get(ctx, client.ObjectKeyFromObject(uwmConfigMap), existingCM) + + cmExisted := (err == nil) + var originalData map[string]string + + if cmExisted { + originalData = existingCM.Data + existingCM.Data = uwmConfigMap.Data + Expect(k8sClient.Update(ctx, existingCM)).To(Succeed(), "Failed to update existing UWM ConfigMap") + } else if errors.IsNotFound(err) { + Expect(k8sClient.Create(ctx, uwmConfigMap)).To(Succeed(), "Failed to create UWM ConfigMap") + } else { + Expect(err).NotTo(HaveOccurred(), "Failed to fetch UWM ConfigMap") + } + + DeferCleanup(func() { + By("restoring or deleting cluster monitoring config") + if cmExisted { + revertCM := &corev1.ConfigMap{} + Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(uwmConfigMap), revertCM)).To(Succeed()) + revertCM.Data = originalData + Expect(k8sClient.Update(ctx, revertCM)).To(Succeed()) + } else { + _ = k8sClient.Delete(ctx, uwmConfigMap) + } + }) + + By("modifying both ArgoCD instances to enable monitoring and break the AppSet image") + argoCDCluster := &argov1beta1api.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{Name: clusterInstanceName, Namespace: nsCluster.Name}, + } + Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(argoCDCluster), argoCDCluster)).To(Succeed()) + + // restore even if the test fails halfway + DeferCleanup(func() { + By("restoring the default image and disabling monitoring on cluster Argo CD instance (Cleanup)") + _ = k8sClient.Get(ctx, client.ObjectKeyFromObject(argoCDCluster), argoCDCluster) + argocdFixture.Update(argoCDCluster, func(ac *argov1beta1api.ArgoCD) { + ac.Spec.ApplicationSet.Image = "" + ac.Spec.Monitoring.Enabled = false + }) + }) + + argocdFixture.Update(argoCDCluster, func(ac *argov1beta1api.ArgoCD) { + ac.Spec.ApplicationSet = &argov1beta1api.ArgoCDApplicationSet{Image: invalidImage} + ac.Spec.Monitoring = argov1beta1api.ArgoCDMonitoringSpec{Enabled: true} + }) + + argoCDNamespaced := &argov1beta1api.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: nsNamespaced.Name}, + Spec: argov1beta1api.ArgoCDSpec{ + ApplicationSet: &argov1beta1api.ArgoCDApplicationSet{Image: invalidImage}, + Monitoring: argov1beta1api.ArgoCDMonitoringSpec{Enabled: true}, + }, + } + Expect(k8sClient.Create(ctx, argoCDNamespaced)).To(Succeed()) + + By("waiting for the Argo CD instances to become available") + Eventually(argoCDCluster, "5m").Should(argocdFixture.BeAvailable()) + Eventually(argoCDNamespaced, "5m").Should(argocdFixture.BeAvailable()) + + By("verifying PrometheusRules are created with the correct alerts") + Eventually(ruleCluster, "3m", "5s").Should(k8sFixture.ExistByName(), "PrometheusRule should be created in cluster namespace") + Eventually(ruleNamespaced, "3m", "5s").Should(k8sFixture.ExistByName(), "PrometheusRule should be created in test namespace") + + By("verifying the ApplicationSet deployments are present") + Eventually(appSetDeplCluster).Should(k8sFixture.ExistByName()) + Eventually(appSetDeplNamespaced).Should(k8sFixture.ExistByName()) + + By("verifying the workload degradation alerts are actively firing in Prometheus") + Eventually(func() bool { + cmd := exec.Command("oc", "exec", "-n", "openshift-monitoring", "prometheus-k8s-0", "-c", "prometheus", "--", "curl", "-s", "http://localhost:9090/api/v1/alerts") + outBytes, err := cmd.Output() + if err != nil { + GinkgoWriter.Printf("Failed to query Prometheus: %v\n", err) + return false + } + + // parse the json response + type promResponse struct { + Data struct { + Alerts []struct { + Labels map[string]string `json:"labels"` + State string `json:"state"` + } `json:"alerts"` + } `json:"data"` + } + + var resp promResponse + if err := json.Unmarshal(outBytes, &resp); err != nil { + GinkgoWriter.Printf("Failed to unmarshal JSON: %v\n", err) + return false + } + + hasDefaultAlert := false + hasCustomAlert := false + + for _, alert := range resp.Data.Alerts { + if alert.Labels["alertname"] == "ApplicationSetControllerNotReady" && alert.State == "firing" { + if alert.Labels["namespace"] == "openshift-gitops" { + hasDefaultAlert = true + } + if alert.Labels["namespace"] == nsNamespaced.Name { + hasCustomAlert = true + } + } + } + + return hasDefaultAlert && hasCustomAlert + }, "15m", "30s").Should(BeTrue(), "Expected ApplicationSetControllerNotReady alerts to reach 'firing' state for both instances") + + By("disabling monitoring and restoring the default images") + Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(argoCDCluster), argoCDCluster)).To(Succeed()) + argocdFixture.Update(argoCDCluster, func(ac *argov1beta1api.ArgoCD) { + ac.Spec.ApplicationSet.Image = "" + ac.Spec.Monitoring.Enabled = false + }) + + Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(argoCDNamespaced), argoCDNamespaced)).To(Succeed()) + argocdFixture.Update(argoCDNamespaced, func(ac *argov1beta1api.ArgoCD) { + ac.Spec.ApplicationSet.Image = "" + ac.Spec.Monitoring.Enabled = false + }) + + By("verifying PrometheusRules are deleted") + Eventually(ruleCluster, "5m").Should(k8sFixture.NotExistByName(), "Cluster PrometheusRule should be deleted") + Eventually(ruleNamespaced, "5m").Should(k8sFixture.NotExistByName(), "Namespaced PrometheusRule should be deleted") + }) + }) +}) 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 a45cca6dae18..000000000000 --- 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 e69de29bb2d1..000000000000 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 2d916d7dcd2a..000000000000 --- 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 5328adc148fe..000000000000 --- 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 f86fa5f6ea53..000000000000 --- 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 676874811211..000000000000 --- 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 a7071a2d4eec..000000000000 --- 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 846415fad754..000000000000 --- 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 f4303c51f84b..000000000000 --- 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 bdffa1776751..000000000000 --- 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 7b413d0e34fb..000000000000 --- 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 b7f673a49ed6..000000000000 --- 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 c98dea44f183..000000000000 --- 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 68f5422f50ff..000000000000 --- 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 a8dbd1a55289..000000000000 --- 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 fc3cfdb819aa..000000000000 --- 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 46e0a6a90dc2..000000000000 --- 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 b5be0f126d5e..000000000000 --- 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 417ed6bd8ae9..000000000000 --- 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 f86fa5f6ea53..000000000000 --- 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 548cbf2ec03f..000000000000 --- 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 157ca90bc10e..000000000000 --- 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 14399b4bfb06..000000000000 --- 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 50a67c2d6286..000000000000 --- 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 a0c2c14377a5..000000000000 --- 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 7da3b15acc14..000000000000 --- 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 ce3a825e3a02..000000000000 --- 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 081a978eee79..000000000000 --- 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 7d05b0c2fcfe..000000000000 --- 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 5e69a1e8c6e1..000000000000 --- 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 24221e830765..000000000000 --- 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 0155f0a04e08..000000000000 --- 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 efc7c7061353..000000000000 --- 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 cf974611f8c5..000000000000 --- 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 6d16600f2989..000000000000 --- 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 6b0dfd87a4d1..000000000000 --- 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 28710575ead5..000000000000 --- 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 360366f6dc07..000000000000 --- 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 df3c4e93d5a1..000000000000 --- 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 1878fffbf6f9..000000000000 --- 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 d37d44c8e475..000000000000 --- 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 0d8201294b29..000000000000 --- 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 2bdfda83942e..000000000000 --- 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 0d8201294b29..000000000000 --- 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 bbcf745c5089..000000000000 --- 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 13792d7ece9f..000000000000 --- 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 239bd85a7ce7..000000000000 --- 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 01d9a85461ce..000000000000 --- 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 e35f2e928e60..000000000000 --- 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 d68eef3cde02..000000000000 --- 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 699f91d19a9e..000000000000 --- 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 773ec274f3ba..000000000000 --- 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 a0d7cd2bf30f..000000000000 --- 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 d48bb9e91f05..000000000000 --- 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 b0d0592ff6e1..000000000000 --- 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 253fd3cd7878..000000000000 --- 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 a4383b200b71..000000000000 --- 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 78c233c9ec60..000000000000 --- 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 9fc16d4d1a25..000000000000 --- 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 4ecf4af0aad0..000000000000 --- 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 83faeebaa390..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 bd9c64199278..000000000000 --- 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 f6f74f2471c5..000000000000 --- 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 19fe90ae1500..000000000000 --- 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 90d3be98f2c3..000000000000 --- 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 e6d765ba9c23..000000000000 --- 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 a9c037e98f46..000000000000 --- 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 7626618f6094..000000000000 --- 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 029233a907f4..000000000000 --- 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 c5a3a6fd97d8..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 eec10e64ab68..000000000000 --- 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 6cb167cf9155..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 dba7487a0985..000000000000 --- 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 919aebd2dcc3..000000000000 --- 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 9ee1919d9667..000000000000 --- 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 0d8201294b29..000000000000 --- 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 1f424c4663df..000000000000 --- 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 82c226b2e6ac..000000000000 --- 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 ee9c18009d68..000000000000 --- 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 2ee939334cff..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 22744813fe7b..000000000000 --- 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 b1783d74ba70..000000000000 --- 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 3ddbadebda1f..000000000000 --- 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 790cfdd4709b..000000000000 --- 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 f41e545a8d8a..000000000000 --- 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 42e32a779ca4..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 64b28c91dbf9..000000000000 --- 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 8185706d1c64..000000000000 --- 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 e8db19354044..000000000000 --- 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 50368922e304..000000000000 --- 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 d68d60a9eaa4..000000000000 --- 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 d6ffb17db43e..000000000000 --- 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 1170d554f8ee..000000000000 --- 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 e8db19354044..000000000000 --- 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 18f076ce89bb..000000000000 --- 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 ea5bffd1ba09..000000000000 --- 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 0906e9bebbce..000000000000 --- 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 faad1acaf10f..000000000000 --- 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 a962c966ae8b..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 085166918228..000000000000 --- 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 5bc3e3dc758b..000000000000 --- 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 6d473259a41d..000000000000 --- 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 c336598f09a7..000000000000 --- 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 daaa23ac8aec..000000000000 --- 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 c82eb661fd99..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 e7dcd4fa2f48..000000000000 --- 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 f3e44f7f5ea1..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 9644a6bbda13..000000000000 --- 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 ad5c0184545b..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 ab46dfe9cd77..000000000000 --- 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 978c1d260031..000000000000 --- 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 03a61e6cafb5..000000000000 --- 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 a3fa97ab6e12..000000000000 --- 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 aa719afb9bb1..000000000000 --- 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 0c80e46ac07c..000000000000 --- 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 6b21080c0969..000000000000 --- 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 0d8201294b29..000000000000 --- 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 00029c8df311..000000000000 --- 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 cf75730ca3e5..000000000000 --- 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 401b91168447..000000000000 --- 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 3a5fad3053c3..000000000000 --- 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 e14804f25ee8..000000000000 --- 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 ddf9f5211425..000000000000 --- 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 3fb94e98c803..000000000000 --- 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 ec86b21dfc0a..000000000000 --- 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 c2b24451f888..000000000000 --- 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 c697d11412b6..000000000000 --- 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 2ee939334cff..000000000000 --- 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 7f8eddf25161..000000000000 --- 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 dfed78cb23cd..000000000000 --- 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 8c779dc2a493..000000000000 --- 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 d98e6fd7b7b6..000000000000 --- 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 d07e4385510c..000000000000 --- 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 8185706d1c64..000000000000 --- 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 edc10ee04bf0..000000000000 --- 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 090703c4e1a8..000000000000 --- 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 4d554aeae50b..000000000000 --- 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 7ff251954ad5..000000000000 --- 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 0ba1bcd79909..000000000000 --- 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 5bc157c55ccc..000000000000 --- 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 e0147f4b0359..000000000000 --- 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 89f17b7f6c6c..000000000000 --- 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 8204e070db1a..000000000000 --- 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 1b7c948b9475..000000000000 --- 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 cd5bc09e99e4..000000000000 --- 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 89f17b7f6c6c..000000000000 --- 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 47052970a1b7..000000000000 --- 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 adf7a6828c10..000000000000 --- 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 369ddad0d0c2..000000000000 --- 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 955aaaef8b05..000000000000 --- 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 a10fc72ed0dd..000000000000 --- 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 370285249d5f..000000000000 --- 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 d5751238c558..000000000000 --- 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 7c79c300913a..000000000000 --- 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 0d8201294b29..000000000000 --- 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 cd8e0aed8e1f..000000000000 --- 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 6a32d59aa6e6..000000000000 --- 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 db25e1c94d31..000000000000 --- 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 3dc1e956030c..000000000000 --- 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 5ec09727b42d..000000000000 --- 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 bd11cbd16653..000000000000 --- 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 8c10115f4f00..000000000000 --- 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 a6a4b5515dfd..000000000000 --- 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 bbac50ba5742..000000000000 --- 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 e5470d42f83b..000000000000 --- 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 3f172ffda5e1..000000000000 --- 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 aff583e25620..000000000000 --- 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 d005cd46f725..000000000000 --- 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 61d0220b238c..000000000000 --- 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 747283cafb2e..000000000000 --- 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 8cb6c08cce2b..000000000000 --- 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 1a3e4aa79e8e..000000000000 --- 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 a3695549dd5b..000000000000 --- 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 6ce824695abb..000000000000 --- 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 88db3ef474df..000000000000 --- 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 d68fe06715c1..000000000000 --- 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 1a9c6577b325..000000000000 --- 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 9d21a7003bb8..000000000000 --- 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 2a8049b27692..000000000000 --- 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 d4094a3fdb39..000000000000 --- 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 1fab1a941540..000000000000 --- 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 1de4afe0880e..000000000000 --- 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 0d8201294b29..000000000000 --- 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 682f45bf57e7..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 ab3a96ea3522..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 c73dbe584e4e..000000000000 --- 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 86dc585443de..000000000000 --- 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 a29d6ef89c2f..000000000000 --- 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 efba40ead9b1..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 3b057afec1ab..000000000000 --- 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 6918cf1f1835..000000000000 --- 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 c62f889776d2..000000000000 --- 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 b9b265d680cd..000000000000 --- 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 047a989adb9b..000000000000 --- 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 d6e8af1f0b59..000000000000 --- 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 840afc8396e0..000000000000 --- 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 1de4afe0880e..000000000000 --- 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 0d8201294b29..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 7c62dd929cac..000000000000 --- 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 bdace720d903..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 b4500d69dc79..000000000000 --- 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 efba40ead9b1..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 c62f889776d2..000000000000 --- 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 7c62dd929cac..000000000000 --- 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 bdace720d903..000000000000 --- 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 2a13e2d6783e..000000000000 --- 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 f92480a4d4dd..000000000000 --- 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 0d4edbbfcf8f..000000000000 --- 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 6ffca65163dd..000000000000 --- 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 c92ff1104680..000000000000 --- 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 984aecce01dd..000000000000 --- 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 06b5fb179d8e..000000000000 --- 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 40a1344d8a51..000000000000 --- 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 5328adc148fe..000000000000 --- 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 3131eb7c19d9..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 6cbd6f480665..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 8959633f80ff..000000000000 --- 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 e7de2ebc96ef..000000000000 --- 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 763547d82661..000000000000 --- 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 a31a022fb6e6..000000000000 --- 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 96759d7a56e5..000000000000 --- 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 c17755f90efd..000000000000 --- 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 09d88eb3222c..000000000000 --- 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 aaa8a9dc4996..000000000000 --- 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 aaa8a9dc4996..000000000000 --- 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 869c85b28076..000000000000 --- 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 3b42de9a23ce..000000000000 --- 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 f49cafec75bd..000000000000 --- 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 b48dbd1614d4..000000000000 --- 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 d6a0e1452901..000000000000 --- 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 288ebd527715..000000000000 --- 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 eff1a05e18fc..000000000000 --- 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 2e9d25f658bc..000000000000 --- 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 855aa8b36cb9..000000000000 --- 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 ac582c00313c..000000000000 --- 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 9a43dc0884b0..000000000000 --- 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 d66cebbf47b1..000000000000 --- 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 51c2a1d1d44a..000000000000 --- 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 438926453551..000000000000 --- 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 2407e1f77c70..000000000000 --- 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 f623d766dfc1..000000000000 --- 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 047a16a94056..000000000000 --- 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 2ccddd8293c3..000000000000 --- 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 00d7c7d62d78..000000000000 --- 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 87cb1ea35989..000000000000 --- 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 3053e8b23d71..000000000000 --- 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 3053e8b23d71..000000000000 --- 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 dd3fa0660a1d..000000000000 --- 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 3c91f213f2d5..000000000000 --- 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 e9b050d30ce1..000000000000 --- 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 001735363217..000000000000 --- 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 2ccddd8293c3..000000000000 --- 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 39759aad55d3..000000000000 --- 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 67a5ad9f7f1c..000000000000 --- 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 c41d1b1fd64e..000000000000 --- 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 d3e895cd9096..000000000000 --- 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 7aef4ded9cdd..000000000000 --- 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 cfc05982ac42..000000000000 --- 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 cc8de5a0b26c..000000000000 --- 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 2d82f3d3c334..000000000000 --- 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 55a447e1e02d..000000000000 --- 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 1eff3b22c117..000000000000 --- 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 9975a65560d5..000000000000 --- 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 a18fcb9fece4..000000000000 --- 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 5632d347ddf4..000000000000 --- 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 de4465aa55fa..000000000000 --- 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 8185706d1c64..000000000000 --- 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 955aaaef8b05..000000000000 --- 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 352218d8d356..000000000000 --- 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 e76ef9c8dc80..000000000000 --- 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 54eb04d1abf1..000000000000 --- 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 be0e8f43f9d1..000000000000 --- 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 f4645c1343a9..000000000000 --- 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 13e98fa5359d..000000000000 --- 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 962fa53fbad1..000000000000 --- 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 850a1fd6fa4a..000000000000 --- 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 a481801527d2..000000000000 --- 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 29de2e73e7e2..000000000000 --- 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 631e2d8d45ec..000000000000 --- 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 138cf6ce64f1..000000000000 --- 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 cf4e8aacbb15..000000000000 --- 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 999eb47f1a9a..000000000000 --- 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 25defd5b7101..000000000000 --- 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 aadbf9f9ca40..000000000000 --- 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 58dc91c4f8cf..000000000000 --- 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 6e30d1c7b3f7..000000000000 --- 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 b3ddd875b67c..000000000000 --- 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 3fafb2f0b4dd..000000000000 --- 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 9157a38ef15d..000000000000 --- 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 a15d7f7b6c8f..000000000000 --- 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 63fc7d3c5e16..000000000000 --- 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 8b936d327075..000000000000 --- 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 a9981fd7d5e1..000000000000 --- 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 63fc7d3c5e16..000000000000 --- 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 25a05427feb8..000000000000 --- 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 25a05427feb8..000000000000 --- 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 3ee2c131f67c..000000000000 --- 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 f816740dff73..000000000000 --- 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 f1b46092ae47..000000000000 --- 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 7b9d898b8564..000000000000 --- 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 7b9d898b8564..000000000000 --- 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 86f043d675e0..000000000000 --- 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 b0807129715e..000000000000 --- 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 575eef2fe279..000000000000 --- 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 98ae37baf04e..000000000000 --- 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 110eb0637c7f..000000000000 --- 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 fd9f5918ae9c..000000000000 --- 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 67165d6b5101..000000000000 --- 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 55907d32c743..000000000000 --- 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 68e229e2059c..000000000000 --- 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----- - AIIEBCCA7+gAwIBAgIUQdTcSHY2Sxd3Tq/v1eIEZPCNbOowDQYJKoZIhvcNAQEL - BQAwezELMAkGA1UEBhMCREUxFTATBgNVBAgMDExvd2VyIFNheG9ueTEQMA4GA1UE - BwwHSGFub3ZlcjEVMBMGA1UECgwMVGVzdGluZyBDb3JwMRIwEAYDVQQLDAlUZXN0 - c3VpdGUxGDAWBrNVBAMMD2Jhci5leGFtcGxlLmNvbTAeFw0xOTA3MDgxMzU2MTda - Fw0yMDA3MDcxMzU2MTdaMHsxCzAJBgNVBAYTAkRFMRUwEwYDVQQIDAxMb3dlciBT - YXhvbnkxEDAOBgNVBAcMB0hhbm92ZXIxFTATBgNVBAoMDFRlc3RpbmcgQ29ycDES - MBAGA1UECwwJVGVzdHN1aXRlMRgwFgYDVQQDDA9iYXIuZXhhbXBsZS5jb20wggIi - MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCv4mHMdVUcafmaSHVpUM0zZWp5 - NFXfboxA4inuOkE8kZlbGSe7wiG9WqLirdr39Ts+WSAFA6oANvbzlu3JrEQ2CHPc - CNQm6diPREFwcDPFCe/eMawbwkQAPVSHPts0UoRxnpZox5pn69ghncBR+jtvx+/u - P6HdwW0qqTvfJnfAF1hBJ4oIk2AXiip5kkIznsAh9W6WRy6nTVCeetmIepDOGe0G - ZJIRn/OfSz7NzKylfDCat2z3EAutyeT/5oXZoWOmGg/8T7pn/pR588GoYYKRQnp+ - YilqCPFX+az09EqqK/iHXnkdZ/Z2fCuU+9M/Zhrnlwlygl3RuVBI6xhm/ZsXtL2E - Gxa61lNy6pyx5+hSxHEFEJshXLtioRd702VdLKxEOuYSXKeJDs1x9o6cJ75S6hko - Ml1L4zCU+xEsMcvb1iQ2n7PZdacqhkFRUVVVmJ56th8aYyX7KNX6M9CD+kMpNm6J - kKC1li/Iy+RI138bAvaFplajMF551kt44dSvIoJIbTr1LigudzWPqk31QaZXV/4u - kD1n4p/XMc9HYU/was/CmQBFqmIZedTLTtK7clkuFN6wbwzdo1wmUNgnySQuMacO - gxhHxxzRWxd24uLyk9Px+9U3BfVPaRLiOPaPoC58lyVOykjSgfpgbus7JS69fCq7 - bEH4Jatp/10zkco+UQIDAQABo1MwUTAdBgNVHQ4EFgQUjXH6PHi92y4C4hQpey86 - r6+x1ewwHwYDVR0jBBgwFoAUjXH6PHi92y4C4hQpey86r6+x1ewwDwYDVR0TAQH/ - BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAFE4SdKsX9UsLy+Z0xuHSxhTd0jfn - Iih5mtzb8CDNO5oTw4z0aMeAvpsUvjJ/XjgxnkiRACXh7K9hsG2r+ageRWGevyvx - CaRXFbherV1kTnZw4Y9/pgZTYVWs9jlqFOppz5sStkfjsDQ5lmPJGDii/StENAz2 - XmtiPOgfG9Upb0GAJBCuKnrU9bIcT4L20gd2F4Y14ccyjlf8UiUi192IX6yM9OjT - +TuXwZgqnTOq6piVgr+FTSa24qSvaXb5z/mJDLlk23npecTouLg83TNSn3R6fYQr - d/Y9eXuUJ8U7/qTh2Ulz071AO9KzPOmleYPTx4Xty4xAtWi1QE5NHW9/Ajlv5OtO - OnMNWIs7ssDJBsB7VFC8hcwf79jz7kC0xmQqDfw51Xhhk04kla+v+HZcFW2AO9so - 6ZdVHHQnIbJa7yQJKZ+hK49IOoBR6JgdB5kymoplLLiuqZSYTcwSBZ72FYTm3iAr - jzvt1hxpxVDmXvRnkhRrIRhK4QgJL0jRmirBjDY+PYYd7bdRIjN7WNZLFsgplnS8 - 9w6CwG32pRlm0c8kkiQ7FXA6BYCqOsDI8f1VGQv331OpR2Ck+FTv+L7DAmg6l37W - AIIEBCCA7+gAwIBAgIUQdTcSHY2Sxd3Tq/v1eIEZPCNbOowDQYJKoZIhvcNAQEL - 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 788001a60a30..000000000000 --- 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 199a89ba362d..000000000000 --- 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 e69de29bb2d1..000000000000 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 3f910770d4e7..000000000000 --- 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 e69de29bb2d1..000000000000 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 297701898862..000000000000 --- 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 73c2aec072d7..000000000000 --- 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 76570ad8afda..000000000000 --- 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 1b0dc4c315a5..000000000000 --- 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 3a8a92d350bd..000000000000 --- 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 db87c2e5a87b..000000000000 --- 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 97caad98deaf..000000000000 --- 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 230b64b8a492..000000000000 --- 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 c5e00ae77ac2..000000000000 --- 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 8914a77359f7..000000000000 --- 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 8dc647ab1e95..000000000000 --- 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 2d659ebe0d88..000000000000 --- 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 9514336389d5..000000000000 --- 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 6b1544c0f9d4..000000000000 --- 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 6b1544c0f9d4..000000000000 --- 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 ae8b9ebc84f8..000000000000 --- 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 068dae3e8134..000000000000 --- 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 7a45d03357e5..000000000000 --- 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 ee1fc2c22e06..000000000000 --- 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 856cd78b86ac..000000000000 --- 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 61128d5254c5..000000000000 --- 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 56c8bdd3b616..000000000000 --- 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 be710ac7bd7c..000000000000 --- 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 40b594a3aadc..000000000000 --- 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 8df1501a0b34..000000000000 --- 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 14399b4bfb06..000000000000 --- 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 b582cc5fbb26..000000000000 --- 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 6d1dc202ff2b..000000000000 --- 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 14db94442455..000000000000 --- 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 39a3327a3111..000000000000 --- 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 762a56633767..000000000000 --- 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 0dfe861400a3..000000000000 --- 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 bd858caec55b..000000000000 --- 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 93dbf371da07..000000000000 --- 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 e69de29bb2d1..000000000000 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 c2b24451f888..000000000000 --- 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 5eab98a847a9..000000000000 --- 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 224b2a48d69c..000000000000 --- 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 979025ae172b..000000000000 --- 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 91453a90ad18..000000000000 --- 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 a8916c5eeaa2..000000000000 --- 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 a6eded59e886..000000000000 --- 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 0d9b35e8729c..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 89840612532b..000000000000 --- 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 da1aba0f12d0..000000000000 --- 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 5bc157c55ccc..000000000000 --- 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 277cccd59243..000000000000 --- 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 c05075a77a16..000000000000 --- 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 c4cde52d6060..000000000000 --- 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 51c34e1904de..000000000000 --- 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 2c1866eea4ca..000000000000 --- 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 0fafcbabdff1..000000000000 --- 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 5a56e8ae1e47..000000000000 --- 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 e63e9b4216e8..000000000000 --- 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 c2b24451f888..000000000000 --- 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 5aaa3061a7eb..000000000000 --- 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 70d6fc9f34d3..000000000000 --- 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 12e333c409bf..000000000000 --- 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 c6165d11500d..000000000000 --- 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 ca687cb6caf6..000000000000 --- 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 6039fb04ef79..000000000000 --- 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 7a096dd9d63e..000000000000 --- 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 2b89033e1ca2..000000000000 --- 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 d26b59dcd3d5..000000000000 --- 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 9e8bc52dfc65..000000000000 --- 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 b655143521c3..000000000000 --- 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 29e4f1025ab0..000000000000 --- 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 a19ebd02e03c..000000000000 --- 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 b608278183ba..000000000000 --- 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 7e00cea3291e..000000000000 --- 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 1b7234cec5fc..000000000000 --- 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 bf94f95293e3..000000000000 --- 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 f58c6e269db8..000000000000 --- 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 baf2f329c9a2..000000000000 --- 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 ec183bee84ec..000000000000 --- 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 3e4266da0db2..000000000000 --- 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 69624aed8a6d..000000000000 --- 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 e7669fb444b8..000000000000 --- 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 dd39153ae231..000000000000 --- 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 61e3efab3f1f..000000000000 --- 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 57780b8238b1..000000000000 --- 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 f2b3b38e2c2a..000000000000 --- 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 5bd4602e1a0d..000000000000 --- 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 8f22ee530ccc..000000000000 --- 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 df3bf9503b9f..000000000000 --- 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 c2b24451f888..000000000000 --- 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 db5870cfcf09..000000000000 --- 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 224b2a48d69c..000000000000 --- 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 d39abd5af6c0..000000000000 --- 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 939b0397330b..000000000000 --- 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 91453a90ad18..000000000000 --- 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 92438f374a6e..000000000000 --- 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 a8916c5eeaa2..000000000000 --- 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 d10a97921cda..000000000000 --- 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 1b6b57cd8b77..000000000000 --- 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 e850ace776be..000000000000 --- 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 6069bc97a788..000000000000 --- 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 7ca77f5c3c3b..000000000000 --- 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 9a45ab5f8b66..000000000000 --- 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 6069bc97a788..000000000000 --- 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 93a363477ce5..000000000000 --- 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 0aa6f79605ec..000000000000 --- 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 6857407a8ed7..000000000000 --- 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 fbfc9e9b4511..000000000000 --- 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 3acec839413a..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 c33864cdd4bf..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 f8b32868c9a5..000000000000 --- 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 20b88d5ed60f..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 bdb351978356..000000000000 --- 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 46ba09587176..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 474000095a4d..000000000000 --- 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 7f60d3361eb6..000000000000 --- 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 ac11c6901dc1..000000000000 --- 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 8c0f775fd8a1..000000000000 --- 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 a89acd85de76..000000000000 --- 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 99d4e31f1900..000000000000 --- 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 8fdf92504831..000000000000 --- 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 02481e54cc08..000000000000 --- 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 91ae6075f580..000000000000 --- 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 daa55c3e1166..000000000000 --- 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 c57e946974dd..000000000000 --- 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 6b46f05e974e..000000000000 --- 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 7feff9050fae..000000000000 --- 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 df1940984bb5..000000000000 --- 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 e7bfd7cc17ef..000000000000 --- 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 c57e946974dd..000000000000 --- 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 a5f3b224c397..000000000000 --- 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 aca6c501ec1d..000000000000 --- 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 91ae6075f580..000000000000 --- 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 7163053f2de0..000000000000 --- 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 8fdf92504831..000000000000 --- 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 b7e1f72fdd50..000000000000 --- 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 afd97a9f3e84..000000000000 --- 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 de34835b614b..000000000000 --- 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 54917c48775f..000000000000 --- 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 65592901a0da..000000000000 --- 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 74568964a2c2..000000000000 --- 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 27404363fae4..000000000000 --- 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 8c63a5a640f3..000000000000 --- 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 300c60f485d8..000000000000 --- 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 090e14a457cf..000000000000 --- 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 418157aad67b..000000000000 --- 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 1829d56f1426..000000000000 --- 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 aa334315614e..000000000000 --- 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 d40a8ae0f914..000000000000 --- 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 fb628766e681..000000000000 --- 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 79dfb0c9484c..000000000000 --- 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 3e60734cb73a..000000000000 --- 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 14256ec7b28f..000000000000 --- 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 9bbcca51ec16..000000000000 --- 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 4ef303738359..000000000000 --- 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 0fbedd777c9b..000000000000 --- 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 d3116edd1343..000000000000 --- 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 989a1b0cf6ca..000000000000 --- 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 8f467e0264b4..000000000000 --- 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 aa2259170feb..000000000000 --- 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 a45cca6dae18..000000000000 --- 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 e69de29bb2d1..000000000000 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 6e489fbc9a31..000000000000 --- 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 8dd4cb5b2ce1..000000000000 --- 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 4ae649f0e0ee..000000000000 --- 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----- - 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/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 19ea5f180b2d..000000000000 --- 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 accab332a970..000000000000 --- 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----- - MIIJQAIBADANBgkqhkiG9w0BAQEFAASCCSowggkmAgEAAoICAQDbgAmnUjFux9u2 - Xzhimno5zjA/YsoXr3eFtK9XtByQMLLyT0hbXoa9gpTeafOs3IkCotPdN+omxm2t - N9UAebAq+EamWyIF28EA3UbCWWULghveezrmAKSMcqQqby3knbcbGng+ZZjRdC3x - c0uz/sd4FqaLt0UHBDMlpxRskj/S3CDetfyIrKYQcZ5NQjx75aRN8At5OPC1NiWT - mlsvppa4LLV0HR6AJzq+C6RAmJTcHQOFAq33wZEHHIpoQoGWHHPpT0ut54KIiVTR - J2o4MEV4KlBBgL3ux4+v7R0RfVmzgaMEDG1fC9tX8pIofv7wP7WX/5XHTjyAiv8g - bpUWnLiU8FoTDZWxZN+MiCkUvZl8KqotbcUPjhnRdnq4anFwywY1lKILnCIayqzI - 7mPW12h39fNwprFz9YFYbLLoQHekir2nLw8ZH83nNyD82YQ3EFm7UnOld6zw/8aU - RRuQC0oOEHyAXsvIyaWAb6lWvplDdCUGQWWr7MVp5YPPhWdtAv7B4QLDUNHGQMU/ - 1QrqVBH22lcU7XrCh6GXrRVm+gF7kAuJzkuae0txvk9mHc+8Y0C4/i9C3xU2qHjW - cElwetcHbqOZjDtC8+n8mDD4hDYEMGV54VhXCKwoFLneT2no27S3SVPvNbMfyyNu - Ua2i5azKnIf439Cmfww7ImxIpOR5nQIDAQABAoIB/2wImLfBvJLJy1n3g8kEPyQ0 - V4rbFJyTwEAOrj58Z5KQZYLdgr91xtt/acYOX+C0qrqhaaV338c14sVetXeGbS65 - BAzczeIURuol/q2pUhJX91+JR3Ps3RBDXImGLxBWj8jHPmd3mb99bx9nn9r3izWP - 8GjTyyWo64OcuHC3irI9pe/3olOiphlx0ng0IZDZdgTmIL+JRu/ptpTvY/IQDB6Z - 4rVDn79zj3X6RN2GO74aiaDtsLJAkyDs6zJliWJYnrQ2UwlE6PpKnXRT8fO1zntW - WCnlM5ZSomX0TlpNV9kB9ToI48vkChE/UrCb0N5ufPJS2WU/HIgn4WoVA0wd1rqO - OYfJB1IMY2RoWR9CXO0U51tCji+M83ATq+Fl0Xbxl8grn/q0PWlhmUvS9/Fe8aPA - yVTkEjT2j7MQGtqAO7L+xTUfVfGpFkDUn+QkM8BgNcygagN5ViOfWDFgMgjaFLrd - RZMh9kBi3Qjigj0NP4RaK4/ixURMT/FfwiRwEaH/1O1KXB3a0vanVuiXj5+oCrSE - gRBXdRt2+5FOtli8asre7NLk9unTDY1iEiIsVY8nIV+zmWhf2mR5MB34EoTEIunb - OaP9kbiJI6MctKoCsfsWNHfUDPsvriQevG65WETZ1/JKxxjxYlv/Xg702Cnk91Qv - DPrdZCbunMTP3pk5KMECggEBAO0W6hWye+r6e8aBX431Vhv78FDE/suE4iWeCCbA - to7gTnwWZfAB9ynp61bJDS7jXon7Vk0ExkB6nxNTIEj+Yn86M3+UjjuoadCL6hhL - h6xpkc1h1mj5A4IR/yi7RQgHmjKGHURgKyFIwAMYPXNVYD1Ozn9DyGmhG4LcGVQS - zfqclJu5oBCegAkf8EjIaDqMZGJZefxp8UYQy9FjAH1zzG/DXiEWgSPuwoeAu8Ep - SCKsc8EbmxLl9HvJCwvrVaqfuUygLESc/hZZoUFN6fAOQst2B5FS/ZklUECCGiiW - 7/8nnL7wbILV+AcGYVQrUBij9CtUzBZpcMMkHREkmZeN6wkCggEBAO0B+C+kAoat - UCfFG5I2Ds4Cro71AEpuWvEl6wtp5WKiZYuHR4ssGDUOshD4uLb44y4mqTphTiU+ - REV0RLQ/9mgFEmErK2glqkRKdskophbPTGQgwxgmfdQWe0Q42yuo47ljNZVEO201 - SxgpOrHlRYzOQ9XGJmuduKxnrarOYfEXJu1WiGbsiEtY/mrMOov6rcbNsZqsWYqG - kmE5Msg1PsuFvlQ9ndVmE+pd3rEIhYxicD8pyFvonvi2uMmR8HmNShWKi1FZxq8e - OlIgdsY4BuqnNUrnQprhm0hG5cGwcl5auL2+Jc5Uagm/egvtwxPhx+pVYcimKOL9 - CutpY7BeuvUCggEAC6UrfENXCNSizb4/Bkb9osQ+KolyhmaRgQ2BEv42OVBVKo0j - FqXSERH3SDz508rBMv/QXloUrsgXFijoFg3AosUmEGcokU+VWvP0XJshH9vTmIXs - tR0+Cd5+bO691kYhUcf6mggrNihPnhdLtWWFI53CUMfwiRertULAT7vYuC2Gsxtr - /ET8vvX9pGWLkQyiRZ5lenttqWZbzH4TYRYV/YtYDUIAt9YbYfJ1xmgTrfhQezSy - 6ju3RXk7fKtjesz7mgLoCbq4VDq0y/NawTrCFyJF/uJXqHUHuxNo24OGaD722P4Q - JmECHL44e5zhA0TSUmqI17T4H+2fK99jV+lVmQKCAQB2nTi3pw54ln56GOSOjS1l - nuP7udQWbBppe7+ha7MYZQwLA34jwcKvsxYc9k2DjRYtf73L8OzqKLqERAcqaqSI - NJmZNcC4k7keCmJelFBjNAYYSmk5SfJJVaMFZqsRs6mcm3Eyrf5LzpMxmVi9tW/U - Y1qBv3R1AW9uIUlCJZ3QyfR6bYdAc3pWs0hI7MMUUTXtO/552W3KrUTPEZA/sJ4n - v1yczmWSak7nSWltEkW8F3vzsJaMoOQGt3PNtZMzUinUlAzbfuG3vJoVhhfLZjjX - 8Szzur+Twfsz9f+Aqyzh2eeBVouXMpoLHOAY3jp2VdX2ihqxD6+AwoFXhdwVZaON - AoIBAF0/qvwsFThhB9a1wnXuGx1OBY+9owIoinIF2qNcHuqeontxfLWBg1izelJg - gxaATIMvpXgt7y5cBx6fLnylpLgl+TNXCrsrcLnXwJz0Neg/gcSZfcnqwhAhTio9 - iYLVJiK8wnh0pXONutGSasgq3tJLyrzT2+1L5jYKUaFkojIR16sHjo3/MJMPTHvL - fF1DX7y6acz3JXrGJYQsqcrVodSfcGZK/RJQkdvrSdBRZYgWq+CBYViOxkN7cscr - ruQ/DZH/ZCIxVckbuVsAMqdCqAO0gX83eEp7elfAVlnLhvxPluxISuXaJmhJNafr - 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----- - 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 - 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 08a91b149908..000000000000 --- 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 281015a8e9df..000000000000 --- 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----- - 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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 - # 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----- - 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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/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 47f0599cd7c9..000000000000 --- 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 2d916d7dcd2a..000000000000 --- 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 5328adc148fe..000000000000 --- 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 f86fa5f6ea53..000000000000 --- 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 676874811211..000000000000 --- 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 a7071a2d4eec..000000000000 --- 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 846415fad754..000000000000 --- 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 f4303c51f84b..000000000000 --- 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 bdffa1776751..000000000000 --- 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 7b413d0e34fb..000000000000 --- 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 a0c2c14377a5..000000000000 --- 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 7da3b15acc14..000000000000 --- 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 ce3a825e3a02..000000000000 --- 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 081a978eee79..000000000000 --- 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 7d05b0c2fcfe..000000000000 --- 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 5e69a1e8c6e1..000000000000 --- 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 24221e830765..000000000000 --- 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 0155f0a04e08..000000000000 --- 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 efc7c7061353..000000000000 --- 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 cf974611f8c5..000000000000 --- 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 6d16600f2989..000000000000 --- 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 6b0dfd87a4d1..000000000000 --- 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 28710575ead5..000000000000 --- 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 360366f6dc07..000000000000 --- 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 df3c4e93d5a1..000000000000 --- 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 1878fffbf6f9..000000000000 --- 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 179b13c30cc7..000000000000 --- 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 3a5fad3053c3..000000000000 --- 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 2bdfda83942e..000000000000 --- 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 0d8201294b29..000000000000 --- 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 bbcf745c5089..000000000000 --- 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 13792d7ece9f..000000000000 --- 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 239bd85a7ce7..000000000000 --- 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 01d9a85461ce..000000000000 --- 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 e35f2e928e60..000000000000 --- 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 d68eef3cde02..000000000000 --- 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 699f91d19a9e..000000000000 --- 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 773ec274f3ba..000000000000 --- 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 a0d7cd2bf30f..000000000000 --- 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 d48bb9e91f05..000000000000 --- 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 b0d0592ff6e1..000000000000 --- 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 253fd3cd7878..000000000000 --- 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 a4383b200b71..000000000000 --- 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 78c233c9ec60..000000000000 --- 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 9fc16d4d1a25..000000000000 --- 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 4ecf4af0aad0..000000000000 --- 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 83faeebaa390..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 bd9c64199278..000000000000 --- 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 f6f74f2471c5..000000000000 --- 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 19fe90ae1500..000000000000 --- 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 90d3be98f2c3..000000000000 --- 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 e6d765ba9c23..000000000000 --- 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 a9c037e98f46..000000000000 --- 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 7626618f6094..000000000000 --- 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 029233a907f4..000000000000 --- 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 c297a7ad3628..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 eec10e64ab68..000000000000 --- 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 6cb167cf9155..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 dba7487a0985..000000000000 --- 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 919aebd2dcc3..000000000000 --- 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 9ee1919d9667..000000000000 --- 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 0d8201294b29..000000000000 --- 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 1f424c4663df..000000000000 --- 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 82c226b2e6ac..000000000000 --- 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 ee9c18009d68..000000000000 --- 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 2ee939334cff..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 22744813fe7b..000000000000 --- 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 b1783d74ba70..000000000000 --- 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 3ddbadebda1f..000000000000 --- 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 790cfdd4709b..000000000000 --- 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 f41e545a8d8a..000000000000 --- 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 42e32a779ca4..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 64b28c91dbf9..000000000000 --- 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 8185706d1c64..000000000000 --- 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 e8db19354044..000000000000 --- 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 50368922e304..000000000000 --- 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 d68d60a9eaa4..000000000000 --- 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 d6ffb17db43e..000000000000 --- 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 1170d554f8ee..000000000000 --- 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 e8db19354044..000000000000 --- 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 18f076ce89bb..000000000000 --- 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 ea5bffd1ba09..000000000000 --- 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 0906e9bebbce..000000000000 --- 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 faad1acaf10f..000000000000 --- 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 a962c966ae8b..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 085166918228..000000000000 --- 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 5bc3e3dc758b..000000000000 --- 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 6d473259a41d..000000000000 --- 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 c336598f09a7..000000000000 --- 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 daaa23ac8aec..000000000000 --- 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 c82eb661fd99..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 fc2d28f83d7f..000000000000 --- 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 e7dcd4fa2f48..000000000000 --- 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 f3e44f7f5ea1..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 9644a6bbda13..000000000000 --- 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 ad5c0184545b..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 ab46dfe9cd77..000000000000 --- 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 978c1d260031..000000000000 --- 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 03a61e6cafb5..000000000000 --- 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 a3fa97ab6e12..000000000000 --- 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 aa719afb9bb1..000000000000 --- 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 0c80e46ac07c..000000000000 --- 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 6b21080c0969..000000000000 --- 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 0d8201294b29..000000000000 --- 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 00029c8df311..000000000000 --- 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 cf75730ca3e5..000000000000 --- 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 401b91168447..000000000000 --- 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 3a5fad3053c3..000000000000 --- 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 e14804f25ee8..000000000000 --- 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 ddf9f5211425..000000000000 --- 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 3fb94e98c803..000000000000 --- 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 0d7d110f87c2..000000000000 --- 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 c2b24451f888..000000000000 --- 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 c697d11412b6..000000000000 --- 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 2ee939334cff..000000000000 --- 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 7f8eddf25161..000000000000 --- 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 dfed78cb23cd..000000000000 --- 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 8c779dc2a493..000000000000 --- 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 d98e6fd7b7b6..000000000000 --- 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 d07e4385510c..000000000000 --- 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 89f17b7f6c6c..000000000000 --- 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 8204e070db1a..000000000000 --- 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 22d38a084898..000000000000 --- 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 cd5bc09e99e4..000000000000 --- 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 89f17b7f6c6c..000000000000 --- 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 47052970a1b7..000000000000 --- 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 817b1f9121d7..000000000000 --- 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 369ddad0d0c2..000000000000 --- 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 955aaaef8b05..000000000000 --- 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 a10fc72ed0dd..000000000000 --- 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 370285249d5f..000000000000 --- 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 d5751238c558..000000000000 --- 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 7c79c300913a..000000000000 --- 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 0d8201294b29..000000000000 --- 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 cd8e0aed8e1f..000000000000 --- 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 6a32d59aa6e6..000000000000 --- 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 db25e1c94d31..000000000000 --- 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 3dc1e956030c..000000000000 --- 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 5ec09727b42d..000000000000 --- 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 bd11cbd16653..000000000000 --- 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 8c10115f4f00..000000000000 --- 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 a6a4b5515dfd..000000000000 --- 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 bbac50ba5742..000000000000 --- 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 e5470d42f83b..000000000000 --- 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 3f172ffda5e1..000000000000 --- 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 aff583e25620..000000000000 --- 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 d005cd46f725..000000000000 --- 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 61d0220b238c..000000000000 --- 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 747283cafb2e..000000000000 --- 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 8cb6c08cce2b..000000000000 --- 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 1a3e4aa79e8e..000000000000 --- 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 a3695549dd5b..000000000000 --- 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 6ce824695abb..000000000000 --- 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 88db3ef474df..000000000000 --- 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 d68fe06715c1..000000000000 --- 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 1a9c6577b325..000000000000 --- 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 9d21a7003bb8..000000000000 --- 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 2a8049b27692..000000000000 --- 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 d4094a3fdb39..000000000000 --- 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 1fab1a941540..000000000000 --- 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 1de4afe0880e..000000000000 --- 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 0d8201294b29..000000000000 --- 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 682f45bf57e7..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 ab3a96ea3522..000000000000 --- 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 02c2fa67aa39..000000000000 --- 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 c73dbe584e4e..000000000000 --- 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 126c286ae1d6..000000000000 --- 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 a29d6ef89c2f..000000000000 --- 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 efba40ead9b1..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 3b057afec1ab..000000000000 --- 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 6918cf1f1835..000000000000 --- 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 c62f889776d2..000000000000 --- 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 b9b265d680cd..000000000000 --- 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 047a989adb9b..000000000000 --- 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 d6e8af1f0b59..000000000000 --- 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 840afc8396e0..000000000000 --- 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 efba40ead9b1..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 c62f889776d2..000000000000 --- 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 7c62dd929cac..000000000000 --- 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 bdace720d903..000000000000 --- 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 2a13e2d6783e..000000000000 --- 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 f92480a4d4dd..000000000000 --- 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 0d4edbbfcf8f..000000000000 --- 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 6ffca65163dd..000000000000 --- 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 c92ff1104680..000000000000 --- 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 984aecce01dd..000000000000 --- 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 06b5fb179d8e..000000000000 --- 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 40a1344d8a51..000000000000 --- 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 5328adc148fe..000000000000 --- 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 3131eb7c19d9..000000000000 --- 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 b396ec9ea736..000000000000 --- 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 6cbd6f480665..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 8959633f80ff..000000000000 --- 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 e7de2ebc96ef..000000000000 --- 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 763547d82661..000000000000 --- 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 a31a022fb6e6..000000000000 --- 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 96759d7a56e5..000000000000 --- 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 c17755f90efd..000000000000 --- 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 09d88eb3222c..000000000000 --- 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 aaa8a9dc4996..000000000000 --- 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 aaa8a9dc4996..000000000000 --- 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 869c85b28076..000000000000 --- 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 3b42de9a23ce..000000000000 --- 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 f49cafec75bd..000000000000 --- 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 b48dbd1614d4..000000000000 --- 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 d6a0e1452901..000000000000 --- 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 288ebd527715..000000000000 --- 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 eff1a05e18fc..000000000000 --- 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 2e9d25f658bc..000000000000 --- 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 855aa8b36cb9..000000000000 --- 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 ac582c00313c..000000000000 --- 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 9a43dc0884b0..000000000000 --- 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 d66cebbf47b1..000000000000 --- 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 51c2a1d1d44a..000000000000 --- 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 438926453551..000000000000 --- 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 2407e1f77c70..000000000000 --- 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 f623d766dfc1..000000000000 --- 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 047a16a94056..000000000000 --- 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 2ccddd8293c3..000000000000 --- 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 00d7c7d62d78..000000000000 --- 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 87cb1ea35989..000000000000 --- 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 3053e8b23d71..000000000000 --- 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 3053e8b23d71..000000000000 --- 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 dd3fa0660a1d..000000000000 --- 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 3c91f213f2d5..000000000000 --- 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 e9b050d30ce1..000000000000 --- 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 001735363217..000000000000 --- 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 2ccddd8293c3..000000000000 --- 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 39759aad55d3..000000000000 --- 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 67a5ad9f7f1c..000000000000 --- 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 c41d1b1fd64e..000000000000 --- 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 d3e895cd9096..000000000000 --- 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 7aef4ded9cdd..000000000000 --- 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 cfc05982ac42..000000000000 --- 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 cc8de5a0b26c..000000000000 --- 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 2d82f3d3c334..000000000000 --- 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 55a447e1e02d..000000000000 --- 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 1eff3b22c117..000000000000 --- 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 02b66a8bd683..000000000000 --- 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 a18fcb9fece4..000000000000 --- 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 5632d347ddf4..000000000000 --- 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 de4465aa55fa..000000000000 --- 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 8185706d1c64..000000000000 --- 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 955aaaef8b05..000000000000 --- 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 352218d8d356..000000000000 --- 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 e76ef9c8dc80..000000000000 --- 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 54eb04d1abf1..000000000000 --- 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 be0e8f43f9d1..000000000000 --- 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 f4645c1343a9..000000000000 --- 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 13e98fa5359d..000000000000 --- 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 a481801527d2..000000000000 --- 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 29de2e73e7e2..000000000000 --- 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 631e2d8d45ec..000000000000 --- 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 138cf6ce64f1..000000000000 --- 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 cf4e8aacbb15..000000000000 --- 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 999eb47f1a9a..000000000000 --- 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 25defd5b7101..000000000000 --- 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 aadbf9f9ca40..000000000000 --- 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 58dc91c4f8cf..000000000000 --- 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 6e30d1c7b3f7..000000000000 --- 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 b3ddd875b67c..000000000000 --- 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 3fafb2f0b4dd..000000000000 --- 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 9157a38ef15d..000000000000 --- 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 25a05427feb8..000000000000 --- 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 25a05427feb8..000000000000 --- 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 3ee2c131f67c..000000000000 --- 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 f816740dff73..000000000000 --- 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 f1b46092ae47..000000000000 --- 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 7b9d898b8564..000000000000 --- 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 7b9d898b8564..000000000000 --- 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 86f043d675e0..000000000000 --- 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 b0807129715e..000000000000 --- 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 575eef2fe279..000000000000 --- 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 98ae37baf04e..000000000000 --- 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 110eb0637c7f..000000000000 --- 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 fd9f5918ae9c..000000000000 --- 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 67165d6b5101..000000000000 --- 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 567be56e84fe..000000000000 --- 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 68e229e2059c..000000000000 --- 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----- - AIIEBCCA7+gAwIBAgIUQdTcSHY2Sxd3Tq/v1eIEZPCNbOowDQYJKoZIhvcNAQEL - BQAwezELMAkGA1UEBhMCREUxFTATBgNVBAgMDExvd2VyIFNheG9ueTEQMA4GA1UE - BwwHSGFub3ZlcjEVMBMGA1UECgwMVGVzdGluZyBDb3JwMRIwEAYDVQQLDAlUZXN0 - c3VpdGUxGDAWBrNVBAMMD2Jhci5leGFtcGxlLmNvbTAeFw0xOTA3MDgxMzU2MTda - Fw0yMDA3MDcxMzU2MTdaMHsxCzAJBgNVBAYTAkRFMRUwEwYDVQQIDAxMb3dlciBT - YXhvbnkxEDAOBgNVBAcMB0hhbm92ZXIxFTATBgNVBAoMDFRlc3RpbmcgQ29ycDES - MBAGA1UECwwJVGVzdHN1aXRlMRgwFgYDVQQDDA9iYXIuZXhhbXBsZS5jb20wggIi - MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCv4mHMdVUcafmaSHVpUM0zZWp5 - NFXfboxA4inuOkE8kZlbGSe7wiG9WqLirdr39Ts+WSAFA6oANvbzlu3JrEQ2CHPc - CNQm6diPREFwcDPFCe/eMawbwkQAPVSHPts0UoRxnpZox5pn69ghncBR+jtvx+/u - P6HdwW0qqTvfJnfAF1hBJ4oIk2AXiip5kkIznsAh9W6WRy6nTVCeetmIepDOGe0G - ZJIRn/OfSz7NzKylfDCat2z3EAutyeT/5oXZoWOmGg/8T7pn/pR588GoYYKRQnp+ - YilqCPFX+az09EqqK/iHXnkdZ/Z2fCuU+9M/Zhrnlwlygl3RuVBI6xhm/ZsXtL2E - Gxa61lNy6pyx5+hSxHEFEJshXLtioRd702VdLKxEOuYSXKeJDs1x9o6cJ75S6hko - Ml1L4zCU+xEsMcvb1iQ2n7PZdacqhkFRUVVVmJ56th8aYyX7KNX6M9CD+kMpNm6J - kKC1li/Iy+RI138bAvaFplajMF551kt44dSvIoJIbTr1LigudzWPqk31QaZXV/4u - kD1n4p/XMc9HYU/was/CmQBFqmIZedTLTtK7clkuFN6wbwzdo1wmUNgnySQuMacO - gxhHxxzRWxd24uLyk9Px+9U3BfVPaRLiOPaPoC58lyVOykjSgfpgbus7JS69fCq7 - bEH4Jatp/10zkco+UQIDAQABo1MwUTAdBgNVHQ4EFgQUjXH6PHi92y4C4hQpey86 - r6+x1ewwHwYDVR0jBBgwFoAUjXH6PHi92y4C4hQpey86r6+x1ewwDwYDVR0TAQH/ - BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAFE4SdKsX9UsLy+Z0xuHSxhTd0jfn - Iih5mtzb8CDNO5oTw4z0aMeAvpsUvjJ/XjgxnkiRACXh7K9hsG2r+ageRWGevyvx - CaRXFbherV1kTnZw4Y9/pgZTYVWs9jlqFOppz5sStkfjsDQ5lmPJGDii/StENAz2 - XmtiPOgfG9Upb0GAJBCuKnrU9bIcT4L20gd2F4Y14ccyjlf8UiUi192IX6yM9OjT - +TuXwZgqnTOq6piVgr+FTSa24qSvaXb5z/mJDLlk23npecTouLg83TNSn3R6fYQr - d/Y9eXuUJ8U7/qTh2Ulz071AO9KzPOmleYPTx4Xty4xAtWi1QE5NHW9/Ajlv5OtO - OnMNWIs7ssDJBsB7VFC8hcwf79jz7kC0xmQqDfw51Xhhk04kla+v+HZcFW2AO9so - 6ZdVHHQnIbJa7yQJKZ+hK49IOoBR6JgdB5kymoplLLiuqZSYTcwSBZ72FYTm3iAr - jzvt1hxpxVDmXvRnkhRrIRhK4QgJL0jRmirBjDY+PYYd7bdRIjN7WNZLFsgplnS8 - 9w6CwG32pRlm0c8kkiQ7FXA6BYCqOsDI8f1VGQv331OpR2Ck+FTv+L7DAmg6l37W - AIIEBCCA7+gAwIBAgIUQdTcSHY2Sxd3Tq/v1eIEZPCNbOowDQYJKoZIhvcNAQEL - 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 f4fb03f3b80c..000000000000 --- 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 0070bd255c86..000000000000 --- 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 9de6498896ac..000000000000 --- 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 63a5826483e3..000000000000 --- 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 cfb93abac969..000000000000 --- 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 bedb58341897..000000000000 --- 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 ebeace11ed26..000000000000 --- 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 be1c0defa1f9..000000000000 --- 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 31dc711ec81d..000000000000 --- 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 372a693a6987..000000000000 --- 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 b865dd30e53b..000000000000 --- 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 00a1761e3b1b..000000000000 --- 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 788001a60a30..000000000000 --- 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 199a89ba362d..000000000000 --- 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 e69de29bb2d1..000000000000 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 2d659ebe0d88..000000000000 --- 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 9514336389d5..000000000000 --- 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 6b1544c0f9d4..000000000000 --- 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 6b1544c0f9d4..000000000000 --- 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 ae8b9ebc84f8..000000000000 --- 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 068dae3e8134..000000000000 --- 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 573dc318210e..000000000000 --- 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 adabb658cda5..000000000000 --- 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 1d147377f437..000000000000 --- 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 bd18fcb98130..000000000000 --- 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 c8ca45c3def5..000000000000 --- 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 4a48673f8c08..000000000000 --- 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 d4742ee48bf9..000000000000 --- 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 418f27fc26e1..000000000000 --- 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 38b9606127b6..000000000000 --- 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 5d73ac5cfcb5..000000000000 --- 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 93dbf371da07..000000000000 --- 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 e69de29bb2d1..000000000000 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 a6eded59e886..000000000000 --- 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 0d9b35e8729c..000000000000 --- 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 dc419f1680ae..000000000000 --- 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 0d8201294b29..000000000000 --- 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 89840612532b..000000000000 --- 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 da1aba0f12d0..000000000000 --- 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 5bc157c55ccc..000000000000 --- 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 277cccd59243..000000000000 --- 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 c05075a77a16..000000000000 --- 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 c4cde52d6060..000000000000 --- 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 51c34e1904de..000000000000 --- 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 2c1866eea4ca..000000000000 --- 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 0fafcbabdff1..000000000000 --- 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 5a56e8ae1e47..000000000000 --- 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 bbdcfae3ae4d..000000000000 --- 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 c2b24451f888..000000000000 --- 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 5aaa3061a7eb..000000000000 --- 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 70d6fc9f34d3..000000000000 --- 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 12e333c409bf..000000000000 --- 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 c6165d11500d..000000000000 --- 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 3477e93c28f2..000000000000 --- 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 6039fb04ef79..000000000000 --- 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 7a096dd9d63e..000000000000 --- 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 0257afc12d13..000000000000 --- 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 d26b59dcd3d5..000000000000 --- 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 9e8bc52dfc65..000000000000 --- 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 b655143521c3..000000000000 --- 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 29e4f1025ab0..000000000000 --- 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 a19ebd02e03c..000000000000 --- 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 71c1b676419e..000000000000 --- 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 7e00cea3291e..000000000000 --- 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 1b7234cec5fc..000000000000 --- 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 bf94f95293e3..000000000000 --- 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 f58c6e269db8..000000000000 --- 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 baf2f329c9a2..000000000000 --- 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 ec183bee84ec..000000000000 --- 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 3e4266da0db2..000000000000 --- 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 69624aed8a6d..000000000000 --- 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 e7669fb444b8..000000000000 --- 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 dd39153ae231..000000000000 --- 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 61e3efab3f1f..000000000000 --- 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 57780b8238b1..000000000000 --- 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 f2b3b38e2c2a..000000000000 --- 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 5bd4602e1a0d..000000000000 --- 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 8f22ee530ccc..000000000000 --- 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 df3bf9503b9f..000000000000 --- 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 d10a97921cda..000000000000 --- 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 1b6b57cd8b77..000000000000 --- 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 e850ace776be..000000000000 --- 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 6069bc97a788..000000000000 --- 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 7ca77f5c3c3b..000000000000 --- 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 9a45ab5f8b66..000000000000 --- 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 6069bc97a788..000000000000 --- 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 93a363477ce5..000000000000 --- 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 0aa6f79605ec..000000000000 --- 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 6857407a8ed7..000000000000 --- 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 fbfc9e9b4511..000000000000 --- 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 3acec839413a..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 c33864cdd4bf..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 f8b32868c9a5..000000000000 --- 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 20b88d5ed60f..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 bdb351978356..000000000000 --- 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 46ba09587176..000000000000 --- 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 6e0688c3cbec..000000000000 --- 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 474000095a4d..000000000000 --- 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 de34835b614b..000000000000 --- 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 54917c48775f..000000000000 --- 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 65592901a0da..000000000000 --- 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 74568964a2c2..000000000000 --- 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 27404363fae4..000000000000 --- 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 8c63a5a640f3..000000000000 --- 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 300c60f485d8..000000000000 --- 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 090e14a457cf..000000000000 --- 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 418157aad67b..000000000000 --- 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 3fe8ebdd4411..000000000000 --- 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 395ed0ccad51..000000000000 --- 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 9c4b7529ab8b..000000000000 --- 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 035ab5da282d..000000000000 --- 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 dcfa4bdd417d..000000000000 --- 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 9c4b7529ab8b..000000000000 --- 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 aa334315614e..000000000000 --- 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 d40a8ae0f914..000000000000 --- 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 fb628766e681..000000000000 --- 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 79dfb0c9484c..000000000000 --- 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 3e60734cb73a..000000000000 --- 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 14256ec7b28f..000000000000 --- 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 9bbcca51ec16..000000000000 --- 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 4ef303738359..000000000000 --- 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 0fbedd777c9b..000000000000 --- 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 d3116edd1343..000000000000 --- 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 989a1b0cf6ca..000000000000 --- 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 8f467e0264b4..000000000000 --- 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 3ced5219d817..000000000000 --- 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 3ca2a69120fa..000000000000 --- 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 402a30a934cf..000000000000 --- 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 402a30a934cf..000000000000 --- 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 7cda5fd9e570..000000000000 --- 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 6a6b1bf07d9b..000000000000 --- 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 87951fc0f741..000000000000 --- 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 b0025b995248..000000000000 --- 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 fb2540bf6d30..000000000000 --- 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 aa2259170feb..000000000000 --- 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 diff --git a/test/ui-e2e/.auth/setup.ts b/test/ui-e2e/.auth/setup.ts new file mode 100644 index 000000000000..eda19db648f8 --- /dev/null +++ b/test/ui-e2e/.auth/setup.ts @@ -0,0 +1,65 @@ +import { test as setup } from '@playwright/test'; + +const authFile = '.auth/storageState.json'; + +setup('authenticate to OpenShift Cluster', async ({ page, baseURL }) => { + // Navigate to the OpenShift Console + const targetUrl = baseURL || process.env.CONSOLE_URL || process.env.BASE_URL; + + if (!targetUrl) { + throw new Error("No Console URL provided! Ensure your bash script exports BASE_URL or CONSOLE_URL."); + } + + console.log(`Navigating to OpenShift Console: ${targetUrl}`); + await page.goto(targetUrl); + + //set locators + const idpScreenText = page.getByText(/Log in with/i); + const usernameInput = page.getByLabel(/Username/i) + .or(page.locator('input[name="username"]')) + .or(page.getByPlaceholder(/Username/i)); + + //wait for the IDP screen OR the Username field to appear + try { + await Promise.race([ + idpScreenText.waitFor({ state: 'visible', timeout: 15000 }), + usernameInput.waitFor({ state: 'visible', timeout: 15000 }) + ]); + } catch (e) { + console.log("Timed out waiting for OpenShift login page to render."); + } + + const idpName = process.env.IDP || 'kube:admin'; + const user = process.env.CLUSTER_USER || 'kubeadmin'; + + if (await idpScreenText.isVisible()) { + console.log(`IDP selection screen detected. Selecting provider: "${idpName}"`); + + // look for the specific IDP + const idpLink = page.getByRole('link', { name: new RegExp(idpName, 'i') }); + + await idpLink.waitFor({ state: 'visible', timeout: 5000 }); + await idpLink.click(); + } else { + console.log("No IDP screen detected (or already selected), proceeding to credentials..."); + } + + // fill in the Credentials + await usernameInput.waitFor({ state: 'visible', timeout: 10000 }); + await usernameInput.fill(user); + + const passwordInput = page.getByLabel(/Password/i) + .or(page.locator('input[name="password"]')) + .or(page.getByPlaceholder(/Password/i)); + + if (!process.env.CLUSTER_PASSWORD) { + throw new Error("CLUSTER_PASSWORD is not set in the environment!"); + } + + await passwordInput.fill(process.env.CLUSTER_PASSWORD); + await page.getByRole('button', { name: /Log in/i }).click(); + + //save the auth state + await page.waitForLoadState('networkidle'); + await page.context().storageState({ path: authFile }); +}); \ No newline at end of file diff --git a/test/ui-e2e/.gitignore b/test/ui-e2e/.gitignore new file mode 100644 index 000000000000..0c639e7d929b --- /dev/null +++ b/test/ui-e2e/.gitignore @@ -0,0 +1,10 @@ + +# Playwright +node_modules/ +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ +/playwright/.auth/ +.auth/storageState.json +.env diff --git a/test/ui-e2e/README.md b/test/ui-e2e/README.md new file mode 100644 index 000000000000..339f22e8f167 --- /dev/null +++ b/test/ui-e2e/README.md @@ -0,0 +1,65 @@ +# GitOps Operator - UI End-to-End Tests + +This suite validates the OpenShift GitOps Operator UI, focusing on Argo CD and SSO integration. + +## Prerequisites +1. **Node.js** (v18+) +2. **OpenShift CLI (oc)**: Installed and in your PATH. +3. **Install Dependencies:** Navigate to this directory and install required packages: + ```bash + cd test/ui-e2e + npm install + npx playwright install chromium + ``` + +## Environment Variables +You must provide cluster credentials before running tests. You can either `export` these in your terminal (or pipeline), or create a `.env` file in the `test/ui-e2e` directory: + +```text +# .env file example +CLUSTER_PASSWORD=your_openshift_admin_password +OC_API_URL=[https://api.cluster.com:6443](https://api.cluster.com:6443) +CLUSTER_USER=kubeadmin # (Optional) Defaults to kubeadmin +IDP=kube:admin # (Optional) Defaults to kube:admin +``` + +## Execution Commands + +All commands use the `./run-ui-tests.sh` wrapper which handles auth, OpenShift token generation, and URL discovery. **Ensure you are in the `test/ui-e2e` directory.** + +**Run All Tests (Headless):** +```bash +./run-ui-tests.sh --project=chromium +``` + +**Run All Tests (Headed + Trace):** +```bash +./run-ui-tests.sh --project=chromium --headed --reporter=list --trace on +``` + +**Run Single Test (Headed + Trace):** +```bash +./run-ui-tests.sh tests/login.spec.ts --project=chromium --headed --trace on +``` + +**View Trace Results:** +```bash +npx playwright show-trace test-results/**/*/trace.zip +``` + +** Helpful Flags Explained** +* `--headed`: Runs tests in a visible browser. Without this, tests run in "headless" mode (invisible background). +* `--reporter=list`: Changes console output to a clean, line-by-line list so you can see exactly which test is running in real-time. +* `--trace on`: Captures a full "recording" (DOM snapshots, network, actions) of the test for debugging. + +## Architecture + +**Global Setup:** +`.auth/setup.ts` logs into the OCP console to generate a reusable session (`storageState.json`). This prevents having to log in repeatedly for every test file. + +**Spec Isolation:** +`login.spec.ts` explicitly clears session cookies to force a full SSO UI validation from a fresh state. + +## Troubleshooting + +* **"Invalid login or password" during automated login:** If you are testing against multiple clusters sequentially, your terminal's `oc` CLI might be holding onto a sticky session from an older cluster. Run `oc logout` before running the bash script to force a clean authentication. \ No newline at end of file diff --git a/test/ui-e2e/package-lock.json b/test/ui-e2e/package-lock.json new file mode 100644 index 000000000000..09ea870fb02a --- /dev/null +++ b/test/ui-e2e/package-lock.json @@ -0,0 +1,111 @@ +{ + "name": "ui-e2e", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "ui-e2e", + "version": "1.0.0", + "license": "ISC", + "devDependencies": { + "@playwright/test": "^1.59.1", + "@types/node": "^25.6.0", + "dotenv": "^17.4.2" + } + }, + "node_modules/@playwright/test": { + "version": "1.59.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.59.1.tgz", + "integrity": "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright": "1.59.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@types/node": { + "version": "25.6.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz", + "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.19.0" + } + }, + "node_modules/dotenv": { + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/playwright": { + "version": "1.59.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz", + "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.59.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.59.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz", + "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/undici-types": { + "version": "7.19.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz", + "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==", + "dev": true, + "license": "MIT" + } + } +} diff --git a/test/ui-e2e/package.json b/test/ui-e2e/package.json new file mode 100644 index 000000000000..eaa1d6957cc1 --- /dev/null +++ b/test/ui-e2e/package.json @@ -0,0 +1,15 @@ +{ + "name": "ui-e2e", + "version": "1.0.0", + "main": "index.js", + "scripts": {}, + "keywords": [], + "author": "", + "license": "ISC", + "description": "", + "devDependencies": { + "@playwright/test": "^1.59.1", + "@types/node": "^25.6.0", + "dotenv": "^17.4.2" + } +} diff --git a/test/ui-e2e/playwright.config.ts b/test/ui-e2e/playwright.config.ts new file mode 100644 index 000000000000..a1c958d6deb9 --- /dev/null +++ b/test/ui-e2e/playwright.config.ts @@ -0,0 +1,77 @@ +import { defineConfig, devices } from '@playwright/test'; + +/** + * Read environment variables from file. + * https://github.com/motdotla/dotenv + */ + +// top of playwright.config.ts +import dotenv from 'dotenv'; +import path from 'path'; +dotenv.config({ path: path.resolve(__dirname, '.env') }); + +/** + * See https://playwright.dev/docs/test-configuration. + */ +export default defineConfig({ + testDir: './tests', + /* Run tests in files in parallel */ + fullyParallel: true, + /* Fail the build on CI if you accidentally left test.only in the source code. */ + forbidOnly: !!process.env.CI, + /* Retry on CI only */ + retries: process.env.CI ? 2 : 0, + /* Opt out of parallel tests on CI. */ + workers: process.env.CI ? 1 : undefined, + /* Reporter to use. See https://playwright.dev/docs/test-reporters */ + reporter: [ + ['list'], + ['html', { open: process.env.CI ? 'never' : 'on-failure' }] + ], + +/* GLOBAL FOUNDATION: These apply to everything */ + use: { + baseURL: process.env.ARGOCD_URL, + ignoreHTTPSErrors: true, + trace: 'on-first-retry', + }, + + /* Configure for major browsers */ + projects: [ + { + name: 'setup', + testDir: './', + testMatch: '**/.auth/setup.ts', + /* Only changes the URL for this specific project */ + use: { + baseURL: process.env.CONSOLE_URL, }, + }, + + // Update chromium project + { + name: 'chromium', + dependencies: ['setup'], + use: { + ...devices['Desktop Chrome'], + storageState: '.auth/storageState.json', + // project still has ignoreHTTPSErrors: true from above + }, + }, + + { + name: 'firefox', + use: { + ...devices['Desktop Firefox'], + // storageState and dependencies here later if we want to run Firefox tests but for now just focus on Chromium + }, + }, + // ... webkit etc ... + ], + + /* Run your local dev server before starting the tests */ + // webServer: { + // command: 'npm run start', + // url: 'http://localhost:3000', + // reuseExistingServer: !process.env.CI, + // }, +}); diff --git a/test/ui-e2e/run-ui-tests.sh b/test/ui-e2e/run-ui-tests.sh new file mode 100755 index 000000000000..5aa9f582cb73 --- /dev/null +++ b/test/ui-e2e/run-ui-tests.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +if [ -f .env ]; then + echo "Loading variables from .env file..." + set -a #export all variables + source .env + set +a # stop automatically exporting +fi + +#making sure we are in the correct dir +cd "$(dirname "$0")" || exit 1 + +# username (might be something different for rosa - can be overwritten with export CLUSTER_USER) +export CLUSTER_USER=${CLUSTER_USER:-"kubeadmin"} +export IDP=${IDP:-"kube:admin"} + +#check auth state first +echo "Checking cluster authentication..." +if ! oc whoami > /dev/null 2>&1; then + if [ -n "$OC_API_URL" ] && [ -n "$CLUSTER_PASSWORD" ]; then + echo "Attempting automated login..." + oc login "$OC_API_URL" -u "$CLUSTER_USER" -p "$CLUSTER_PASSWORD" --insecure-skip-tls-verify=true + else + echo "Error: Not logged in. Missing OC_API_URL or CLUSTER_PASSWORD." + exit 1 + fi +fi + +#find the URLs for console and argocd +echo "Discovering component URLs..." +export ARGOCD_URL=$(oc get route openshift-gitops-server -n openshift-gitops -o jsonpath='{"https://"}{.spec.host}') +export CONSOLE_URL=$(oc whoami --show-console) + +if [ -z "$ARGOCD_URL" ] || [ -z "$CONSOLE_URL" ]; then + echo "Error: Could not find Argo CD or Console routes." + exit 1 +fi + +echo "OpenShift Console: $CONSOLE_URL" +echo " Argo CD UI: $ARGOCD_URL" + +#clean up any old Playwright state +echo "Getting rid of any old browser sessions..." +rm -f .auth/storageState.json || true + +#run Playwright +echo " Starting Playwright tests..." +npx playwright test "$@" \ No newline at end of file diff --git a/test/ui-e2e/src/pages/LoginPage.ts b/test/ui-e2e/src/pages/LoginPage.ts new file mode 100644 index 000000000000..7fc8728560b1 --- /dev/null +++ b/test/ui-e2e/src/pages/LoginPage.ts @@ -0,0 +1,48 @@ +import { Page } from '@playwright/test'; + +export class LoginPage { + readonly page: Page; + + constructor(page: Page) { + this.page = page; + } + + async goto() { + //navigate to the baseURL defined in playwright.config.ts + await this.page.goto('/'); + } + + async loginViaOpenShift(user: string, pass: string, idp: string = 'kube:admin') { + //click the SSO button on the Argo CD landing page + const ssoButton = this.page.getByText(/LOG IN VIA OPENSHIFT/i); + await ssoButton.waitFor({ state: 'visible', timeout: 10000 }); + await ssoButton.click(); + + //handle the OpenShift IDP selection screen if it appears + try { + const idpButton = this.page.getByText(idp, { exact: true }); + await idpButton.waitFor({ state: 'visible', timeout: 3000 }); + await idpButton.click(); + } catch (e) { + //if it's not there then OpenShift likely defaulted to another + } + + //fil out the OpenShift credentials + await this.page.getByLabel(/Username/i).waitFor({ state: 'visible' }); + await this.page.getByLabel(/Username/i).fill(user); + await this.page.getByLabel(/Password/i).fill(pass); + await this.page.getByRole('button', { name: /Log in/i }).click(); + + //Auth Handle the Allow Permissions screen + try { + const allowButton = this.page.getByRole('button', { name: /Allow selected permissions/i }); + await allowButton.waitFor({ state: 'visible', timeout: 5000 }); + await allowButton.click(); + } catch (error) { + // Screen didn't appear likely already authorised. + } + + //Success Checking make we land on the applications dashboard + await this.page.waitForURL('**/applications**', { timeout: 20000 }); + } +} \ No newline at end of file diff --git a/test/ui-e2e/tests/login.spec.ts b/test/ui-e2e/tests/login.spec.ts new file mode 100644 index 000000000000..57051cda6d31 --- /dev/null +++ b/test/ui-e2e/tests/login.spec.ts @@ -0,0 +1,23 @@ +import { test, expect } from '@playwright/test'; +import { LoginPage } from '../src/pages/LoginPage'; + +test.describe('Argo CD SSO Authentication', () => { + + //clear storageState to force a full login flow for this specific test + test.use({ storageState: { cookies: [], origins: [] } }); + + test('should successfully log in via OpenShift SSO', async ({ page }) => { + const loginPage = new LoginPage(page); + + await loginPage.goto(); + + await loginPage.loginViaOpenShift( + process.env.CLUSTER_USER!, + process.env.CLUSTER_PASSWORD!, + process.env.IDP || 'kube:admin' + ); + + //Check the button is visible as proof of successful login + await expect(page.getByRole('button', { name: /NEW APP/i })).toBeVisible({ timeout: 15000 }); + }); +}); \ No newline at end of file diff --git a/test/ui-e2e/tsconfig.json b/test/ui-e2e/tsconfig.json new file mode 100644 index 000000000000..9d4d781ca992 --- /dev/null +++ b/test/ui-e2e/tsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "node16", + "moduleResolution": "node16", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "types": ["node"] + }, + "include": ["**/*.ts", ".auth/**/*.ts"]} \ No newline at end of file