diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 80726a4..23dc97b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,4 +27,5 @@ jobs: - uses: azure/setup-helm@v3 - name: Run e2e run: | + make minikube_new_docker make deploy_e2e diff --git a/Makefile b/Makefile index 2b694e5..1212c80 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,13 @@ helm-docs: test-helm-render: helm template ./chart -f ./chart/test-values.yaml 1> /dev/null -minikube_new: +minikube_new_virtualbox: export PROMETHEUS_OPERATOR_VERSION=$(PROMETHEUS_OPERATOR_VERSION) - ./scripts/create-minikube.sh + DRIVER='virtualbox' ./scripts/create-minikube.sh + +minikube_new_docker: + export PROMETHEUS_OPERATOR_VERSION=$(PROMETHEUS_OPERATOR_VERSION) + DRIVER='docker' ./scripts/create-minikube.sh minikube_scale_up: minikube node add @@ -61,7 +65,7 @@ deploy_observability: deploy_test: init ENV='test' ./scripts/deploy.sh -deploy_e2e: init test-helm-render ginkgo crane minikube_new +deploy_e2e: init test-helm-render ginkgo crane ENV='e2e' ./scripts/deploy.sh deploy_e2e_dirty: init test-helm-render diff --git a/scripts/create-minikube.sh b/scripts/create-minikube.sh index 798429b..ae8c3aa 100755 --- a/scripts/create-minikube.sh +++ b/scripts/create-minikube.sh @@ -10,7 +10,9 @@ minikube start \ --kubernetes-version="${K8S_VERSION}" \ --insecure-registry "10.0.0.0/24" \ --cpus=2 \ - --memory=3900MB + --memory=3900MB \ + --driver="${DRIVER}" + minikube addons enable registry # Deploy Service Monitor and Prometheus Rule CRDs