run integration test

kyma-project · Aug 31, 2023 · c26a0ed · c26a0ed
1 parent 8b1071e
commit c26a0ed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/run-validation.yaml b/.github/workflows/run-validation.yaml
@@ -29,5 +29,5 @@ jobs:
       with:
         go-version: 1.19
 ############################################################################################
-    - name: Download k3d
-      run: curl --silent --fail https://github.com/raw/k3d-io/k3d/main/install.sh | TAG=v5.4.6 bash
+    - name: Run integration tests without lifecycle-manager
+      run: make -C hack/ci run-without-lifecycle-manager
diff --git a/config/crd/bases/operator.kyma-project.io_applicationconnectors.yaml b/config/crd/bases/operator.kyma-project.io_applicationconnectors.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.10.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: applicationconnectors.operator.kyma-project.io
 spec:

diff --git a/hack/ci/Makefile b/hack/ci/Makefile
@@ -1,6 +1,9 @@
 PROJECT_ROOT ?= ../..
 PROJECT_COMMON ?= ../common
 
+K3D_URL=https://github.com/raw/k3d-io/k3d/main/install.sh
+DEFAULT_K3D_VERSION=v5.4.6
+
 include ${PROJECT_ROOT}/.env
 
 ifndef MODULE_SHA
@@ -53,11 +56,15 @@ k3d-upgrade-test: \
 render-manifest:
 	@make -C ${PROJECT_ROOT} render-manifest
 
+.PHONY: install-k3d
+install-k3d:
+	curl --silent --fail ${K3D_URL} | TAG=${k3dVersion} bash
+
 .PHONY: run-with-lifecycle-manager
 run-with-lifecycle-manager:
 	@make -C ${PROJECT_COMMON} run-with-lifecycle-manager
 
 .PHONY: run-without-lifecycle-manager
-run-without-lifecycle-manager:
+run-without-lifecycle-manager: install-k3d
 	@make -C ${PROJECT_COMMON} run-without-lifecycle-manager
 
diff --git a/hack/common/Makefile b/hack/common/Makefile
@@ -48,7 +48,7 @@ run-without-lifecycle-manager: \
 
 .PHONY: create-k3d
 create-k3d: ## Create k3d with kyma CRDs.
-	${KYMA} provision k3d --registry-port ${REGISTRY_PORT} --name ${CLUSTER_NAME} --ci
+	${KYMA} provision k3d --registry-port ${REGISTRY_PORT} --name ${CLUSTER_NAME} -p 8080:80@loadbalancer -p 8443:443@loadbalancer --ci
 
 .PHONY: delete-k3d
 delete-k3d: ## Delete k3d with kyma CRDs.
@@ -64,7 +64,7 @@ patch-with-istio-crds: ## Delete k3d kyma cluster.
 
 .PHONY: create-k3d
 create-k3d: ## Create k3d with kyma CRDs.
-	${KYMA} provision k3d --registry-port ${REGISTRY_PORT} --name ${CLUSTER_NAME} --ci
+	${KYMA} provision k3d --registry-port ${REGISTRY_PORT} --name ${CLUSTER_NAME} -p 8080:80@loadbalancer -p 8443:443@loadbalancer --ci
 
 ##@ Module management