chore(env,helm,Makefile): bump up services

instill-ai · Jul 9, 2023 · d8668c8 · d8668c8
1 parent 967938f
commit d8668c8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/.env b/.env
@@ -27,11 +27,11 @@ ARTIVC_VERSION=0.10.0
 K6_VERSION=0.44.0
 
 # Instill Base
-INSTILL_BASE_VERSION=0.1.0-alpha
+BASE_VERSION=0.1.0-alpha
 
 # api-gateway-vdp
 API_GATEWAY_IMAGE=instill/api-gateway
-API_GATEWAY_VERSION=0.2.8-alpha
+API_GATEWAY_VERSION=0.3.0-alpha
 
 API_GATEWAY_VDP_HOST=api-gateway-vdp
 API_GATEWAY_VDP_PORT=8080
@@ -40,14 +40,14 @@ API_GATEWAY_VDP_METRICS_PORT=8071
 
 # pipeline-backend
 PIPELINE_BACKEND_IMAGE=instill/pipeline-backend
-PIPELINE_BACKEND_VERSION=0.12.2-alpha
+PIPELINE_BACKEND_VERSION=0.13.0-alpha
 PIPELINE_BACKEND_HOST=pipeline-backend
 PIPELINE_BACKEND_PRIVATEPORT=3081
 PIPELINE_BACKEND_PUBLICPORT=8081
 
 # connector-backend
 CONNECTOR_BACKEND_IMAGE=instill/connector-backend
-CONNECTOR_BACKEND_VERSION=0.9.7-alpha
+CONNECTOR_BACKEND_VERSION=0.10.0-alpha
 CONNECTOR_BACKEND_HOST=connector-backend
 CONNECTOR_BACKEND_PRIVATEPORT=3082
 CONNECTOR_BACKEND_PUBLICPORT=8082
@@ -62,7 +62,7 @@ MGMT_BACKEND_PRIVATEPORT=3084
 
 # controller-vdp
 CONTROLLER_VDP_IMAGE=instill/controller-vdp
-CONTROLLER_VDP_VERSION=0.1.7-alpha
+CONTROLLER_VDP_VERSION=0.1.0-alpha
 CONTROLLER_VDP_HOST=controller-vdp
 CONTROLLER_VDP_PRIVATEPORT=3085
 

diff --git a/Dockerfile b/Dockerfile
@@ -74,7 +74,7 @@ RUN git clone -b v${BASE_VERSION} -c advice.detachedHead=false https://github.co
 
 WORKDIR /instill-ai/vdp
 
-ARG API_GATEWAY_VERSION PIPELINE_BACKEND_VERSION CONNECTOR_BACKEND_VERSION MODEL_BACKEND_VERSION MGMT_BACKEND_VERSION CONTROLLER_VDP_VERSION
+ARG API_GATEWAY_VERSION PIPELINE_BACKEND_VERSION CONNECTOR_BACKEND_VERSION CONTROLLER_VDP_VERSION
 RUN git clone -b v${API_GATEWAY_VERSION} -c advice.detachedHead=false https://github.com/instill-ai/api-gateway.git
 RUN git clone -b v${PIPELINE_BACKEND_VERSION} -c advice.detachedHead=false https://github.com/instill-ai/pipeline-backend.git
 RUN git clone -b v${CONNECTOR_BACKEND_VERSION} -c advice.detachedHead=false https://github.com/instill-ai/connector-backend.git

diff --git a/Makefile b/Makefile
@@ -29,9 +29,9 @@ all:			## Launch all services with their up-to-date release version
 			${CONTAINER_COMPOSE_IMAGE_NAME}:release /bin/bash -c " \
 				cp -r /instill-ai/base/configs/* $${TMP_CONFIG_DIR} && \
 				/bin/bash -c 'cd /instill-ai/base && make all EDITION=local-ce OBSERVE_ENABLED=${OBSERVE_ENABLED} OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
-				/bin/bash -c 'rm -r $${TMP_CONFIG_DIR}/*' \
+				/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
 			" && \
-		rm -r $${TMP_CONFIG_DIR}; \
+		rm -rf $${TMP_CONFIG_DIR}; \
 	fi
 	@EDITION=local-ce docker compose -f docker-compose.yml up -d --quiet-pull
 	@EDITION=local-ce docker compose -f docker-compose.yml rm -f
