build: refactoring to support full CRDs

This was split off from argoproj#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 argoproj#14001 for more details on this approach. Signed-off-by: Mason Malone <[email protected]>
MasonM · Jan 3, 2025 · 82eb102 · 82eb102
1 parent 81993b5
commit 82eb102
Show file tree

Hide file tree

Showing 39 changed files with 58 additions and 61 deletions.
diff --git 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
@@ -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
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
diff --git 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/...start/mysql/argo-mysql-config-secret.yaml → ...nents/mysql/argo-mysql-config-secret.yaml b/...start/mysql/argo-mysql-config-secret.yaml → ...nents/mysql/argo-mysql-config-secret.yaml
diff --git a/manifests/components/mysql/kustomization.yaml 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/...s/quick-start/mysql/mysql-deployment.yaml → ...ts/components/mysql/mysql-deployment.yaml b/...s/quick-start/mysql/mysql-deployment.yaml → ...ts/components/mysql/mysql-deployment.yaml
diff --git a/...ests/quick-start/mysql/mysql-service.yaml → ...fests/components/mysql/mysql-service.yaml b/...ests/quick-start/mysql/mysql-service.yaml → ...fests/components/mysql/mysql-service.yaml
diff --git a/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml b/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml
diff --git a/...postgres/argo-postgres-config-secret.yaml → ...postgres/argo-postgres-config-secret.yaml b/...postgres/argo-postgres-config-secret.yaml → ...postgres/argo-postgres-config-secret.yaml
diff --git a/manifests/components/postgres/kustomization.yaml 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/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml b/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml
diff --git a/...k-start/postgres/postgres-deployment.yaml → ...ponents/postgres/postgres-deployment.yaml b/...k-start/postgres/postgres-deployment.yaml → ...ponents/postgres/postgres-deployment.yaml
diff --git a/...uick-start/postgres/postgres-service.yaml → ...components/postgres/postgres-service.yaml b/...uick-start/postgres/postgres-service.yaml → ...components/postgres/postgres-service.yaml
diff --git a/manifests/quick-start/sso/dex/dev-svc.yaml → manifests/components/sso/dex/dev-svc.yaml b/manifests/quick-start/sso/dex/dev-svc.yaml → manifests/components/sso/dex/dev-svc.yaml
diff --git a/manifests/quick-start/sso/dex/dex-cm.yaml → manifests/components/sso/dex/dex-cm.yaml b/manifests/quick-start/sso/dex/dex-cm.yaml → manifests/components/sso/dex/dex-cm.yaml
diff --git a/...fests/quick-start/sso/dex/dex-deploy.yaml → manifests/components/sso/dex/dex-deploy.yaml b/...fests/quick-start/sso/dex/dex-deploy.yaml → manifests/components/sso/dex/dex-deploy.yaml
diff --git a/manifests/quick-start/sso/dex/dex-rb.yaml → manifests/components/sso/dex/dex-rb.yaml b/manifests/quick-start/sso/dex/dex-rb.yaml → manifests/components/sso/dex/dex-rb.yaml
diff --git a/manifests/quick-start/sso/dex/dex-role.yaml → manifests/components/sso/dex/dex-role.yaml b/manifests/quick-start/sso/dex/dex-role.yaml → manifests/components/sso/dex/dex-role.yaml
diff --git a/manifests/quick-start/sso/dex/dex-sa.yaml → manifests/components/sso/dex/dex-sa.yaml b/manifests/quick-start/sso/dex/dex-sa.yaml → manifests/components/sso/dex/dex-sa.yaml
diff --git a/...ts/quick-start/sso/dex/kustomization.yaml → ...sts/components/sso/dex/kustomization.yaml b/...ts/quick-start/sso/dex/kustomization.yaml → ...sts/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
@@ -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/...ck-start/sso/overlays/argo-server-sa.yaml → ...mponents/sso/overlays/argo-server-sa.yaml b/...ck-start/sso/overlays/argo-server-sa.yaml → ...mponents/sso/overlays/argo-server-sa.yaml
diff --git a/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml b/...erlays/workflow-controller-configmap.yaml → ...erlays/workflow-controller-configmap.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
diff --git 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