chore: Configure environment setup (automatic) / Riotkit

Author: Riotkit via Github Actions

env.mk

@@ -38,11 +38,13 @@ prepare-tools:  ## Installs required tools
 	@test -f ./.build/kuttl || (curl -sL https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kubectl-kuttl_0.15.0_linux_x86_64 --output ./.build/kuttl && chmod +x ./.build/kuttl)
 
 skaffold-deploy: prepare-tools  ## Deploys app with dependencies using Skaffold
+	k3d kubeconfig merge ${ENV_CLUSTER_NAME}; \
 	export KUBECONFIG=~/.k3d/kubeconfig-${ENV_CLUSTER_NAME}.yaml; \
 	skaffold deploy -p deps \
 	&& skaffold build -p app --tag e2e --default-repo ${ENV_CLUSTER_NAME}-registry:5000 --push --insecure-registry ${ENV_CLUSTER_NAME}-registry:5000 --disable-multi-platform-build=true --detect-minikube=false --cache-artifacts=false \
-	&& skaffold deploy -p app --tag e2e --assume-yes=true --default-repo ${ENV_CLUSTER_NAME}-registry:5000; \
-	kubectl port-forward svc/${ENV_APP_SVC} -n ${ENV_NS} ${ENV_PORT_FORWARD} &
+	&& skaffold deploy -p app --tag e2e --assume-yes=true --default-repo ${ENV_CLUSTER_NAME}-registry:5000
+
+	export KUBECONFIG=~/.k3d/kubeconfig-${ENV_CLUSTER_NAME}.yaml; kubectl port-forward svc/${ENV_APP_SVC} -n ${ENV_NS} ${ENV_PORT_FORWARD} &
 
 dev: ## Runs the development environment in Kubernetes
 	skaffold deploy -p deps