@@ -47,9 +47,9 @@ latest:			## Lunch all dependent services with their latest codebase
 			${CONTAINER_COMPOSE_IMAGE_NAME}:latest /bin/bash -c " \
 				cp -r /instill-ai/base/configs/* $${TMP_CONFIG_DIR} && \
 				/bin/bash -c 'cd /instill-ai/base && make latest PROFILE=$(PROFILE) EDITION=local-ce:latest OBSERVE_ENABLED=${OBSERVE_ENABLED} OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
-				/bin/bash -c 'rm -r $${TMP_CONFIG_DIR}/*' \
+				/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
 			" && \
-		rm -r $${TMP_CONFIG_DIR}; \
+		rm -rf $${TMP_CONFIG_DIR}; \
 	fi
 	@COMPOSE_PROFILES=$(PROFILE) EDITION=local-ce:latest docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
 	@COMPOSE_PROFILES=$(PROFILE) EDITION=local-ce:latest docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
@@ -143,6 +143,7 @@ build-release:				## Build release images for all VDP components
 		--build-arg GOLANG_VERSION=${GOLANG_VERSION} \
 		--build-arg K6_VERSION=${K6_VERSION} \
 		--build-arg CACHE_DATE="$(shell date)" \
+		--build-arg BASE_VERSION=${BASE_VERSION} \
 		--build-arg API_GATEWAY_VERSION=${API_GATEWAY_VERSION} \
 		--build-arg PIPELINE_BACKEND_VERSION=${PIPELINE_BACKEND_VERSION} \
 		--build-arg CONNECTOR_BACKEND_VERSION=${CONNECTOR_BACKEND_VERSION} \
@@ -155,6 +156,7 @@ build-release:				## Build release images for all VDP components
 		-v ${BUILD_CONFIG_DIR_PATH}/docker-compose.build.yml:/instill-ai/vdp/docker-compose.build.yml \
 		--name ${CONTAINER_BUILD_NAME}-release \
 		${CONTAINER_COMPOSE_IMAGE_NAME}:release /bin/bash -c " \
+			BASE_VERSION=${BASE_VERSION} \
 			API_GATEWAY_VERSION=${API_GATEWAY_VERSION} \
 			PIPELINE_BACKEND_VERSION=${PIPELINE_BACKEND_VERSION} \
 			CONNECTOR_BACKEND_VERSION=${CONNECTOR_BACKEND_VERSION} \
@@ -176,8 +178,8 @@ integration-test-latest:			## Run integration test on the latest VDP
 			/bin/bash -c 'cd /instill-ai/base && make build-latest BUILD_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
 			/bin/bash -c 'cd /instill-ai/base && COMPOSE_PROFILES=all EDITION=local-ce:test OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR} docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull' && \
 			/bin/bash -c 'cd /instill-ai/base && COMPOSE_PROFILES=all EDITION=local-ce:test OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR} docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f' && \
-			/bin/bash -c 'rm -r $${TMP_CONFIG_DIR}/*' \
-		" && rm -r $${TMP_CONFIG_DIR}
+			/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
+		" && rm -rf $${TMP_CONFIG_DIR}
 	@COMPOSE_PROFILES=all EDITION=local-ce:test docker compose -f docker-compose.yml -f docker-compose.latest.yml up -d --quiet-pull
 	@COMPOSE_PROFILES=all EDITION=local-ce:test docker compose -f docker-compose.yml -f docker-compose.latest.yml rm -f
 	@docker run -it --rm \
@@ -204,16 +206,16 @@ integration-test-release:			## Run integration test on the release VDP
 			/bin/bash -c 'cd /instill-ai/base && make build-release BUILD_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR}' && \
 			/bin/bash -c 'cd /instill-ai/base && EDITION=local-ce:test OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR} docker compose up -d --quiet-pull' && \
 			/bin/bash -c 'cd /instill-ai/base && EDITION=local-ce:test OBSERVE_CONFIG_DIR_PATH=$${TMP_CONFIG_DIR} docker compose rm -f' && \
