Merge pull request #4 from ross-p-smith/ross/kind

Pinning the version of Kind that works with docker

.devcontainer/devcontainer.json

@@ -14,7 +14,6 @@
 			"extensions": "k8s-extension"
 		},
 		"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
-		"ghcr.io/mpriscella/features/kind:1": {},
 		"ghcr.io/devcontainers-contrib/features/redis-homebrew:1": {},
 		"ghcr.io/devcontainers-contrib/features/springboot-sdkman:2.0.10": {
 			"jdkVersion": "17"
@@ -23,7 +22,10 @@
 			"version": "1.10.0"
 		},
 		// We use d-in-d because we need overlay networks
-		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/devcontainers/features/docker-in-docker:2.2": {},
+		"ghcr.io/devcontainers-contrib/features/kind:1": {
+			"version": "0.18.0"
+		},
 		"ghcr.io/devcontainers/features/github-cli:1": {}
 	},
 

.github/workflows/ci.yml

@@ -31,4 +31,4 @@ jobs:
       - name: Test
         run: |
           kubectl port-forward service/public-api-service 8080:80 --pod-running-timeout=3m0s &
-          make test-local
+          make test-e2e

.gitignore

@@ -0,0 +1,3 @@
+.gradle
+test/e2e-test/build/
+bin/

Makefile

@@ -29,25 +29,12 @@ deploy-local: ## 🚀 Deploy application resources locally
 	@./scripts/deploy-services-local.sh
 	@echo -e "\e[34mYOU WILL NEED TO START A NEW TERMINAL AND RUN  make test\e[0m" || true
 
-test-local: ## 🧪 Run tests locally
-	@echo -e "\e[34m$@\e[0m" || true
-	@cd test/e2e-test && ./gradlew run
-
 run-local: clean start-local deploy-local ## 💿 Run app locally
 
 port-forward-local: ## ⏩ Forward the local port
 	@echo -e "\e[34m$@\e[0m" || true
 	@kubectl port-forward service/public-api-service 8080:80 --pod-running-timeout=3m0s
 
-test: ## 🧪 Run tests, used for local development
-	@echo -e "\e[34m$@\e[0m" || true
-	@./scripts/test.sh
-
-clean: ## 🧹 Clean up local files
-	@echo -e "\e[34m$@\e[0m" || true
-	@kind delete cluster --name azd-aks
-	@docker rm kind-registry -f
-
 dapr-dashboard: ## 🔬 Open the Dapr Dashboard
 	@echo -e "\e[34m$@\e[0m" || true
 	@dapr dashboard -k -p 9000
@@ -56,7 +43,20 @@ dapr-components: ## 🏗️  List the Dapr Components
 	@echo -e "\e[34m$@\e[0m" || true
 	@dapr components -k
 
+test-local: ## 🧪 Run tests, used for local development
+	@echo -e "\e[34m$@\e[0m" || true
+	@./scripts/test.sh
+
+test-e2e: ## 🧪 Run end to end tests
+	@echo -e "\e[34m$@\e[0m" || true
+	@cd test/e2e-test && ./gradlew run
+
 ####### AZURE #############
 test-azure: ## 🧪 Run tests in Azure
 	@echo -e "\e[34m$@\e[0m" || true
 	@./scripts/test.sh --azure
+
+clean: ## 🧹 Clean up local files
+	@echo -e "\e[34m$@\e[0m" || true
+	@kind delete cluster --name azd-aks
+	@docker rm kind-registry -f