Remove build artifacts from repository (#266)

Let's use approach suggested by @nbykov0 in #175 We will only update values.yaml and do not store build json artifact The reset charts include this change in - #262 - #263 - #264 - #265 Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
aenix-io · Aug 7, 2024 · cdb60f0 · cdb60f0
1 parent e249914
commit cdb60f0
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 168 deletions.
diff --git a/packages/apps/http-cache/Makefile b/packages/apps/http-cache/Makefile
@@ -14,7 +14,9 @@ image-nginx:
 		--metadata-file images/nginx-cache.json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REGISTRY)/nginx-cache:$(call settag,$(NGINX_CACHE_TAG))" > images/nginx-cache.tag
+	echo "$(REGISTRY)/nginx-cache:$(call settag,$(NGINX_CACHE_TAG))@$$(yq e '."containerimage.digest"' images/nginx-cache.json -o json -r)" \
+		> images/nginx-cache.tag
+	rm -f images/nginx-cache.json
 
 generate:
 	readme-generator -v values.yaml -s values.schema.json -r README.md

diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json
diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag
@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0
+ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0@sha256:f77d5b63f1ed9dfda4725696d9170130939219a2465260b6ba941947460de2da
diff --git a/packages/apps/http-cache/images/nginx.json b/packages/apps/http-cache/images/nginx.json
diff --git a/packages/apps/http-cache/templates/nginx/deployment.yaml b/packages/apps/http-cache/templates/nginx/deployment.yaml
@@ -52,7 +52,7 @@ spec:
       shareProcessNamespace: true
       containers:
       - name: nginx
-        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}@{{ index ($.Files.Get "images/nginx-cache.json" | fromJson) "containerimage.digest" }}"
+        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
         readinessProbe:
           httpGet:
             path: /healthz
@@ -81,7 +81,7 @@ spec:
         - mountPath: /run
           name: run
       - name: reloader
-        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}@{{ index ($.Files.Get "images/nginx-cache.json" | fromJson) "containerimage.digest" }}"
+        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
         command: ["/usr/bin/nginx-reloader.sh"]
         #command: ["sleep", "infinity"]
         volumeMounts:

diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile
@@ -17,4 +17,6 @@ image-ubuntu-container-disk:
 		--metadata-file images/ubuntu-container-disk.json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REGISTRY)/ubuntu-container-disk:$(call settag,$(UBUNTU_CONTAINER_DISK_TAG))" > images/ubuntu-container-disk.tag
+	echo "$(REGISTRY)/ubuntu-container-disk:$(call settag,$(UBUNTU_CONTAINER_DISK_TAG))@$$(yq e '."containerimage.digest"' images/ubuntu-container-disk.json -o json -r)" \
+		> images/ubuntu-container-disk.tag
+	rm -f images/ubuntu-container-disk.json
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.tag b/packages/apps/kubernetes/images/ubuntu-container-disk.tag
@@ -1 +1 @@
-ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1
+ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1@sha256:81caf89efe252ae2ca1990d08a3a314552d70ff36bcd4022b173c7150fbec805
diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml
@@ -45,7 +45,7 @@ spec:
           volumes:
           - name: system
             containerDisk:
-              image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}@{{ index ($.Files.Get "images/ubuntu-container-disk.json" | fromJson) "containerimage.digest" }}"
+              image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}"
           - name: ephemeral
             emptyDisk:
               capacity: {{ .group.ephemeralStorage | default "20Gi" }}

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
@@ -50,7 +52,6 @@ image-matchbox:
 		--metadata-file images/matchbox.json \
 		--push=$(PUSH) \
 		--load=$(LOAD)
-	echo "$(REGISTRY)/matchbox:$(call settag,$(TALOS_VERSION))" > images/matchbox.tag
 
 assets: talos-iso talos-nocloud
 

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
		@@ -1 +1 @@
		ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0
		ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0@sha256:f77d5b63f1ed9dfda4725696d9170130939219a2465260b6ba941947460de2da
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1
		ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.30.1@sha256:81caf89efe252ae2ca1990d08a3a314552d70ff36bcd4022b173c7150fbec805
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