Skip to content

Commit 392bdc1

Browse files
authored
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]>
1 parent db9370f commit 392bdc1

File tree

3 files changed

+476
-87
lines changed

3 files changed

+476
-87
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ jobs:
6464

6565
- name: e2e test
6666
run: |
67-
# https://github.com/kubernetes-sigs/kustomize/issues/2867
68-
kustomize version
69-
sudo rm $(which kustomize)
70-
7167
kubectl get nodes -o wide
7268
7369
make load-kind-image install deploy

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ all: manager
2828

2929
# Run tests
3030
KUBEBUILDER_ASSETS=/tmp/envtest_assets.d
31-
K8S_VERSION=1.22.0
31+
K8S_VERSION=1.29.1
3232
GOOS=$(shell go env GOOS)
3333
GOARCH=$(shell go env GOARCH)
3434
test: generate fmt vet manifests
@@ -46,7 +46,7 @@ run: generate fmt vet manifests
4646

4747
# Install CRDs into a cluster
4848
install: manifests kustomize
49-
$(KUSTOMIZE) build config/crd | kubectl apply -f -
49+
$(KUSTOMIZE) build config/crd | kubectl apply -f - --server-side
5050

5151
# Uninstall CRDs from a cluster
5252
uninstall: manifests kustomize
@@ -55,7 +55,7 @@ uninstall: manifests kustomize
5555
# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
5656
deploy: manifests kustomize
5757
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
58-
$(KUSTOMIZE) build config/default | kubectl apply -f -
58+
$(KUSTOMIZE) build config/default | kubectl apply -f - --server-side
5959

6060
# Generate manifests e.g. CRD, RBAC etc.
6161
manifests: controller-gen

0 commit comments

Comments
 (0)