Merge 54dffbb into a0f65e9

tinkerbell · May 4, 2022 · 08f6555 · 08f6555
2 parents a0f65e9 + 54dffbb
commit 08f6555
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 42 deletions.
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -17,7 +17,3 @@ bases:
   - ../manager
   - ../server
   - ../server-rbac
-
-patchesStrategicMerge:
-  - manager_image.yaml
-  - server_image.yaml
diff --git a/config/default/manager_image.yaml b/config/default/manager_image.yaml
diff --git a/config/default/server_image.yaml b/config/default/server_image.yaml
diff --git a/kube.mk b/kube.mk
@@ -2,7 +2,7 @@
 ## Generate
 ## --------------------------------------
 
-PHONY: generate
+.PHONY: generate
 generate: generate-go generate-manifests # Generate code, manifests etc.
 
 .PHONY: generate-go
@@ -40,25 +40,18 @@ generate-server-rbacs: bin/controller-gen
 		rbac:roleName=server-role
 	prettier --write ./config/server-rbac/
 
-REGISTRY ?= quay.io/tinkerbell
-TINK_SERVER_IMAGE_NAME ?= tink-server
-TINK_CONTROLLER_IMAGE_NAME ?= tink-controller
-TINK_SERVER_IMAGE_TAG ?= latest
-TINK_CONTROLLER_IMAGE_TAG ?= latest
-
-out/release/default/manager_image.yaml: config/default/manager_image.yaml out/release/default/kustomization.yaml
-out/release/default/manager_image.yaml: TAG=$(REGISTRY)/$(TINK_CONTROLLER_IMAGE_NAME):$(TINK_CONTROLLER_IMAGE_TAG)
-out/release/default/server_image.yaml: config/default/server_image.yaml out/release/default/kustomization.yaml
-out/release/default/server_image.yaml: TAG=$(REGISTRY)/$(TINK_SERVER_IMAGE_NAME):$(TINK_SERVER_IMAGE_TAG)
-out/release/default/manager_image.yaml out/release/default/server_image.yaml:
-	sed -e 's|image: .*|image: "$(TAG)"|' $^ >$@
+TINK_SERVER_IMAGE ?= quay.io/tinkerbell/tink-server
+TINK_CONTROLLER_IMAGE ?= quay.io/tinkerbell/tink-controller
+TINK_SERVER_TAG ?= latest
+TINK_CONTROLLER_TAG ?= latest
 
 out/release/default/kustomization.yaml: config/default/kustomization.yaml
 	rm -rf out/
 	mkdir -p out/
 	cp -a config/ out/release/
 
-out/release/tink.yaml: bin/kustomize generate-manifests out/release/default/manager_image.yaml out/release/default/manager_image.yaml
+out/release/tink.yaml: bin/kustomize generate-manifests out/release/default/kustomization.yaml
+	(cd out/release/default && kustomize edit set image server=$(TINK_SERVER_IMAGE):$(TINK_CONTROLLER_TAG) controller=$(TINK_CONTROLLER_IMAGE):$(TINK_CONTROLLER_TAG))
 	kustomize build out/release/default -o $@
 	prettier --write $@