installer: remove build artifacts from repository

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
aenix-io · Aug 7, 2024 · c688847 · c688847
1 parent 96f96a7
commit c688847
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 60 deletions.
diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile
@@ -30,7 +30,9 @@ image-cozystack:
 		--metadata-file images/cozystack.json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REGISTRY)/cozystack:$(call settag,$(TAG))" > images/cozystack.tag
+	IMAGE="$(REGISTRY)/cozystack:$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/cozystack.json -o json -r)" \
+		yq -i '.cozystack.image = strenv(IMAGE)' values.yaml
+	rm -f images/cozystack.json
 
 image-talos:
 	test -f ../../../_out/assets/installer-amd64.tar || make talos-installer

diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json
diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag
diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json
diff --git a/packages/core/installer/images/matchbox.tag b/packages/core/installer/images/matchbox.tag
diff --git a/packages/core/installer/templates/cozystack.yaml b/packages/core/installer/templates/cozystack.yaml
@@ -49,7 +49,7 @@ spec:
       serviceAccountName: cozystack
       containers:
       - name: cozystack
-        image: "{{ .Files.Get "images/cozystack.tag" | trim }}@{{ index (.Files.Get "images/cozystack.json" | fromJson) "containerimage.digest" }}"
+        image: "{{ .Values.cozystack.image }}"
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: localhost
@@ -68,7 +68,7 @@ spec:
             fieldRef:
               fieldPath: metadata.name
       - name: darkhttpd
-        image: "{{ .Files.Get "images/cozystack.tag" | trim }}@{{ index (.Files.Get "images/cozystack.json" | fromJson) "containerimage.digest" }}"
+        image: "{{ .Values.cozystack.image }}"
         command:
         - /usr/bin/darkhttpd
         - /cozystack/assets

diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml
@@ -0,0 +1,2 @@
+cozystack:
+  image: ghcr.io/aenix-io/cozystack/cozystack:latest@sha256:b92988122fa68adc85751384170a46895b5761cc5bf27e80b0b53b12b89b6d6c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cozystack:
		image: ghcr.io/aenix-io/cozystack/cozystack:latest@sha256:b92988122fa68adc85751384170a46895b5761cc5bf27e80b0b53b12b89b6d6c