From 5bb8b606f719d14306a34c762b4c8fb3f20c292a Mon Sep 17 00:00:00 2001 From: Tonni Follmann Date: Wed, 28 Feb 2024 09:55:32 +0100 Subject: [PATCH] move urls from weave to flux-iac in makefile --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3128f9fc..1d96550b 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ .DEFAULT_GOAL := help # Image URL to use all building/pushing image targets -MANAGER_IMG ?= ghcr.io/weaveworks/tf-controller -RUNNER_IMG ?= ghcr.io/weaveworks/tf-runner -RUNNER_AZURE_IMAGE ?= ghcr.io/weaveworks/tf-runner-azure -BRANCH_PLANNER_IMAGE ?= ghcr.io/weaveworks/branch-planner +MANAGER_IMG ?= ghcr.io/flux-iac/tofu-controller +RUNNER_IMG ?= ghcr.io/flux-iac/tf-runner +RUNNER_AZURE_IMAGE ?= ghcr.io/flux-iac/tf-runner-azure +BRANCH_PLANNER_IMAGE ?= ghcr.io/flux-iac/branch-planner TAG ?= latest BUILD_SHA ?= $(shell git rev-parse --short HEAD) BUILD_VERSION ?= $(shell git describe --tags $$(git rev-list --tags --max-count=1)) @@ -192,7 +192,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified .PHONY: deploy deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. - cd config/manager && $(KUSTOMIZE) edit set image weaveworks/tf-controller=${MANAGER_IMG}:${TAG} + cd config/manager && $(KUSTOMIZE) edit set image flux-iac/tofu-controller=${MANAGER_IMG}:${TAG} $(KUSTOMIZE) build config/default | kubectl apply --server-side -f - .PHONY: undeploy @@ -203,7 +203,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi .PHONY: dev-deploy dev-deploy: manifests kustomize mkdir -p config/dev && cp config/default/* config/dev - cd config/dev && $(KUSTOMIZE) edit set image ghcr.io/weaveworks/tf-controller=${MANAGER_IMG}:${TAG} + cd config/dev && $(KUSTOMIZE) edit set image ghcr.io/flux-iac/tofu-controller=${MANAGER_IMG}:${TAG} $(KUSTOMIZE) build config/dev | yq e "select(.kind == \"Deployment\" and .metadata.name == \"tf-controller\").spec.template.spec.containers[0].env[1].value = \"test/tf-runner:$${TAG}\"" - | kubectl apply --server-side -f - rm -rf config/dev @@ -211,7 +211,7 @@ dev-deploy: manifests kustomize .PHONY: dev-cleanup dev-cleanup: manifests kustomize mkdir -p config/dev && cp config/default/* config/dev - cd config/dev && $(KUSTOMIZE) edit set image ghcr.io/weaveworks/tf-controller=${MANAGER_IMG}:${TAG} + cd config/dev && $(KUSTOMIZE) edit set image ghcr.io/flux-iac/tofu-controller=${MANAGER_IMG}:${TAG} $(KUSTOMIZE) build config/dev | kubectl delete --server-side -f - rm -rf config/dev