From 82eb102ee62b1d47c5429a3db048e817df619dfd Mon Sep 17 00:00:00 2001 From: Mason Malone <651224+MasonM@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:11:08 -0800 Subject: [PATCH] build: refactoring to support full CRDs This was split off from https://github.com/argoproj/argo-workflows/issues/5114 to make it easier to review. This makes a few minor improvements to the build to support the full CRD fixes: 1. Update devcontainer to install k3s 1.29.10, since that's what we use in CI: https://github.com/argoproj/argo-workflows/blob/ef41f83f801a6ff48c87f882a6b75d0e37529134/.github/workflows/ci-build.yaml#L263 1.27 is EOL and doesn't support things like validation rules in CRDs. 2. Update `make install` to use [server-side apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/), which is meant to replace client-side apply and isn't affected by size limitations for the CRDs. Since `kubectl apply --server-side` isn't compatible with `kubectl apply --prune`, I had to switch to [apply sets](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune), which is intended to replace allow list pruning, and seems to work just as wlel. 3. Minor refactoring of the manifests under `manifests/` to use [Kustomize Components](https://kubectl.docs.kubernetes.io/guides/config_management/components/) so that we can share code with the the manifests under `test/e2e/manifests` without duplication. See #14001 for more details on this approach. Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> --- .devcontainer/pre-build.sh | 4 ++-- Makefile | 5 ++++- manifests/base/crds/kustomization.yaml | 5 ----- manifests/base/kustomization.yaml | 7 ------- manifests/cluster-install/kustomization.yaml | 3 ++- .../mysql/argo-mysql-config-secret.yaml | 0 manifests/components/mysql/kustomization.yaml | 10 ++++++++++ .../mysql/mysql-deployment.yaml | 0 .../mysql/mysql-service.yaml | 0 .../mysql/overlays/workflow-controller-configmap.yaml | 0 .../postgres/argo-postgres-config-secret.yaml | 0 manifests/components/postgres/kustomization.yaml | 10 ++++++++++ .../overlays/workflow-controller-configmap.yaml | 0 .../postgres/postgres-deployment.yaml | 0 .../postgres/postgres-service.yaml | 0 .../{quick-start => components}/sso/dex/dev-svc.yaml | 0 .../{quick-start => components}/sso/dex/dex-cm.yaml | 0 .../sso/dex/dex-deploy.yaml | 0 .../{quick-start => components}/sso/dex/dex-rb.yaml | 0 .../{quick-start => components}/sso/dex/dex-role.yaml | 0 .../{quick-start => components}/sso/dex/dex-sa.yaml | 0 .../sso/dex/kustomization.yaml | 5 ----- manifests/components/sso/kustomization.yaml | 9 +++++++++ .../sso/overlays/argo-server-sa.yaml | 0 .../sso/overlays/workflow-controller-configmap.yaml | 0 manifests/namespace-install/kustomization.yaml | 4 +++- manifests/quick-start/minimal/kustomization.yaml | 1 + manifests/quick-start/mysql/kustomization.yaml | 8 +++----- manifests/quick-start/postgres/kustomization.yaml | 8 +++----- manifests/quick-start/sso/kustomization.yaml | 7 +++---- test/e2e/manifests/components/base/kustomization.yaml | 7 ++----- test/e2e/manifests/events/kustomization.yaml | 5 ++--- test/e2e/manifests/minimal/kustomization.yaml | 1 - test/e2e/manifests/mysql/kustomization.yaml | 2 +- test/e2e/manifests/plugins/kustomization.yaml | 4 ---- test/e2e/manifests/postgres/kustomization.yaml | 2 +- test/e2e/manifests/prometheus/kustomization.yaml | 1 - test/e2e/manifests/sso/kustomization.yaml | 4 +--- test/e2e/manifests/stress/kustomization.yaml | 7 +------ 39 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 manifests/base/crds/kustomization.yaml delete mode 100644 manifests/base/kustomization.yaml rename manifests/{quick-start => components}/mysql/argo-mysql-config-secret.yaml (100%) create mode 100644 manifests/components/mysql/kustomization.yaml rename manifests/{quick-start => components}/mysql/mysql-deployment.yaml (100%) rename manifests/{quick-start => components}/mysql/mysql-service.yaml (100%) rename manifests/{quick-start => components}/mysql/overlays/workflow-controller-configmap.yaml (100%) rename manifests/{quick-start => components}/postgres/argo-postgres-config-secret.yaml (100%) create mode 100644 manifests/components/postgres/kustomization.yaml rename manifests/{quick-start => components}/postgres/overlays/workflow-controller-configmap.yaml (100%) rename manifests/{quick-start => components}/postgres/postgres-deployment.yaml (100%) rename manifests/{quick-start => components}/postgres/postgres-service.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dev-svc.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dex-cm.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dex-deploy.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dex-rb.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dex-role.yaml (100%) rename manifests/{quick-start => components}/sso/dex/dex-sa.yaml (100%) rename manifests/{quick-start => components}/sso/dex/kustomization.yaml (68%) create mode 100644 manifests/components/sso/kustomization.yaml rename manifests/{quick-start => components}/sso/overlays/argo-server-sa.yaml (100%) rename manifests/{quick-start => components}/sso/overlays/workflow-controller-configmap.yaml (100%) diff --git a/.devcontainer/pre-build.sh b/.devcontainer/pre-build.sh index 16727647fa36..252dfa0fe909 100755 --- a/.devcontainer/pre-build.sh +++ b/.devcontainer/pre-build.sh @@ -3,11 +3,11 @@ set -eux # install kubernetes wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash -k3d cluster get k3s-default || k3d cluster create --image rancher/k3s:v1.27.3-k3s1 --wait +k3d cluster get k3s-default || k3d cluster create --image rancher/k3s:v1.29.10-k3s1 --wait k3d kubeconfig merge --kubeconfig-merge-default # install kubectl -curl -LO https://dl.k8s.io/release/v1.27.3/bin/linux/$(go env GOARCH)/kubectl +curl -LO https://dl.k8s.io/release/v1.29.10/bin/linux/$(go env GOARCH)/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl kubectl cluster-info diff --git a/Makefile b/Makefile index ee5b266209f4..170461814ab4 100644 --- a/Makefile +++ b/Makefile @@ -480,7 +480,10 @@ install: githooks kubectl get ns $(KUBE_NAMESPACE) || kubectl create ns $(KUBE_NAMESPACE) kubectl config set-context --current --namespace=$(KUBE_NAMESPACE) @echo "installing PROFILE=$(PROFILE)" - kubectl kustomize --load-restrictor=LoadRestrictionsNone test/e2e/manifests/$(PROFILE) | sed 's|quay.io/argoproj/|$(IMAGE_NAMESPACE)/|' | sed 's/namespace: argo/namespace: $(KUBE_NAMESPACE)/' | kubectl -n $(KUBE_NAMESPACE) apply --prune -l app.kubernetes.io/part-of=argo -f - + kubectl kustomize --load-restrictor=LoadRestrictionsNone test/e2e/manifests/$(PROFILE) \ + | sed 's|quay.io/argoproj/|$(IMAGE_NAMESPACE)/|' \ + | sed 's/namespace: argo/namespace: $(KUBE_NAMESPACE)/' \ + | KUBECTL_APPLYSET=true kubectl -n $(KUBE_NAMESPACE) apply --applyset=configmaps/install --server-side --prune -f - ifeq ($(PROFILE),stress) kubectl -n $(KUBE_NAMESPACE) apply -f test/stress/massive-workflow.yaml endif diff --git a/manifests/base/crds/kustomization.yaml b/manifests/base/crds/kustomization.yaml deleted file mode 100644 index 3ccdade18fcc..000000000000 --- a/manifests/base/crds/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - minimal diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml deleted file mode 100644 index 0b9a73341d74..000000000000 --- a/manifests/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- crds -- workflow-controller -- argo-server diff --git a/manifests/cluster-install/kustomization.yaml b/manifests/cluster-install/kustomization.yaml index 986293cd64b0..9dfb96b1be31 100644 --- a/manifests/cluster-install/kustomization.yaml +++ b/manifests/cluster-install/kustomization.yaml @@ -2,7 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../base +- ../base/workflow-controller +- ../base/argo-server - ./workflow-controller-rbac - ./argo-server-rbac diff --git a/manifests/quick-start/mysql/argo-mysql-config-secret.yaml b/manifests/components/mysql/argo-mysql-config-secret.yaml similarity index 100% rename from manifests/quick-start/mysql/argo-mysql-config-secret.yaml rename to manifests/components/mysql/argo-mysql-config-secret.yaml diff --git a/manifests/components/mysql/kustomization.yaml b/manifests/components/mysql/kustomization.yaml new file mode 100644 index 000000000000..6a5807166ec7 --- /dev/null +++ b/manifests/components/mysql/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - argo-mysql-config-secret.yaml + - mysql-deployment.yaml + - mysql-service.yaml + +patches: + - path: overlays/workflow-controller-configmap.yaml diff --git a/manifests/quick-start/mysql/mysql-deployment.yaml b/manifests/components/mysql/mysql-deployment.yaml similarity index 100% rename from manifests/quick-start/mysql/mysql-deployment.yaml rename to manifests/components/mysql/mysql-deployment.yaml diff --git a/manifests/quick-start/mysql/mysql-service.yaml b/manifests/components/mysql/mysql-service.yaml similarity index 100% rename from manifests/quick-start/mysql/mysql-service.yaml rename to manifests/components/mysql/mysql-service.yaml diff --git a/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml b/manifests/components/mysql/overlays/workflow-controller-configmap.yaml similarity index 100% rename from manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml rename to manifests/components/mysql/overlays/workflow-controller-configmap.yaml diff --git a/manifests/quick-start/postgres/argo-postgres-config-secret.yaml b/manifests/components/postgres/argo-postgres-config-secret.yaml similarity index 100% rename from manifests/quick-start/postgres/argo-postgres-config-secret.yaml rename to manifests/components/postgres/argo-postgres-config-secret.yaml diff --git a/manifests/components/postgres/kustomization.yaml b/manifests/components/postgres/kustomization.yaml new file mode 100644 index 000000000000..b1a2eb799490 --- /dev/null +++ b/manifests/components/postgres/kustomization.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - argo-postgres-config-secret.yaml + - postgres-deployment.yaml + - postgres-service.yaml + +patches: + - path: overlays/workflow-controller-configmap.yaml diff --git a/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml b/manifests/components/postgres/overlays/workflow-controller-configmap.yaml similarity index 100% rename from manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml rename to manifests/components/postgres/overlays/workflow-controller-configmap.yaml diff --git a/manifests/quick-start/postgres/postgres-deployment.yaml b/manifests/components/postgres/postgres-deployment.yaml similarity index 100% rename from manifests/quick-start/postgres/postgres-deployment.yaml rename to manifests/components/postgres/postgres-deployment.yaml diff --git a/manifests/quick-start/postgres/postgres-service.yaml b/manifests/components/postgres/postgres-service.yaml similarity index 100% rename from manifests/quick-start/postgres/postgres-service.yaml rename to manifests/components/postgres/postgres-service.yaml diff --git a/manifests/quick-start/sso/dex/dev-svc.yaml b/manifests/components/sso/dex/dev-svc.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dev-svc.yaml rename to manifests/components/sso/dex/dev-svc.yaml diff --git a/manifests/quick-start/sso/dex/dex-cm.yaml b/manifests/components/sso/dex/dex-cm.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dex-cm.yaml rename to manifests/components/sso/dex/dex-cm.yaml diff --git a/manifests/quick-start/sso/dex/dex-deploy.yaml b/manifests/components/sso/dex/dex-deploy.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dex-deploy.yaml rename to manifests/components/sso/dex/dex-deploy.yaml diff --git a/manifests/quick-start/sso/dex/dex-rb.yaml b/manifests/components/sso/dex/dex-rb.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dex-rb.yaml rename to manifests/components/sso/dex/dex-rb.yaml diff --git a/manifests/quick-start/sso/dex/dex-role.yaml b/manifests/components/sso/dex/dex-role.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dex-role.yaml rename to manifests/components/sso/dex/dex-role.yaml diff --git a/manifests/quick-start/sso/dex/dex-sa.yaml b/manifests/components/sso/dex/dex-sa.yaml similarity index 100% rename from manifests/quick-start/sso/dex/dex-sa.yaml rename to manifests/components/sso/dex/dex-sa.yaml diff --git a/manifests/quick-start/sso/dex/kustomization.yaml b/manifests/components/sso/dex/kustomization.yaml similarity index 68% rename from manifests/quick-start/sso/dex/kustomization.yaml rename to manifests/components/sso/dex/kustomization.yaml index 636bb3370bec..1a9c0a56518d 100644 --- a/manifests/quick-start/sso/dex/kustomization.yaml +++ b/manifests/components/sso/dex/kustomization.yaml @@ -1,11 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/part-of: dex - resources: - dex-cm.yaml - dex-role.yaml diff --git a/manifests/components/sso/kustomization.yaml b/manifests/components/sso/kustomization.yaml new file mode 100644 index 000000000000..5d85d7c8f874 --- /dev/null +++ b/manifests/components/sso/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - dex + +patches: + - path: overlays/workflow-controller-configmap.yaml + - path: overlays/argo-server-sa.yaml diff --git a/manifests/quick-start/sso/overlays/argo-server-sa.yaml b/manifests/components/sso/overlays/argo-server-sa.yaml similarity index 100% rename from manifests/quick-start/sso/overlays/argo-server-sa.yaml rename to manifests/components/sso/overlays/argo-server-sa.yaml diff --git a/manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml b/manifests/components/sso/overlays/workflow-controller-configmap.yaml similarity index 100% rename from manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml rename to manifests/components/sso/overlays/workflow-controller-configmap.yaml diff --git a/manifests/namespace-install/kustomization.yaml b/manifests/namespace-install/kustomization.yaml index aa9de5444113..23010a2aca85 100644 --- a/manifests/namespace-install/kustomization.yaml +++ b/manifests/namespace-install/kustomization.yaml @@ -2,7 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base + - ../base/crds/minimal + - ../base/workflow-controller + - ../base/argo-server - ./argo-server-rbac - ./workflow-controller-rbac diff --git a/manifests/quick-start/minimal/kustomization.yaml b/manifests/quick-start/minimal/kustomization.yaml index 56c1551bd250..34b94565b39e 100644 --- a/manifests/quick-start/minimal/kustomization.yaml +++ b/manifests/quick-start/minimal/kustomization.yaml @@ -3,6 +3,7 @@ kind: Kustomization resources: - ../base + - ../../base/crds/minimal patches: - path: overlays/workflow-controller-configmap.yaml diff --git a/manifests/quick-start/mysql/kustomization.yaml b/manifests/quick-start/mysql/kustomization.yaml index ffc58889aafd..a3113cf08792 100644 --- a/manifests/quick-start/mysql/kustomization.yaml +++ b/manifests/quick-start/mysql/kustomization.yaml @@ -3,9 +3,7 @@ kind: Kustomization resources: - ../base - - argo-mysql-config-secret.yaml - - mysql-deployment.yaml - - mysql-service.yaml + - ../../base/crds/minimal -patches: - - path: overlays/workflow-controller-configmap.yaml +components: + - ../../components/mysql diff --git a/manifests/quick-start/postgres/kustomization.yaml b/manifests/quick-start/postgres/kustomization.yaml index 2640ed4c0c84..27ded47e1689 100644 --- a/manifests/quick-start/postgres/kustomization.yaml +++ b/manifests/quick-start/postgres/kustomization.yaml @@ -3,9 +3,7 @@ kind: Kustomization resources: - ../base - - argo-postgres-config-secret.yaml - - postgres-deployment.yaml - - postgres-service.yaml + - ../../base/crds/minimal -patches: - - path: overlays/workflow-controller-configmap.yaml +components: + - ../../components/postgres diff --git a/manifests/quick-start/sso/kustomization.yaml b/manifests/quick-start/sso/kustomization.yaml index d70185d43bd4..6c61b26ee012 100644 --- a/manifests/quick-start/sso/kustomization.yaml +++ b/manifests/quick-start/sso/kustomization.yaml @@ -3,8 +3,7 @@ kind: Kustomization resources: - ../base - - dex + - ../../base/crds/minimal -patches: - - path: overlays/workflow-controller-configmap.yaml - - path: overlays/argo-server-sa.yaml +components: + - ../../components/sso diff --git a/test/e2e/manifests/components/base/kustomization.yaml b/test/e2e/manifests/components/base/kustomization.yaml index c0703f2ab210..77d1388745b3 100644 --- a/test/e2e/manifests/components/base/kustomization.yaml +++ b/test/e2e/manifests/components/base/kustomization.yaml @@ -2,6 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: +- ../../../../../manifests/base/crds/minimal +- ../../../../../manifests/quick-start/base - argo-server.service-account-token-secret.yaml patches: @@ -10,8 +12,3 @@ patches: - 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/test/e2e/manifests/events/kustomization.yaml b/test/e2e/manifests/events/kustomization.yaml index 7582055efe74..93ff2ed29fba 100644 --- a/test/e2e/manifests/events/kustomization.yaml +++ b/test/e2e/manifests/events/kustomization.yaml @@ -2,9 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../manifests/quick-start/minimal -- 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 +- https://raw.githubusercontent.com/argoproj/argo-events/stable/manifests/install.yaml +- https://raw.githubusercontent.com/argoproj/argo-events/stable/examples/eventbus/native.yaml components: - ../components/base diff --git a/test/e2e/manifests/minimal/kustomization.yaml b/test/e2e/manifests/minimal/kustomization.yaml index 64a3e5ea9963..49835596f127 100644 --- a/test/e2e/manifests/minimal/kustomization.yaml +++ b/test/e2e/manifests/minimal/kustomization.yaml @@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../manifests/quick-start/minimal - 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 diff --git a/test/e2e/manifests/mysql/kustomization.yaml b/test/e2e/manifests/mysql/kustomization.yaml index 3506c9f6aac5..23a05fae5ea8 100644 --- a/test/e2e/manifests/mysql/kustomization.yaml +++ b/test/e2e/manifests/mysql/kustomization.yaml @@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -- ../../../../manifests/quick-start/mysql - 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 components: - ../components/base +- ../../../../manifests/components/mysql - ../components/local-argo namespace: argo diff --git a/test/e2e/manifests/plugins/kustomization.yaml b/test/e2e/manifests/plugins/kustomization.yaml index 18250ac970b2..e218c7bb095b 100644 --- a/test/e2e/manifests/plugins/kustomization.yaml +++ b/test/e2e/manifests/plugins/kustomization.yaml @@ -7,8 +7,4 @@ resources: - hello-executor-plugin.service-account-token-secret.yaml - hello-executor-plugin-configmap.yaml -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 index b496a9a68518..ee8408cef576 100644 --- a/test/e2e/manifests/postgres/kustomization.yaml +++ b/test/e2e/manifests/postgres/kustomization.yaml @@ -2,13 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../manifests/quick-start/postgres - 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 components: - ../components/base +- ../../../../manifests/components/postgres - ../components/local-argo namespace: argo \ No newline at end of file diff --git a/test/e2e/manifests/prometheus/kustomization.yaml b/test/e2e/manifests/prometheus/kustomization.yaml index 8b5970f01db5..b3a7b69bac0e 100644 --- a/test/e2e/manifests/prometheus/kustomization.yaml +++ b/test/e2e/manifests/prometheus/kustomization.yaml @@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../manifests/quick-start/minimal - ../../../../manifests/quick-start/base/prometheus components: diff --git a/test/e2e/manifests/sso/kustomization.yaml b/test/e2e/manifests/sso/kustomization.yaml index 8aba99ee23d3..86834313d241 100644 --- a/test/e2e/manifests/sso/kustomization.yaml +++ b/test/e2e/manifests/sso/kustomization.yaml @@ -1,11 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -resources: -- ../../../../manifests/quick-start/sso - components: - ../components/base +- ../../../../manifests/components/sso - ../components/local-argo namespace: argo \ No newline at end of file diff --git a/test/e2e/manifests/stress/kustomization.yaml b/test/e2e/manifests/stress/kustomization.yaml index a391023381ed..af7f54b6fece 100644 --- a/test/e2e/manifests/stress/kustomization.yaml +++ b/test/e2e/manifests/stress/kustomization.yaml @@ -12,9 +12,4 @@ patches: - path: workflow-controller-configmap.yaml - path: workflow-controller-deployment.yaml - path: argo-server-deployment.yaml - - path: minio-deployment.yaml - -labels: - - includeSelectors: true - pairs: - app.kubernetes.io/part-of: argo + - path: minio-deployment.yaml \ No newline at end of file