fix e2e tests (#637)

* fix e2e tests Signed-off-by: David J. M. Karlsen <[email protected]> * bump tooling Signed-off-by: David J. M. Karlsen <[email protected]> * use server-side apply to avoid bug --------- Signed-off-by: David J. M. Karlsen <[email protected]>
evryfs · Feb 11, 2024 · 392bdc1 · 392bdc1
1 parent db9370f
commit 392bdc1
Show file tree

Hide file tree

Showing 3 changed files with 476 additions and 87 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -64,10 +64,6 @@ jobs:
 
       - name: e2e test
         run: |
-          # https://github.com/kubernetes-sigs/kustomize/issues/2867
-          kustomize version
-          sudo rm $(which kustomize)
-
           kubectl get nodes -o wide
 
           make load-kind-image install deploy

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ all: manager
 
 # Run tests
 KUBEBUILDER_ASSETS=/tmp/envtest_assets.d
-K8S_VERSION=1.22.0
+K8S_VERSION=1.29.1
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
 test: generate fmt vet manifests
@@ -46,7 +46,7 @@ run: generate fmt vet manifests
 
 # Install CRDs into a cluster
 install: manifests kustomize
-	$(KUSTOMIZE) build config/crd | kubectl apply -f -
+	$(KUSTOMIZE) build config/crd | kubectl apply -f - --server-side
 
 # Uninstall CRDs from a cluster
 uninstall: manifests kustomize
@@ -55,7 +55,7 @@ uninstall: manifests kustomize
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | kubectl apply -f -
+	$(KUSTOMIZE) build config/default | kubectl apply -f - --server-side
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen