Merge branch 'dev'

syntasso · Jan 12, 2024 · 6ca5041 · 6ca5041
2 parents 01f893c + f8a11a7
commit 6ca5041
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -144,18 +144,19 @@ jobs:
           command: govulncheck ./...
       - snyk/scan:
           severity-threshold: medium
-  
+
   kratix-containers-vulnerability-scan:
     executor: machine-medium
     environment:
-      IMAGE_VERSION: << pipeline.git.tag >>
-      # IMAGE_VERSION: v0.17.0
-      IMAGE_NAME: syntasso/kratix-platform
+      KRATIX_IMAGE_NAME: syntasso/kratix-platform
+      WORKER_IMAGE_NAME: syntasso/kratix-platform-pipeline-adapter
     steps:
       - snyk/scan:
           severity-threshold: medium
-          docker-image-name: $IMAGE_NAME:$IMAGE_VERSION
-
+          docker-image-name: $IMAGE_NAME:latest
+      - snyk/scan:
+          severity-threshold: medium
+          docker-image-name: $WORKER_IMAGE_NAME:latest
 
   test:
     executor: machine-large
@@ -426,7 +427,7 @@ workflows:
   update-demo:
     triggers:
       - schedule:
-          cron: "0 0 * * 1-5"
+          cron: "0 0 * * 1"
           filters:
             branches:
               only: [dev]

diff --git a/Makefile b/Makefile
@@ -1,10 +1,13 @@
 # Version to use for building/releasing artifacts
 VERSION ?= dev
 # Image URL to use all building/pushing image targets
-IMG ?= syntasso/kratix-platform:${VERSION}
+IMG_NAME ?= syntasso/kratix-platform
+IMG_VERSION ?= ${VERSION}
+IMG_TAG ?= ${IMG_NAME}:${IMG_VERSION}
 IMG_MIRROR ?= syntassodev/kratix-platform:${VERSION}
 # Image URL to use for work creator image in promise_controller.go
-WC_IMG ?= syntasso/kratix-platform-pipeline-adapter:${VERSION}
+WC_IMG_VERSION ?= ${VERSION}
+WC_IMG ?= syntasso/kratix-platform-pipeline-adapter:${WC_IMG_VERSION}
 WC_IMG_MIRROR ?= syntassodev/kratix-platform-pipeline-adapter:${VERSION}
 # Version of the worker-resource-builder binary to build and release
 WRB_VERSION ?= 0.0.0
@@ -87,14 +90,14 @@ install-cert-manager: ## Install cert-manager on the platform cluster; used in t
 ##@ Container Images
 
 kind-load-image: docker-build ## Load locally built image into KinD
-	kind load docker-image ${IMG} --name platform
+	kind load docker-image ${IMG_TAG} --name platform
 	kind load docker-image ${IMG_MIRROR} --name platform
 
 build-and-load-kratix: kind-load-image ## Build kratix container image and reloads
 	kubectl rollout restart deployment -n kratix-platform-system -l control-plane=controller-manager
 
 build-and-load-worker-creator: ## Build worker-creator container image and reloads
-	WC_IMG=${WC_IMG} WC_IMG_MIRROR=${WC_IMG_MIRROR} make -C work-creator kind-load-image
+	WC_IMG_VERSION=${WC_IMG_VERSION} WC_IMG_MIRROR=${WC_IMG_MIRROR} make -C work-creator kind-load-image
 
 ##@ Build
 
@@ -109,18 +112,18 @@ debug-run: manifests generate fmt vet ## Run a controller in debug mode from you
 	dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient debug ./main.go
 
 docker-build: ## Build docker image with the manager.
-	docker build -t ${IMG} .
-	docker tag ${IMG} ${IMG_MIRROR}
+	docker build -t ${IMG_TAG} -t ${IMG_NAME}:latest .
+	docker tag ${IMG_TAG} ${IMG_MIRROR}
 
 docker-build-and-push: ## Push multi-arch docker image with the manager.
 	if ! docker buildx ls | grep -q "kratix-image-builder"; then \
 		docker buildx create --name kratix-image-builder; \
 	fi;
