From dceff77c953e10d8d4c1f488cf1cb0ab38c3e444 Mon Sep 17 00:00:00 2001 From: nbykov0 <166552198+nbykov0@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:28:59 +0300 Subject: [PATCH] Update values.yaml with image metadata after build --- packages/system/capi-operator/Makefile | 11 ++++++++--- packages/system/capi-operator/values.yaml | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 packages/system/capi-operator/values.yaml diff --git a/packages/system/capi-operator/Makefile b/packages/system/capi-operator/Makefile index 14f8e185..ec30686c 100644 --- a/packages/system/capi-operator/Makefile +++ b/packages/system/capi-operator/Makefile @@ -20,9 +20,9 @@ update-dockerfiles: components := $(subst /,,$(subst images/,,$(dir $(wildcard images/*/Dockerfile)))) img_targets := $(addprefix image-,$(components)) -update-images: $(img-targets) +update-images: $(img_targets) -.PHONY = $(img_targets) +.PHONY: $(img_targets) $(img_targets): @$(eval name := $(subst image-,,$@)) @$(eval tag := $(shell egrep -o "FROM .*$(name).*" images/$(name)/Dockerfile | awk -F: '{print $$NF}')) @@ -33,5 +33,10 @@ $(img_targets): --cache-to type=inline \ --metadata-file images/$(name).json \ --push=$(PUSH) \ - --load=$(LOAD) + --load=$(LOAD) && \ + img_name=$$(jq -r '."image.name" | split(":")[:-1] | join(":")' images/$(name).json) \ + yq -i '.$(name).image.manager.repository = ("$${img_name}"|envsubst(nu,ne))' values.yaml && \ + img_tag=$$(jq -r '."image.name" | split(":")[-1]' images/$(name).json) \ + img_digest=$$(jq -r '."containerimage.digest"' images/$(name).json) \ + yq -i '.$(name).image.manager.tag = ("$${img_tag}@$${img_digest}"|envsubst(nu,ne))' values.yaml diff --git a/packages/system/capi-operator/values.yaml b/packages/system/capi-operator/values.yaml new file mode 100644 index 00000000..a8d741d6 --- /dev/null +++ b/packages/system/capi-operator/values.yaml @@ -0,0 +1,5 @@ +cluster-api-operator: + image: + manager: + repository: "localhost:5000/aenix-io/cozystack/system/cluster-api-operator" + tag: "v0.8.1@sha256:79282412e0b891630235ecf919c45b0531f25a0926825385a51bb2a7dde880fb"