From 1c6de1ccf50989b27442491f8a0d295490aa38c4 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 20 Feb 2024 12:24:39 +0100 Subject: [PATCH] Preapre release v0.1.0 (#25) --- manifests/cozystack-installer.yaml | 18 +++++++++++---- packages/apps/http-cache/Makefile | 2 +- .../apps/http-cache/images/nginx-cache.json | 14 ++---------- packages/apps/kubernetes/Makefile | 2 +- .../images/ubuntu-container-disk.json | 4 ++-- packages/core/installer/Makefile | 22 ++++++++++--------- packages/core/installer/images/cozystack.json | 4 ++++ packages/core/installer/images/cozystack.tag | 1 + .../{installer => cozystack}/Dockerfile | 0 .../Dockerfile.dockerignore | 0 packages/core/installer/images/installer.json | 14 ------------ packages/core/installer/images/installer.tag | 1 - packages/core/installer/images/matchbox.json | 14 ++---------- packages/core/installer/images/matchbox.tag | 2 +- .../core/installer/templates/cozystack.yaml | 4 ++-- packages/system/dashboard/Makefile | 2 +- .../system/dashboard/images/dashboard.json | 4 ++-- .../system/dashboard/images/dashboard.tag | 2 +- .../dashboard/images/kubeapps-apis.json | 4 ++-- .../system/dashboard/images/kubeapps-apis.tag | 2 +- 20 files changed, 49 insertions(+), 67 deletions(-) create mode 100644 packages/core/installer/images/cozystack.json create mode 100644 packages/core/installer/images/cozystack.tag rename packages/core/installer/images/{installer => cozystack}/Dockerfile (100%) rename packages/core/installer/images/{installer => cozystack}/Dockerfile.dockerignore (100%) delete mode 100644 packages/core/installer/images/installer.json delete mode 100644 packages/core/installer/images/installer.tag diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index 7cc2d335..88392799 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -61,8 +61,6 @@ spec: selector: matchLabels: app: cozystack - strategy: - type: Recreate template: metadata: labels: @@ -72,14 +70,26 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/installer:v0.0.2" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.1.0" env: - name: KUBERNETES_SERVICE_HOST value: localhost - name: KUBERNETES_SERVICE_PORT value: "7445" + - name: K8S_AWAIT_ELECTION_ENABLED + value: "1" + - name: K8S_AWAIT_ELECTION_NAME + value: cozystack + - name: K8S_AWAIT_ELECTION_LOCK_NAME + value: cozystack + - name: K8S_AWAIT_ELECTION_LOCK_NAMESPACE + value: cozy-system + - name: K8S_AWAIT_ELECTION_IDENTITY + valueFrom: + fieldRef: + fieldPath: metadata.name - name: darkhttpd - image: "ghcr.io/aenix-io/cozystack/installer:v0.0.2" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.1.0" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/apps/http-cache/Makefile b/packages/apps/http-cache/Makefile index e1ab4489..30e9f35d 100644 --- a/packages/apps/http-cache/Makefile +++ b/packages/apps/http-cache/Makefile @@ -2,7 +2,7 @@ PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack NGINX_CACHE_TAG = v0.1.0 -TAG := v0.0.2 +TAG := v0.1.0 image: image-nginx diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json index 2742b79c..00da1cf1 100644 --- a/packages/apps/http-cache/images/nginx-cache.json +++ b/packages/apps/http-cache/images/nginx-cache.json @@ -1,14 +1,4 @@ { - "containerimage.config.digest": "sha256:f4ad0559a74749de0d11b1835823bf9c95332962b0909450251d849113f22c19", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:3a0e8d791e0ccf681711766387ea9278e7d39f1956509cead2f72aa0001797ef", - "size": 1093, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:3a0e8d791e0ccf681711766387ea9278e7d39f1956509cead2f72aa0001797ef", - "image.name": "ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0,ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0-v0.0.2" + "containerimage.config.digest": "sha256:318fd8d0d6f6127387042f6ad150e87023d1961c7c5059dd5324188a54b0ab4e", + "containerimage.digest": "sha256:e3cf145238e6e45f7f13b9acaea445c94ff29f76a34ba9fa50828401a5a3cc68" } \ No newline at end of file diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile index f4de5fdc..254c351a 100644 --- a/packages/apps/kubernetes/Makefile +++ b/packages/apps/kubernetes/Makefile @@ -1,7 +1,7 @@ PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack -TAG := v0.0.2 +TAG := v0.1.0 UBUNTU_CONTAINER_DISK_TAG = v1.29.1 image: image-ubuntu-container-disk diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json index f0953889..98715d56 100644 --- a/packages/apps/kubernetes/images/ubuntu-container-disk.json +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:e982cfa2320d3139ed311ae44bcc5ea18db7e4e76d2746e0af04c516288ff0f1", - "containerimage.digest": "sha256:34f6aba5b5a2afbb46bbb891ef4ddc0855c2ffe4f9e5a99e8e553286ddd2c070" + "containerimage.config.digest": "sha256:ee8968be63c7c45621ec45f3687211e0875acb24e8d9784e8d2ebcbf46a3538c", + "containerimage.digest": "sha256:16c3c07e74212585786dc1f1ae31d3ab90a575014806193e8e37d1d7751cb084" } \ No newline at end of file diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index ebb1b5f9..4a0da149 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -3,7 +3,7 @@ NAME=installer PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack -TAG := v0.0.2 +TAG := v0.1.0 TALOS_VERSION=$(shell awk '/^version:/ {print $$2}' images/talos/profiles/installer.yaml) show: @@ -18,19 +18,18 @@ diff: update: hack/gen-profiles.sh -image: image-installer image-talos image-matchbox +image: image-cozystack image-talos image-matchbox -image-installer: - docker buildx build -f images/installer/Dockerfile ../../.. \ +image-cozystack: + docker buildx build -f images/cozystack/Dockerfile ../../.. \ --provenance false \ - --tag $(REGISTRY)/installer:$(TAG) \ - --tag $(REGISTRY)/installer:$(TALOS_VERSION)-$(TAG) \ - --cache-from type=registry,ref=$(REGISTRY)/installer:$(TALOS_VERSION) \ + --tag $(REGISTRY)/cozystack:$(TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/cozystack:$(TAG) \ --cache-to type=inline \ - --metadata-file images/installer.json \ + --metadata-file images/cozystack.json \ --push=$(PUSH) \ --load=$(LOAD) - echo "$(REGISTRY)/installer:$(TALOS_VERSION)" > images/installer.tag + echo "$(REGISTRY)/cozystack:$(TAG)" > images/cozystack.tag image-talos: test -f ../../../_out/assets/installer-amd64.tar || make talos-installer @@ -55,4 +54,7 @@ image-matchbox: assets: talos-iso talos-initramfs talos-kernel talos-installer talos-iso: - cat images/talos/profiles/$(subst talos-,,$@).yaml | docker run --rm -i -v $${PWD}/../../../_out/assets:/out -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" - + mkdir -p ../../../_out/assets + cat images/talos/profiles/$(subst talos-,,$@).yaml | \ + docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - | \ + tar -C ../../../_out/assets -xzf- diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json new file mode 100644 index 00000000..15c997e1 --- /dev/null +++ b/packages/core/installer/images/cozystack.json @@ -0,0 +1,4 @@ +{ + "containerimage.config.digest": "sha256:ec8a4983a663f06a1503507482667a206e83e0d8d3663dff60ced9221855d6b0", + "containerimage.digest": "sha256:abb7b2fbc1f143c922f2a35afc4423a74b2b63c0bddfe620750613ed835aa861" +} \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag new file mode 100644 index 00000000..a9145314 --- /dev/null +++ b/packages/core/installer/images/cozystack.tag @@ -0,0 +1 @@ +ghcr.io/aenix-io/cozystack/cozystack:v0.1.0 diff --git a/packages/core/installer/images/installer/Dockerfile b/packages/core/installer/images/cozystack/Dockerfile similarity index 100% rename from packages/core/installer/images/installer/Dockerfile rename to packages/core/installer/images/cozystack/Dockerfile diff --git a/packages/core/installer/images/installer/Dockerfile.dockerignore b/packages/core/installer/images/cozystack/Dockerfile.dockerignore similarity index 100% rename from packages/core/installer/images/installer/Dockerfile.dockerignore rename to packages/core/installer/images/cozystack/Dockerfile.dockerignore diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json deleted file mode 100644 index e819fb59..00000000 --- a/packages/core/installer/images/installer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "containerimage.config.digest": "sha256:5c7f51a9cbc945c13d52157035eba6ba4b6f3b68b76280f8e64b4f6ba239db1a", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:7cda3480faf0539ed4a3dd252aacc7a997645d3a390ece377c36cf55f9e57e11", - "size": 2074, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:7cda3480faf0539ed4a3dd252aacc7a997645d3a390ece377c36cf55f9e57e11", - "image.name": "ghcr.io/aenix-io/cozystack/installer:v0.0.2" -} \ No newline at end of file diff --git a/packages/core/installer/images/installer.tag b/packages/core/installer/images/installer.tag deleted file mode 100644 index 219384ca..00000000 --- a/packages/core/installer/images/installer.tag +++ /dev/null @@ -1 +0,0 @@ -ghcr.io/aenix-io/cozystack/installer:v0.0.2 diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json index a03dd1bb..050bec96 100644 --- a/packages/core/installer/images/matchbox.json +++ b/packages/core/installer/images/matchbox.json @@ -1,14 +1,4 @@ { - "containerimage.config.digest": "sha256:cb8cb211017e51f6eb55604287c45cbf6ed8add5df482aaebff3d493a11b5a76", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:3be72cdce2f4ab4886a70fb7b66e4518a1fe4ba0771319c96fa19a0d6f409602", - "size": 1488, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:3be72cdce2f4ab4886a70fb7b66e4518a1fe4ba0771319c96fa19a0d6f409602", - "image.name": "ghcr.io/aenix-io/cozystack/matchbox:v0.0.2" + "containerimage.config.digest": "sha256:b869a6324f9c0e6d1dd48eee67cbe3842ee14efd59bdde477736ad2f90568ff7", + "containerimage.digest": "sha256:c30b237c5fa4fbbe47e1aba56e8f99569fe865620aa1953f31fc373794123cd7" } \ No newline at end of file diff --git a/packages/core/installer/images/matchbox.tag b/packages/core/installer/images/matchbox.tag index ef369486..43fc7032 100644 --- a/packages/core/installer/images/matchbox.tag +++ b/packages/core/installer/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/matchbox:v0.0.2 +ghcr.io/aenix-io/cozystack/matchbox:v1.6.4 diff --git a/packages/core/installer/templates/cozystack.yaml b/packages/core/installer/templates/cozystack.yaml index 2b1ea8f3..88c3be14 100644 --- a/packages/core/installer/templates/cozystack.yaml +++ b/packages/core/installer/templates/cozystack.yaml @@ -50,7 +50,7 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "{{ .Files.Get "images/installer.tag" | trim }}@{{ index (.Files.Get "images/installer.json" | fromJson) "containerimage.digest" }}" + image: "{{ .Files.Get "images/cozystack.tag" | trim }}@{{ index (.Files.Get "images/cozystack.json" | fromJson) "containerimage.digest" }}" env: - name: KUBERNETES_SERVICE_HOST value: localhost @@ -69,7 +69,7 @@ spec: fieldRef: fieldPath: metadata.name - name: darkhttpd - image: "{{ .Files.Get "images/installer.tag" | trim }}@{{ index (.Files.Get "images/installer.json" | fromJson) "containerimage.digest" }}" + image: "{{ .Files.Get "images/cozystack.tag" | trim }}@{{ index (.Files.Get "images/cozystack.json" | fromJson) "containerimage.digest" }}" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile index c2b25093..a4ef3f79 100644 --- a/packages/system/dashboard/Makefile +++ b/packages/system/dashboard/Makefile @@ -3,7 +3,7 @@ NAMESPACE=cozy-dashboard PUSH := 1 LOAD := 0 REPOSITORY := ghcr.io/aenix-io/cozystack -TAG := v0.0.2 +TAG := v0.1.0 show: helm template --dry-run=server -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/dashboard/images/dashboard.json b/packages/system/dashboard/images/dashboard.json index 448617b9..2fe12136 100644 --- a/packages/system/dashboard/images/dashboard.json +++ b/packages/system/dashboard/images/dashboard.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:f5a26c90226016af3a23d5fdb8b23d36b0aca97b1b2a8a1de2e37cc9d5dfeb04", - "containerimage.digest": "sha256:c71ed8953381d8fba2aebd79d538bfc0a6933910ed626afc850c4dbef4a15182" + "containerimage.config.digest": "sha256:51a28848a801e102b3383e6d980ac2459fa29cfd9cbc381d03c561672e94139d", + "containerimage.digest": "sha256:4b1b4ffc7c797b8fb4ab9561e6fa0a68c00d5b0d945fe47e42ecc6e43e9af0d3" } \ No newline at end of file diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag index b112b276..baa45820 100644 --- a/packages/system/dashboard/images/dashboard.tag +++ b/packages/system/dashboard/images/dashboard.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/dashboard:v0.0.2 +ghcr.io/aenix-io/cozystack/dashboard:v0.1.0 diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index 919ee2d5..2cada49f 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:e87d3b19a59f31b70ae9e67ab9422bf2acf8fe5c6c8c585883be16db39068023", - "containerimage.digest": "sha256:692cd506a2eadf1cf09e94eee60986a379da7a604c4810f89c8f6c5c405c2c73" + "containerimage.config.digest": "sha256:e522ba90c58c3dab629739fe240e42037a50bfc19442d018e957ef54f05aaa77", + "containerimage.digest": "sha256:ea80daaedd7e782bb42641fe25b2c91fc24260b81f8e576637f3d251c9c7d087" } \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag index f5bcd30b..91227d8c 100644 --- a/packages/system/dashboard/images/kubeapps-apis.tag +++ b/packages/system/dashboard/images/kubeapps-apis.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.0.2 +ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.1.0