-	docker buildx build --builder kratix-image-builder --push --platform linux/arm64,linux/amd64 -t ${IMG} .
+	docker buildx build --builder kratix-image-builder --push --platform linux/arm64,linux/amd64 -t ${IMG_TAG} -t ${IMG_NAME}:latest .
 	docker buildx build --builder kratix-image-builder --push --platform linux/arm64,linux/amd64 -t ${IMG_MIRROR} .
 
 build-and-push-work-creator: ## Build and push the Work Creator image
-	WC_IMG=${WC_IMG} WC_IMG_MIRROR=${WC_IMG_MIRROR} $(MAKE) -C work-creator docker-build-and-push
+	WC_IMG_VERSION=${WC_IMG_VERSION} WC_IMG_MIRROR=${WC_IMG_MIRROR} $(MAKE) -C work-creator docker-build-and-push
 
 # If not installed, use: go install github.com/goreleaser/goreleaser@latest
 build-worker-resource-builder-binary: ## Uses the goreleaser config to generate binaries
@@ -135,11 +138,11 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 	$(KUSTOMIZE) build config/crd | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG_TAG}
 	WC_IMG=${WC_IMG} $(KUSTOMIZE) build config/default | kubectl apply -f -
 
 distribution: manifests kustomize ## Create a deployment manifest in /distribution/kratix.yaml
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG_TAG}
 	mkdir -p distribution
 	WC_IMG=${WC_IMG} $(KUSTOMIZE) build config/default --output distribution/kratix.yaml
 

diff --git a/work-creator/Makefile b/work-creator/Makefile
@@ -1,5 +1,7 @@
 # Image URL to use all building/pushing image targets
-WC_IMG ?= syntasso/kratix-platform-pipeline-adapter:dev
+WC_IMG_NAME ?= syntasso/kratix-platform-pipeline-adapter
+WC_IMG_VERSION ?= dev
+WC_IMG_TAG ?= ${WC_IMG_NAME}:${WC_IMG_VERSION}
 WC_IMG_MIRROR ?= syntassodev/kratix-platform-pipeline-adapter:dev
 # Enable buildkit for docker
 DOCKER_BUILDKIT ?= 1
@@ -23,18 +25,18 @@ test: ## Run tests.
 	go run ${GINKGO} ./pipeline/ -r  --coverprofile cover.out
 
 kind-load-image: docker-build ## Load locally built image into KinD, use export WC_IMG=syntasso/kratix-platform-pipeline-adapter:dev
-	kind load docker-image ${WC_IMG} --name platform
+	kind load docker-image ${WC_IMG_TAG} --name platform
 	kind load docker-image ${WC_IMG_MIRROR} --name platform
 
 ##@ Build
 
 docker-build: ## Build docker image with work-creator binary
-	docker build -f ../Dockerfile.pipeline-adapter --tag ${WC_IMG} ../
+	docker build -f ../Dockerfile.pipeline-adapter --tag ${WC_IMG_TAG} --tag ${WC_IMG_NAME}:latest ../
 	docker build -f ../Dockerfile.pipeline-adapter --tag ${WC_IMG_MIRROR} ../
 
 docker-build-and-push: ## Push multi-arch docker image with the manager.
 	if ! docker buildx ls | grep -q "work-creator-image-builder"; then \
 		docker buildx create --name work-creator-image-builder; \
 	fi;
-	docker buildx build --builder work-creator-image-builder --push --platform linux/arm64,linux/amd64 --file ../Dockerfile.pipeline-adapter --tag ${WC_IMG} ../
+	docker buildx build --builder work-creator-image-builder --push --platform linux/arm64,linux/amd64 --file ../Dockerfile.pipeline-adapter --tag ${WC_IMG_TAG} --tag ${WC_IMG_NAME}:latest ../
 	docker buildx build --builder work-creator-image-builder --push --platform linux/arm64,linux/amd64 --file ../Dockerfile.pipeline-adapter --tag ${WC_IMG_MIRROR} ../