test: deduplicate test manifests and fix "stress" profile (#14001)

Signed-off-by: Mason Malone <[email protected]>
argoproj · Dec 31, 2024 · 81993b5 · 81993b5
1 parent 2e0f2f7
commit 81993b5
Show file tree

Hide file tree

Showing 21 changed files with 50 additions and 106 deletions.
diff --git a/Makefile b/Makefile
@@ -484,10 +484,6 @@ install: githooks
 ifeq ($(PROFILE),stress)
 	kubectl -n $(KUBE_NAMESPACE) apply -f test/stress/massive-workflow.yaml
 endif
-ifeq ($(RUN_MODE),kubernetes)
-	kubectl -n $(KUBE_NAMESPACE) scale deploy/workflow-controller --replicas 1
-	kubectl -n $(KUBE_NAMESPACE) scale deploy/argo-server --replicas 1
-endif
 ifeq ($(UI_SECURE)$(PROFILE),truesso)
 	KUBE_NAMESPACE=$(KUBE_NAMESPACE) ./hack/update-sso-redirect-url.sh
 endif

diff --git a/...ifests/mixins/argo-server-deployment.yaml → ...mponents/base/argo-server-deployment.yaml b/...ifests/mixins/argo-server-deployment.yaml → ...mponents/base/argo-server-deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: argo-server
 spec:
-  replicas: 0
   template:
     spec:
       containers:

diff --git a/...-server.service-account-token-secret.yaml → ...-server.service-account-token-secret.yaml b/...-server.service-account-token-secret.yaml → ...-server.service-account-token-secret.yaml
diff --git a/test/e2e/manifests/components/base/kustomization.yaml b/test/e2e/manifests/components/base/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+- argo-server.service-account-token-secret.yaml
+
+patches:
+- path: argo-server-deployment.yaml
+- path: workflow-controller-configmap.yaml
+- path: workflow-controller-deployment.yaml
+- path: workflow-controller-cluster-workflow-template-rbac.yaml
+- path: minio-deployment.yaml
+
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/part-of: argo
diff --git a/...2e/manifests/mixins/minio-deployment.yaml → ...sts/components/base/minio-deployment.yaml b/...2e/manifests/mixins/minio-deployment.yaml → ...sts/components/base/minio-deployment.yaml
diff --git a/...oller-cluster-workflow-template-rbac.yaml → ...oller-cluster-workflow-template-rbac.yaml b/...oller-cluster-workflow-template-rbac.yaml → ...oller-cluster-workflow-template-rbac.yaml
diff --git a/...mixins/workflow-controller-configmap.yaml → ...s/base/workflow-controller-configmap.yaml b/...mixins/workflow-controller-configmap.yaml → ...s/base/workflow-controller-configmap.yaml
diff --git a/...ixins/workflow-controller-deployment.yaml → .../base/workflow-controller-deployment.yaml b/...ixins/workflow-controller-deployment.yaml → .../base/workflow-controller-deployment.yaml
@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: workflow-controller
 spec:
-  replicas: 0
   template:
     spec:
       containers:

diff --git a/test/e2e/manifests/components/local-argo/kustomization.yaml b/test/e2e/manifests/components/local-argo/kustomization.yaml
@@ -0,0 +1,9 @@
+# Component to scale down the deployments for the workflow controller and argo server,
+# for use with profiles where argo is run locally to avoid conflicts.
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+replicas:
+  - name: argo-server
+    count: 0
+  - name: workflow-controller
+    count: 0
diff --git a/test/e2e/manifests/events/kustomization.yaml b/test/e2e/manifests/events/kustomization.yaml
@@ -6,16 +6,8 @@ resources:
 - https://raw.githubusercontent.com/argoproj/argo-events/v1.2.0/manifests/install.yaml
 - https://raw.githubusercontent.com/argoproj/argo-events/v1.2.0/examples/eventbus/native.yaml
 
-patches:
-- path: ../mixins/argo-server-deployment.yaml
-- path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-- path: ../mixins/workflow-controller-configmap.yaml
-- path: ../mixins/workflow-controller-deployment.yaml
-- path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-- path: ../mixins/minio-deployment.yaml
+components:
+- ../components/base
+- ../components/local-argo
 
-labels:
-- includeSelectors: true
-  pairs:
-    app.kubernetes.io/part-of: argo
-namespace: argo
+namespace: argo
diff --git a/...argo-workflows-agent-ca-certificates.yaml → ...argo-workflows-agent-ca-certificates.yaml b/...argo-workflows-agent-ca-certificates.yaml → ...argo-workflows-agent-ca-certificates.yaml
diff --git a/...ns/argo.service-account-token-secret.yaml → ...al/argo.service-account-token-secret.yaml b/...ns/argo.service-account-token-secret.yaml → ...al/argo.service-account-token-secret.yaml
diff --git a/test/e2e/manifests/mixins/get-cm-rbac.yaml → test/e2e/manifests/minimal/get-cm-rbac.yaml b/test/e2e/manifests/mixins/get-cm-rbac.yaml → test/e2e/manifests/minimal/get-cm-rbac.yaml
diff --git a/test/e2e/manifests/minimal/kustomization.yaml b/test/e2e/manifests/minimal/kustomization.yaml
@@ -6,21 +6,12 @@ resources:
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventbus.yaml
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventsources.yaml
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_sensors.yaml
-- ../mixins/argo-workflows-agent-ca-certificates.yaml
-- ../mixins/argo-server.service-account-token-secret.yaml
-- ../mixins/argo.service-account-token-secret.yaml
-- ../mixins/get-cm-rbac.yaml
+- argo-workflows-agent-ca-certificates.yaml
+- argo.service-account-token-secret.yaml
+- get-cm-rbac.yaml
 
-patches:
-- path: ../mixins/argo-server-deployment.yaml
-- path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-- path: ../mixins/workflow-controller-configmap.yaml
-- path: ../mixins/workflow-controller-deployment.yaml
-- path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-- path: ../mixins/minio-deployment.yaml
+components:
+- ../components/base
+- ../components/local-argo
 
-labels:
-- includeSelectors: true
-  pairs:
-    app.kubernetes.io/part-of: argo
-namespace: argo
+namespace: argo
diff --git a/test/e2e/manifests/mixins/argo-server-cluster-workflow-template-rbac.yaml b/test/e2e/manifests/mixins/argo-server-cluster-workflow-template-rbac.yaml
diff --git a/test/e2e/manifests/mysql/kustomization.yaml b/test/e2e/manifests/mysql/kustomization.yaml
@@ -6,18 +6,9 @@ resources:
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventbus.yaml
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventsources.yaml
 - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_sensors.yaml
-- ../mixins/argo-server.service-account-token-secret.yaml
 
-patches:
-- path: ../mixins/argo-server-deployment.yaml
-- path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-- path: ../mixins/workflow-controller-configmap.yaml
-- path: ../mixins/workflow-controller-deployment.yaml
-- path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-- path: ../mixins/minio-deployment.yaml
+components:
+- ../components/base
+- ../components/local-argo
 
-labels:
-- includeSelectors: true
-  pairs:
-    app.kubernetes.io/part-of: argo
 namespace: argo
diff --git a/test/e2e/manifests/postgres/kustomization.yaml b/test/e2e/manifests/postgres/kustomization.yaml
@@ -6,18 +6,9 @@ resources:
   - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventbus.yaml
   - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_eventsources.yaml
   - https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/base/crds/argoproj.io_sensors.yaml
-  - ../mixins/argo-server.service-account-token-secret.yaml
 
-patches:
-  - path: ../mixins/argo-server-deployment.yaml
-  - path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-  - path: ../mixins/workflow-controller-configmap.yaml
-  - path: ../mixins/workflow-controller-deployment.yaml
-  - path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-  - path: ../mixins/minio-deployment.yaml
+components:
+- ../components/base
+- ../components/local-argo
 
-labels:
-  - includeSelectors: true
-    pairs:
-      app.kubernetes.io/part-of: argo
-namespace: argo
+namespace: argo
diff --git a/test/e2e/manifests/prometheus/kustomization.yaml b/test/e2e/manifests/prometheus/kustomization.yaml
@@ -5,15 +5,5 @@ resources:
   - ../../../../manifests/quick-start/minimal
   - ../../../../manifests/quick-start/base/prometheus
 
-patches:
-  - path: ../mixins/argo-server-deployment.yaml
-  - path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-  - path: ../mixins/workflow-controller-configmap.yaml
-  - path: ../mixins/workflow-controller-deployment.yaml
-  - path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-  - path: ../mixins/minio-deployment.yaml
-
-labels:
-  - includeSelectors: true
-    pairs:
-      app.kubernetes.io/part-of: argo
+components:
+- ../components/base
diff --git a/test/e2e/manifests/sso/kustomization.yaml b/test/e2e/manifests/sso/kustomization.yaml
@@ -3,18 +3,9 @@ kind: Kustomization
 
 resources:
 - ../../../../manifests/quick-start/sso
-- ../mixins/argo-server.service-account-token-secret.yaml
 
-patches:
-- path: ../mixins/argo-server-deployment.yaml
-- path: ../mixins/argo-server-cluster-workflow-template-rbac.yaml
-- path: ../mixins/workflow-controller-configmap.yaml
-- path: ../mixins/workflow-controller-deployment.yaml
-- path: ../mixins/workflow-controller-cluster-workflow-template-rbac.yaml
-- path: ../mixins/minio-deployment.yaml
+components:
+- ../components/base
+- ../components/local-argo
 
-labels:
-- includeSelectors: true
-  pairs:
-    app.kubernetes.io/part-of: argo
-namespace: argo
+namespace: argo
diff --git a/test/e2e/manifests/stress/kustomization.yaml b/test/e2e/manifests/stress/kustomization.yaml
@@ -5,7 +5,6 @@ resources:
   - ../../../../manifests/quick-start/minimal
   - ../../../../manifests/quick-start/base/prometheus
   - workflow-controller-pprof-service.yaml
-  - workflow-controller-podpriorityclass.yaml
   - argo-server-podpriorityclass.yaml
   - minio-podpriorityclass.yaml
 

diff --git a/test/e2e/manifests/stress/workflow-controller-podpriorityclass.yaml b/test/e2e/manifests/stress/workflow-controller-podpriorityclass.yaml