From 9e9144f8dc7ea629dae9579df6fd5539ae57d3f0 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Wed, 7 Feb 2024 17:07:47 +0100 Subject: [PATCH] asdasd Signed-off-by: Andrei Kvapil --- Makefile | 5 +- README.md | 26 +------- packages/apps/http-cache/Makefile | 11 ++-- .../apps/http-cache/images/nginx-cache.json | 14 +++++ .../apps/http-cache/images/nginx-cache.tag | 1 + .../images/{nginx => nginx-cache}/Dockerfile | 0 .../{nginx => nginx-cache}/nginx-reloader.sh | 0 packages/apps/http-cache/images/nginx.json | 4 -- .../templates/nginx/deployment.yaml | 5 +- packages/apps/kubernetes/Makefile | 18 ++++++ .../images/ubuntu-container-disk.json | 4 ++ .../images/ubuntu-container-disk.tag | 1 + .../ubuntu-container-disk}/Dockerfile | 0 .../apps/kubernetes/templates/cluster.yaml | 2 +- packages/core/installer/Makefile | 12 ++-- packages/core/installer/images/installer.json | 8 +-- packages/core/installer/images/installer.tag | 1 + .../core/installer/templates/cozystack.yaml | 5 +- packages/core/talos/Makefile | 27 ++++---- packages/core/talos/hack/gen-profiles.sh | 63 +++++++++++++++++++ packages/core/talos/profiles/initramfs.yaml | 26 ++++++++ packages/core/talos/profiles/installer.yaml | 26 ++++++++ packages/core/talos/profiles/iso.yaml | 26 ++++++++ packages/core/talos/profiles/kernel.yaml | 26 ++++++++ packages/core/talos/versions.env | 10 --- packages/system/dashboard/.helmignore | 2 +- packages/system/dashboard/Makefile | 20 +++--- .../system/dashboard/charts/kubeapps/images | 1 + .../templates/dashboard/deployment.yaml | 2 +- .../templates/kubeappsapis/deployment.yaml | 2 +- .../system/dashboard/images/dashboard.json | 4 +- .../system/dashboard/images/dashboard.tag | 1 + .../dashboard/images/kubeapps-apis.json | 4 +- .../system/dashboard/images/kubeapps-apis.tag | 1 + .../system/dashboard/templates/_helpers.tpl | 13 ++++ 35 files changed, 282 insertions(+), 89 deletions(-) create mode 100644 packages/apps/http-cache/images/nginx-cache.json create mode 100644 packages/apps/http-cache/images/nginx-cache.tag rename packages/apps/http-cache/images/{nginx => nginx-cache}/Dockerfile (100%) rename packages/apps/http-cache/images/{nginx => nginx-cache}/nginx-reloader.sh (100%) delete mode 100644 packages/apps/http-cache/images/nginx.json create mode 100644 packages/apps/kubernetes/Makefile create mode 100644 packages/apps/kubernetes/images/ubuntu-container-disk.json create mode 100644 packages/apps/kubernetes/images/ubuntu-container-disk.tag rename packages/apps/kubernetes/{image/ubuntu => images/ubuntu-container-disk}/Dockerfile (100%) create mode 100644 packages/core/installer/images/installer.tag create mode 100755 packages/core/talos/hack/gen-profiles.sh create mode 100644 packages/core/talos/profiles/initramfs.yaml create mode 100644 packages/core/talos/profiles/installer.yaml create mode 100644 packages/core/talos/profiles/iso.yaml create mode 100644 packages/core/talos/profiles/kernel.yaml delete mode 100644 packages/core/talos/versions.env create mode 120000 packages/system/dashboard/charts/kubeapps/images create mode 100644 packages/system/dashboard/images/dashboard.tag create mode 100644 packages/system/dashboard/images/kubeapps-apis.tag create mode 100644 packages/system/dashboard/templates/_helpers.tpl diff --git a/Makefile b/Makefile index 5b7005bf..e0d3e4a4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: manifests repos +.PHONY: manifests repos assets manifests: (cd packages/core/installer/; helm template -n cozy-installer installer .) > manifests/cozystack-installer.yaml @@ -10,3 +10,6 @@ repos: make -C packages/system repo make -C packages/apps repo make -C packages/extra repo + +assets: + make -C packages/core/talos/ assets diff --git a/README.md b/README.md index 907dd754..fdc82dd9 100644 --- a/README.md +++ b/README.md @@ -30,26 +30,6 @@ Any Linux system installed on it (eg. Ubuntu should be enough) **Note:** The VM should support `x86-64-v2` architecture, the most probably you can achieve this by setting cpu model to `host` -### Preapre Talos image for your infrastructure - -(later this will be automated) - -``` -docker run --rm -t \ - -v $PWD/_out:/out -v /dev:/dev --privileged ghcr.io/siderolabs/imager:v1.6.2 installer \ - --system-extension-image=ghcr.io/siderolabs/qlogic-firmware:20240115 \ - --system-extension-image=ghcr.io/siderolabs/bnx2-bnx2x:20240115 \ - --system-extension-image=ghcr.io/siderolabs/drbd:9.2.6-v1.6.2 \ - --system-extension-image=ghcr.io/siderolabs/zfs:2.1.14-v1.6.2 - -docker load -i _out/installer-amd64.tar - -docker tag ghcr.io/siderolabs/installer:v1.6.2 ghcr.io/kvaps/test:cozystack-talos-v1.6.2 - -docker push ghcr.io/kvaps/test:cozystack-talos-v1.6.2 -``` - - ### Netboot server Write configuration: @@ -58,9 +38,9 @@ Write configuration: mkdir -p matchbox/assets matchbox/groups matchbox/profiles wget -O matchbox/assets/initramfs.xz \ - https://github.com/siderolabs/talos/releases/download/v1.6.0/initramfs-amd64.xz + https://github.com/aenix-io/cozystack/releases/download/v0.0.1/initramfs-metal-amd64.xz wget -O matchbox/assets/vmlinuz \ - https://github.com/siderolabs/talos/releases/download/v1.6.0/vmlinuz-amd64 + https://github.com/aenix-io/cozystack/releases/download/v0.0.1/kernel-amd64 cat > matchbox/groups/default.json < images/nginx-cache.tag update: tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/chrislim2888/IP2Location-C-Library | awk -F'[/^]' 'END{print $$3}') && \ diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json new file mode 100644 index 00000000..ea644a3c --- /dev/null +++ b/packages/apps/http-cache/images/nginx-cache.json @@ -0,0 +1,14 @@ +{ + "containerimage.config.digest": "sha256:d68641167af14b246e0332c14a7a9d9f6c0a4f813881db2de5fc53816bd35786", + "containerimage.descriptor": { + "mediaType": "application/vnd.docker.distribution.manifest.v2+json", + "digest": "sha256:241da53aba9b121d5d1829744a9ba31036cd5e5ffd6cf584da8113ddd79764f2", + "size": 1093, + "platform": { + "architecture": "amd64", + "os": "linux" + } + }, + "containerimage.digest": "sha256:241da53aba9b121d5d1829744a9ba31036cd5e5ffd6cf584da8113ddd79764f2", + "image.name": "ghcr.io/aenix-io/cozystack/nginx-cache:v0.0.1" +} \ No newline at end of file diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag new file mode 100644 index 00000000..63b199f0 --- /dev/null +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/nginx:v0.0.1 diff --git a/packages/apps/http-cache/images/nginx/Dockerfile b/packages/apps/http-cache/images/nginx-cache/Dockerfile similarity index 100% rename from packages/apps/http-cache/images/nginx/Dockerfile rename to packages/apps/http-cache/images/nginx-cache/Dockerfile diff --git a/packages/apps/http-cache/images/nginx/nginx-reloader.sh b/packages/apps/http-cache/images/nginx-cache/nginx-reloader.sh similarity index 100% rename from packages/apps/http-cache/images/nginx/nginx-reloader.sh rename to packages/apps/http-cache/images/nginx-cache/nginx-reloader.sh diff --git a/packages/apps/http-cache/images/nginx.json b/packages/apps/http-cache/images/nginx.json deleted file mode 100644 index 46348f67..00000000 --- a/packages/apps/http-cache/images/nginx.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "containerimage.config.digest": "sha256:b1916dbacb372ed89ea3f920f08ee68730be2edc016f2caa373a7bbfbad25845", - "containerimage.digest": "sha256:f77d5b63f1ed9dfda4725696d9170130939219a2465260b6ba941947460de2da" -} \ No newline at end of file diff --git a/packages/apps/http-cache/templates/nginx/deployment.yaml b/packages/apps/http-cache/templates/nginx/deployment.yaml index 6e457117..175b393a 100644 --- a/packages/apps/http-cache/templates/nginx/deployment.yaml +++ b/packages/apps/http-cache/templates/nginx/deployment.yaml @@ -1,4 +1,3 @@ -{{ $imageNginx := .Files.Get "images/nginx.json" | fromJson }} --- apiVersion: policy/v1 kind: PodDisruptionBudget @@ -53,7 +52,7 @@ spec: shareProcessNamespace: true containers: - name: nginx - image: "ghcr.io/aenix-io/cozystack/nginx-cache:latest@{{ index $imageNginx "containerimage.digest" }}" + image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}@{{ index ($.Files.Get "images/nginx-cache.json" | fromJson) "containerimage.digest" }}" readinessProbe: httpGet: path: /healthz @@ -82,7 +81,7 @@ spec: - mountPath: /run name: run - name: reloader - image: "ghcr.io/aenix-io/cozystack/nginx-cache:latest@{{ index $imageNginx "containerimage.digest" }}" + image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}@{{ index ($.Files.Get "images/nginx-cache.json" | fromJson) "containerimage.digest" }}" command: ["/usr/bin/nginx-reloader.sh"] #command: ["sleep", "infinity"] volumeMounts: diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile new file mode 100644 index 00000000..d48cb999 --- /dev/null +++ b/packages/apps/kubernetes/Makefile @@ -0,0 +1,18 @@ +PUSH := 1 +LOAD := 0 +REGISTRY := ghcr.io/aenix-io/cozystack +TAG := v0.0.1 +UBUNTU_CONTAINER_DISK_TAG = v1.29.1 + +image: image-ubuntu-container-disk + +image-ubuntu-container-disk: + docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/ubuntu-container-disk \ + --provenance false \ + --tag $(REGISTRY)/ubuntu-container-disk:$(TAG)-$(UBUNTU_CONTAINER_DISK_TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/ubuntu-container-disk:$(UBUNTU_CONTAINER_DISK_TAG) \ + --cache-to type=inline \ + --metadata-file images/ubuntu-container-disk.json \ + --push=$(PUSH) \ + --load=$(LOAD) + echo "$(REGISTRY)/ubuntu-container-disk:$(UBUNTU_CONTAINER_DISK_TAG)" > images/ubuntu-container-disk.tag diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json new file mode 100644 index 00000000..f0953889 --- /dev/null +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.json @@ -0,0 +1,4 @@ +{ + "containerimage.config.digest": "sha256:e982cfa2320d3139ed311ae44bcc5ea18db7e4e76d2746e0af04c516288ff0f1", + "containerimage.digest": "sha256:34f6aba5b5a2afbb46bbb891ef4ddc0855c2ffe4f9e5a99e8e553286ddd2c070" +} \ No newline at end of file diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.tag b/packages/apps/kubernetes/images/ubuntu-container-disk.tag new file mode 100644 index 00000000..c2389748 --- /dev/null +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.29.1 diff --git a/packages/apps/kubernetes/image/ubuntu/Dockerfile b/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile similarity index 100% rename from packages/apps/kubernetes/image/ubuntu/Dockerfile rename to packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 0c474a1b..ee45816d 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -116,7 +116,7 @@ spec: evictionStrategy: External volumes: - containerDisk: - image: ghcr.io/kvaps/test:ubuntu-2204-container-disk-v1.29.1-2 + image: "{{ $.Files.Get "images/ubuntu-container-disk.tag" | trim }}@{{ index ($.Files.Get "images/ubuntu-container-disk.json" | fromJson) "containerimage.digest" }}" name: containervolume --- apiVersion: cluster.x-k8s.io/v1beta1 diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index d3be9fe3..894aa09a 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -1,7 +1,9 @@ NAMESPACE=cozy-installer NAME=installer -PUSH=1 -LOAD=0 +PUSH := 1 +LOAD := 0 +REGISTRY := ghcr.io/aenix-io/cozystack +TAG := v0.0.1 show: helm template -n $(NAMESPACE) $(NAME) . @@ -15,10 +17,10 @@ diff: image: docker buildx build -f images/installer/Dockerfile ../../.. \ --provenance false \ - --tag ghcr.io/aenix-io/cozystack/installer:latest \ - --cache-from type=registry,ref=ghcr.io/aenix-io/cozystack/installer:latest \ + --tag $(REGISTRY)/installer:$(TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/installer:$(TAG) \ --cache-to type=inline \ --metadata-file images/installer.json \ --push=$(PUSH) \ --load=$(LOAD) - + echo "$(REGISTRY)/installer:$(TAG)" > images/installer.tag diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index 9942e7de..b289f6b8 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:8fb299f31e9655056fb1326400f39d9f84f848daf14a270c60e871b8da617de8", + "containerimage.config.digest": "sha256:2cef76bb260c9a5fb0c7685e76e4bd311ab1decbe5611078beb5b292ec4ac38b", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:4939b5347be6a7b4209c8f14fffe87840c076588938d64248c99cedd6bb6dd3f", + "digest": "sha256:d9458837b3ea4fd207c3e36cd0f2c296ab05f1bdad53747fb71b3f6e0635581f", "size": 2074, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:4939b5347be6a7b4209c8f14fffe87840c076588938d64248c99cedd6bb6dd3f", - "image.name": "ghcr.io/aenix-io/cozystack/installer:latest" + "containerimage.digest": "sha256:d9458837b3ea4fd207c3e36cd0f2c296ab05f1bdad53747fb71b3f6e0635581f", + "image.name": "ghcr.io/aenix-io/cozystack/installer:v0.0.1" } \ No newline at end of file diff --git a/packages/core/installer/images/installer.tag b/packages/core/installer/images/installer.tag new file mode 100644 index 00000000..8a201869 --- /dev/null +++ b/packages/core/installer/images/installer.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/installer:v0.0.1 diff --git a/packages/core/installer/templates/cozystack.yaml b/packages/core/installer/templates/cozystack.yaml index 05762a6b..4dbbe5b2 100644 --- a/packages/core/installer/templates/cozystack.yaml +++ b/packages/core/installer/templates/cozystack.yaml @@ -1,4 +1,3 @@ -{{ $image := .Files.Get "images/installer.json" | fromJson }} --- apiVersion: v1 kind: Namespace @@ -53,14 +52,14 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "{{ index $image "image.name" }}@{{ index $image "containerimage.digest" }}" + image: "{{ .Files.Get "images/installer.tag" | trim }}@{{ index (.Files.Get "images/installer.json" | fromJson) "containerimage.digest" }}" env: - name: KUBERNETES_SERVICE_HOST value: localhost - name: KUBERNETES_SERVICE_PORT value: "7445" - name: darkhttpd - image: "{{ index $image "image.name" }}@{{ index $image "containerimage.digest" }}" + image: "{{ .Files.Get "images/installer.tag" | trim }}@{{ index (.Files.Get "images/installer.json" | fromJson) "containerimage.digest" }}" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/core/talos/Makefile b/packages/core/talos/Makefile index 35986563..7f911c78 100644 --- a/packages/core/talos/Makefile +++ b/packages/core/talos/Makefile @@ -1,18 +1,15 @@ -include versions.env +TALOS_VERSION=$(shell awk '/^version:/ {print $$2}' profiles/installer.yaml) -gen-versions: - hack/gen-versions.sh | tee versions.env +gen-profiles: + hack/gen-profiles.sh + +assets: kernel initramfs iso + +initramfs kernel installer iso: + cat profiles/$@.yaml | docker run --rm -i -v $${PWD}/../../../_out/images:/out -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" - image: - docker run --rm \ - -v $${PWD}/../../../_out/images:/out -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" \ - --system-extension-image=ghcr.io/siderolabs/amd-ucode:$(AMD_UCODE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/amdgpu-firmware:$(AMDGPU_FIRMWARE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/bnx2-bnx2x:$(BNX2_BNX2X_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/i915-ucode:$(I915_UCODE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/intel-ice-firmware:$(INTEL_ICE_FIRMWARE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/intel-ucode:$(INTEL_UCODE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/qlogic-firmware:$(QLOGIC_FIRMWARE_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/drbd:$(DRBD_VERSION) \ - --system-extension-image=ghcr.io/siderolabs/zfs:$(ZFS_VERSION) \ - installer + test -f ../../../_out/images/installer-amd64.tar || make installer + docker load -i ../../../_out/images/installer-amd64.tar + docker tag ghcr.io/siderolabs/installer:$(TALOS_VERSION) ghcr.io/aenix-io/cozystack/talos:$(TALOS_VERSION) + docker push ghcr.io/aenix-io/cozystack/talos:$(TALOS_VERSION) diff --git a/packages/core/talos/hack/gen-profiles.sh b/packages/core/talos/hack/gen-profiles.sh new file mode 100755 index 00000000..3423ee58 --- /dev/null +++ b/packages/core/talos/hack/gen-profiles.sh @@ -0,0 +1,63 @@ +#!/bin/sh +set -e +set -u + +PROFILES="initramfs kernel iso installer" +FIRMWARES="amd-ucode amdgpu-firmware bnx2-bnx2x i915-ucode intel-ice-firmware intel-ucode qlogic-firmware" +EXTENSIONS="drbd zfs" + +mkdir -p profiles + +printf "fetching talos version: " +talos_version=${1:-$(skopeo --override-os linux --override-arch amd64 list-tags docker://ghcr.io/siderolabs/imager | jq -r '.Tags[]' | grep '^v[0-9]\+.[0-9]\+.[0-9]\+$' | sort -V | tail -n 1)} +echo "$talos_version" + +export "TALOS_VERSION=$talos_version" + +for firmware in $FIRMWARES; do + printf "fetching %s version: " "$firmware" + firmware_var=$(echo "$firmware" | tr '[:lower:]' '[:upper:]' | tr - _)_VERSION + version=$(skopeo list-tags docker://ghcr.io/siderolabs/$firmware | jq -r '.Tags[]|select(length == 8)|select(startswith("20"))' | sort -V | tail -n 1) + echo "$version" + export "$firmware_var=$version" +done + +for extension in $EXTENSIONS; do + printf "fetching %s version: " "$extension" + extension_var=$(echo "$extension" | tr '[:lower:]' '[:upper:]' | tr - _)_VERSION + version=$(skopeo --override-os linux --override-arch amd64 list-tags docker://ghcr.io/siderolabs/$extension | jq -r '.Tags[]' | grep "\-${talos_version}$" | sort -V | tail -n1) + echo "$version" + export "$extension_var=$version" +done + +for profile in $PROFILES; do + echo "writing profile profiles/$profile.yaml" + cat > profiles/$profile.yaml < images/dashboard.tag image-kubeapps-apis: docker buildx build images/kubeapps-apis \ --provenance false \ - --tag ghcr.io/aenix-io/cozystack/kubeapps-apis:latest \ - --cache-from type=registry,ref=ghcr.io/aenix-io/cozystack/kubeapps-apis:latest \ + --tag $(REPOSITORY)/kubeapps-apis:$(TAG) \ + --cache-from type=registry,ref=$(REPOSITORY)/kubeapps-apis:$(TAG) \ --cache-to type=inline \ --metadata-file images/kubeapps-apis.json \ --push=$(PUSH) \ --load=$(LOAD) + echo "$(REPOSITORY)/kubeapps-apis:$(TAG)" > images/kubeapps-apis.tag diff --git a/packages/system/dashboard/charts/kubeapps/images b/packages/system/dashboard/charts/kubeapps/images new file mode 120000 index 00000000..5fa69870 --- /dev/null +++ b/packages/system/dashboard/charts/kubeapps/images @@ -0,0 +1 @@ +../../images \ No newline at end of file diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/deployment.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/deployment.yaml index 7aff5e13..12b27876 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/deployment.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/deployment.yaml @@ -70,7 +70,7 @@ spec: {{- end }} containers: - name: dashboard - image: ghcr.io/aenix-io/cozystack/dashboard:latest@sha256:9cafd6b4e86ddba373018e574d1076aa3b193f2a60c98e1dea98ddbf36b4b055 + image: {{ include "kubeapps.dashboard.image" . }} imagePullPolicy: {{ .Values.dashboard.image.pullPolicy | quote }} {{- if .Values.dashboard.containerSecurityContext.enabled }} securityContext: {{- omit .Values.dashboard.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml b/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml index 9340d1e3..38e40ddb 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/kubeappsapis/deployment.yaml @@ -71,7 +71,7 @@ spec: {{- end }} containers: - name: kubeappsapis - image: ghcr.io/aenix-io/cozystack/kubeapps-apis:latest@sha256:adcd4fda6a1e9384576edf3b539ae629fe8ce0cd764544f35e045666b5f35c93 + image: {{ include "kubeapps.kubeappsapis.image" . }} imagePullPolicy: {{ .Values.kubeappsapis.image.pullPolicy | quote }} {{- if .Values.kubeappsapis.containerSecurityContext.enabled }} securityContext: {{- omit .Values.kubeappsapis.containerSecurityContext "enabled" | toYaml | nindent 12 }} diff --git a/packages/system/dashboard/images/dashboard.json b/packages/system/dashboard/images/dashboard.json index 31d948aa..448617b9 100644 --- a/packages/system/dashboard/images/dashboard.json +++ b/packages/system/dashboard/images/dashboard.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:3306c2b22c5514525c4657ede97e8921c7f160bb42ad713261a7edf2d86f772c", - "containerimage.digest": "sha256:9cafd6b4e86ddba373018e574d1076aa3b193f2a60c98e1dea98ddbf36b4b055" + "containerimage.config.digest": "sha256:f5a26c90226016af3a23d5fdb8b23d36b0aca97b1b2a8a1de2e37cc9d5dfeb04", + "containerimage.digest": "sha256:c71ed8953381d8fba2aebd79d538bfc0a6933910ed626afc850c4dbef4a15182" } \ No newline at end of file diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag new file mode 100644 index 00000000..1b11f26f --- /dev/null +++ b/packages/system/dashboard/images/dashboard.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/dashboard:v0.0.1 diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index fb011c37..ffaf0a3a 100644 --- a/packages/system/dashboard/images/kubeapps-apis.json +++ b/packages/system/dashboard/images/kubeapps-apis.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:3d9f31dfa89204482aff36a87f2a6cb6b2279ac2e894ded905e4c4c57bc00715", - "containerimage.digest": "sha256:adcd4fda6a1e9384576edf3b539ae629fe8ce0cd764544f35e045666b5f35c93" + "containerimage.config.digest": "sha256:87c3ac99ed10ee9cf29ca01ec3a00da11f336a614ea98c48da04cd7349e13454", + "containerimage.digest": "sha256:d286c9be6baba35fc4b5dacd8701999b490a82fef42a1c52d0d65ced8bb07b51" } \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag new file mode 100644 index 00000000..af6d5e9a --- /dev/null +++ b/packages/system/dashboard/images/kubeapps-apis.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.0.1 diff --git a/packages/system/dashboard/templates/_helpers.tpl b/packages/system/dashboard/templates/_helpers.tpl new file mode 100644 index 00000000..55e735db --- /dev/null +++ b/packages/system/dashboard/templates/_helpers.tpl @@ -0,0 +1,13 @@ +{{/* +Return the proper dashboard image name +*/}} +{{- define "kubeapps.dashboard.image" -}} +{{ .Files.Get "images/dashboard.tag" | trim }}@{{ index (.Files.Get "images/dashboard.json" | fromJson) "containerimage.digest" }} +{{- end -}} + +{{/* +Return the proper kubeappsapis image name +*/}} +{{- define "kubeapps.kubeappsapis.image" -}} +{{ .Files.Get "images/kubeapps-apis.tag" | trim }}@{{ index (.Files.Get "images/kubeapps-apis.json" | fromJson) "containerimage.digest" }} +{{- end -}}