Skip to content

Commit

Permalink
move the k3d hack to e2e only
Browse files Browse the repository at this point in the history
  • Loading branch information
edude03 committed Dec 13, 2024
1 parent 187ed92 commit 8e994e2
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,6 @@ deploy: check-local-context docker-build load-images render-manifests kubectl ##
$(KUBECTL) -n neonvm-system rollout status daemonset neonvm-device-plugin
$(KUBECTL) apply -f $(RENDERED)/neonvm-controller.yaml
$(KUBECTL) -n neonvm-system rollout status deployment neonvm-controller
$(KUBECTL) -n neonvm-system set env deployment/neonvm-controller K3D_HACK=true
$(KUBECTL) -n neonvm-system rollout status deployment neonvm-controller
$(KUBECTL) apply -f $(RENDERED)/neonvm-vxlan-controller.yaml
$(KUBECTL) -n neonvm-system rollout status daemonset neonvm-vxlan-controller
# NB: typical upgrade path requires updated scheduler before autoscaler-agents.
Expand All @@ -399,7 +397,7 @@ example-vms: docker-build-examples load-example-vms ## Build and push the testin

.PHONY: example-vms-arm64
example-vms-arm64: TARGET_ARCH=arm64
example-vms-arm64: example-vms
example-vms-arm64: example-vms

.PHONY: load-pg16-disk-test
load-pg16-disk-test: check-local-context kubectl kind k3d ## Load the pg16-disk-test VM image to the kind/k3d cluster.
Expand Down Expand Up @@ -434,8 +432,12 @@ k3d-load: k3d # Push docker images to the k3d cluster.
.PHONE: e2e-tools
e2e-tools: k3d kind kubectl kuttl python-init ## Donwnload tools for e2e tests locally if necessary.

.PHONE: k3d-hack
$(KUBECTL) -n neonvm-system set env deployment/neonvm-controller K3D_HACK=true
$(KUBECTL) -n neonvm-system rollout status deployment neonvm-controller

.PHONE: e2e
e2e: check-local-context e2e-tools ## Run e2e kuttl tests
e2e: check-local-context e2e-tools k3d-hack ## Run e2e kuttl tests
$(KUTTL) test --config tests/e2e/kuttl-test.yaml $(if $(CI),--skip-delete)
rm -f kubeconfig

Expand Down

0 comments on commit 8e994e2

Please sign in to comment.