-			/bin/bash -c 'rm -r $${TMP_CONFIG_DIR}/*' \
-		" && rm -r $${TMP_CONFIG_DIR}
+			/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
+		" && rm -rf $${TMP_CONFIG_DIR}
 	@EDITION=local-ce:test ITMODE_ENABLED=true docker compose up -d --quiet-pull
 	@EDITION=local-ce:test docker compose rm -f
 	@docker run -it --rm \
 		--network instill-network \
 		--name ${CONTAINER_BACKEND_INTEGRATION_TEST_NAME}-release \
 		${CONTAINER_COMPOSE_IMAGE_NAME}:release /bin/bash -c " \
 			/bin/bash -c 'cd pipeline-backend && make integration-test API_GATEWAY_VDP_HOST=${API_GATEWAY_VDP_HOST} API_GATEWAY_VDP_PORT=${API_GATEWAY_VDP_PORT}' && \
-			/bin/bash -c cd connector-backend && make integration-test API_GATEWAY_VDP_HOST=${API_GATEWAY_VDP_HOST} API_GATEWAY_VDP_PORT=${API_GATEWAY_VDP_PORT} && \
+			/bin/bash -c 'cd connector-backend && make integration-test API_GATEWAY_VDP_HOST=${API_GATEWAY_VDP_HOST} API_GATEWAY_VDP_PORT=${API_GATEWAY_VDP_PORT}' && \
 			/bin/bash -c 'cd controller-vdp && make integration-test API_GATEWAY_VDP_HOST=${API_GATEWAY_VDP_HOST} API_GATEWAY_VDP_PORT=${API_GATEWAY_VDP_PORT}' \
 		"
 	@make down
@@ -239,8 +241,8 @@ helm-integration-test-latest:                       ## Run integration test on t
 					--set console.image.tag=latest \
 					--set tags.observability=false \
 					--set tags.prometheusStack=false' \
-			/bin/bash -c 'rm -r $${TMP_CONFIG_DIR}/*' \
-		" && rm -r $${TMP_CONFIG_DIR}
+			/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
+		" && rm -rf $${TMP_CONFIG_DIR}
 	@kubectl rollout status deployment base-api-gateway-base --namespace ${HELM_NAMESPACE} --timeout=120s
 	@helm install ${HELM_RELEASE_NAME} charts/vdp --namespace ${HELM_NAMESPACE} --create-namespace \
 		--set edition=k8s-ce:test \
@@ -289,11 +291,10 @@ helm-integration-test-release:                       ## Run integration test on
 				helm --kubeconfig /instill-ai/kubeconfig install base charts/base \
 					--namespace ${HELM_NAMESPACE} --create-namespace \
 					--set edition=k8s-ce:test \
-					--set apiGatewayBase.image.tag=$${API_GATEWAY_BASE_VERSION} \
-					--set mgmtBackend.image.tag=$${MGMT_BACKEND_VERSION} \
 					--set tags.observability=false \
 					--set tags.prometheusStack=false' \
-		"
+			/bin/bash -c 'rm -rf $${TMP_CONFIG_DIR}/*' \
+		" && rm -rf $${TMP_CONFIG_DIR}
 	@kubectl rollout status deployment base-api-gateway-base --namespace ${HELM_NAMESPACE} --timeout=120s
 	@helm install ${HELM_RELEASE_NAME} charts/vdp --namespace ${HELM_NAMESPACE} --create-namespace \
 		--set edition=k8s-ce:test \

diff --git a/charts/vdp/values.yaml b/charts/vdp/values.yaml
@@ -160,7 +160,7 @@ apiGatewayVDP:
   # -- The image of api-gateway
   image:
     repository: instill/api-gateway
-    tag: 0.2.8-alpha
+    tag: 0.3.0-alpha
     pullPolicy: IfNotPresent
   # -- The path of configuration file for api-gateway
   configPath: /api-gateway/config/.env
@@ -217,7 +217,7 @@ pipelineBackend:
   # -- The image of pipeline-backend
   image:
     repository: instill/pipeline-backend
-    tag: 0.12.2-alpha
+    tag: 0.13.0-alpha
     pullPolicy: IfNotPresent
   # -- The command names to be executed
   commandName:
@@ -291,7 +291,7 @@ connectorBackend:
   # -- The image of connector-backend
   image:
     repository: instill/connector-backend
-    tag: 0.9.7-alpha
+    tag: 0.10.0-alpha
     pullPolicy: IfNotPresent
   # -- The command names to be executed
   commandName:
@@ -362,7 +362,7 @@ controllerVDP:
   # -- The image of controller
   image:
     repository: instill/controller-vdp
-    tag: 0.1.7-alpha
+    tag: 0.1.0-alpha
     pullPolicy: IfNotPresent
   # -- The command names to be executed
   commandName: