From e245d541b211ef70a28e4ec3d016c55003e05887 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 4 Apr 2024 15:55:58 +0200 Subject: [PATCH] release v0.2.0 (#54) Signed-off-by: Andrei Kvapil --- manifests/cozystack-installer.yaml | 4 ++-- packages/apps/http-cache/images/nginx-cache.json | 4 ++-- .../apps/kubernetes/images/ubuntu-container-disk.json | 4 ++-- packages/core/installer/images/cozystack.json | 4 ++-- packages/core/installer/images/cozystack.tag | 2 +- packages/core/installer/images/matchbox.json | 4 ++-- packages/core/platform/templates/namespaces.yaml | 2 ++ packages/system/dashboard/images/dashboard.json | 4 ++-- packages/system/dashboard/images/kubeapps-apis.json | 4 ++-- scripts/installer.sh | 10 ++++++---- scripts/migrations/1 | 7 +++++++ 11 files changed, 30 insertions(+), 19 deletions(-) diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index 1dba83ff..264a5ee2 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -70,7 +70,7 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.1.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.2.0" env: - name: KUBERNETES_SERVICE_HOST value: localhost @@ -89,7 +89,7 @@ spec: fieldRef: fieldPath: metadata.name - name: darkhttpd - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.1.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.2.0" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json index 00da1cf1..c233a215 100644 --- a/packages/apps/http-cache/images/nginx-cache.json +++ b/packages/apps/http-cache/images/nginx-cache.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:318fd8d0d6f6127387042f6ad150e87023d1961c7c5059dd5324188a54b0ab4e", - "containerimage.digest": "sha256:e3cf145238e6e45f7f13b9acaea445c94ff29f76a34ba9fa50828401a5a3cc68" + "containerimage.config.digest": "sha256:0487fc50bb5f870720b05e947185424a400fad38b682af8f1ca4b418ed3c5b4b", + "containerimage.digest": "sha256:be12f3834be0e2f129685f682fab83c871610985fc43668ce6a294c9de603798" } \ No newline at end of file diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json index 98715d56..9bceece6 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:ee8968be63c7c45621ec45f3687211e0875acb24e8d9784e8d2ebcbf46a3538c", - "containerimage.digest": "sha256:16c3c07e74212585786dc1f1ae31d3ab90a575014806193e8e37d1d7751cb084" + "containerimage.config.digest": "sha256:43d0bfd01c5e364ba961f1e3dc2c7ccd7fd4ca65bd26bc8c4a5298d7ff2c9f4f", + "containerimage.digest": "sha256:908b3c186bee86f1c9476317eb6582d07f19776b291aa068e5642f8fd08fa9e7" } \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json index 15c997e1..5032fb21 100644 --- a/packages/core/installer/images/cozystack.json +++ b/packages/core/installer/images/cozystack.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:ec8a4983a663f06a1503507482667a206e83e0d8d3663dff60ced9221855d6b0", - "containerimage.digest": "sha256:abb7b2fbc1f143c922f2a35afc4423a74b2b63c0bddfe620750613ed835aa861" + "containerimage.config.digest": "sha256:86175d33758c7f8c33396a3bea929c82c4181676e4ab269cfdb57a806d71528f", + "containerimage.digest": "sha256:5fca385a497e8b50d06b5b01dde7dc46289e70c0e8a9eb0604939815c1275e39" } \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag index a9145314..e468bde9 100644 --- a/packages/core/installer/images/cozystack.tag +++ b/packages/core/installer/images/cozystack.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/cozystack:v0.1.0 +ghcr.io/aenix-io/cozystack/cozystack:v0.2.0 diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json index 050bec96..247af820 100644 --- a/packages/core/installer/images/matchbox.json +++ b/packages/core/installer/images/matchbox.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:b869a6324f9c0e6d1dd48eee67cbe3842ee14efd59bdde477736ad2f90568ff7", - "containerimage.digest": "sha256:c30b237c5fa4fbbe47e1aba56e8f99569fe865620aa1953f31fc373794123cd7" + "containerimage.config.digest": "sha256:dc584f743bb73e04dcbebca7ab4f602f2c067190fd9609c3fd84412e83c20445", + "containerimage.digest": "sha256:39ab0bf769b269a8082eeb31a9672e39caa61dd342ba2157b954c642f54a32ff" } \ No newline at end of file diff --git a/packages/core/platform/templates/namespaces.yaml b/packages/core/platform/templates/namespaces.yaml index ec56871e..fd3a58e0 100644 --- a/packages/core/platform/templates/namespaces.yaml +++ b/packages/core/platform/templates/namespaces.yaml @@ -14,6 +14,8 @@ {{- end }} {{- end }} +{{/* Add extra namespaces */}} +{{- $_ := set $namespaces "cozy-public" false }} {{- $_ := set $namespaces "cozy-fluxcd" false }} {{- range $namespace, $privileged := $namespaces }} diff --git a/packages/system/dashboard/images/dashboard.json b/packages/system/dashboard/images/dashboard.json index 8c2b8edf..1d139796 100644 --- a/packages/system/dashboard/images/dashboard.json +++ b/packages/system/dashboard/images/dashboard.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:c4bfb560aaa8f9bae1da00fa4b49b3e1fc993606902e47c155238f2b002fadce", - "containerimage.digest": "sha256:974cbeedb328e71aeb2b45970ebc1bcbbdcbdc0ed034a9d3d37924530f66b938" + "containerimage.config.digest": "sha256:89b67f6def744d8f497fd07e2743f1ff6f808983f4a5914cce62dbc8b045f9c4", + "containerimage.digest": "sha256:76b47055b4559a20362248ba1f684d41d2299e752665f09d606d5d07fd7c8c32" } \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index 974d82c8..fea240fe 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:992221768278b67a64b52d4e8bc847f18c8e4be746ac7197be9bbfd4fd092b24", - "containerimage.digest": "sha256:6fb48ec9b50422bdd843584cd4db6ee07618ce535fde23903560d2529e4da31a" + "containerimage.config.digest": "sha256:8e9b42041ea86be05df5106bd7d3f881dda920a34a5f95b30c6affa8575275cf", + "containerimage.digest": "sha256:0a41fe424f7a042f5442152c2fc196622fd49426c958ff17b15b5b9060c8d86b" } \ No newline at end of file diff --git a/scripts/installer.sh b/scripts/installer.sh index 4d7607b0..e9eefdca 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -1,11 +1,14 @@ #!/bin/sh -VERSION=2 set -o pipefail set -e +BUNDLE=$(set -x; kubectl get configmap -n cozy-system cozystack -o 'go-template={{index .data "bundle-name"}}') +VERSION=2 + run_migrations() { if ! kubectl get configmap -n cozy-system cozystack-version; then kubectl create configmap -n cozy-system cozystack-version --from-literal=version="$VERSION" --dry-run=client -o yaml | kubectl create -f- + return fi current_version=$(kubectl get configmap -n cozy-system cozystack-version -o jsonpath='{.data.version}') || true until [ "$current_version" = "$VERSION" ]; do @@ -20,11 +23,10 @@ flux_is_ok() { } install_basic_charts() { - bundle=$(kubectl get configmap -n cozy-system cozystack -o 'go-template={{index .data "bundle-name"}}') - if [ "$bundle" = "paas-full" ] || [ "$bundle" = "distro-full" ]; then + if [ "$BUNDLE" = "paas-full" ] || [ "$BUNDLE" = "distro-full" ]; then make -C packages/system/cilium apply fi - if [ "$bundle" = "paas-full" ]; then + if [ "$BUNDLE" = "paas-full" ]; then make -C packages/system/kubeovn apply fi } diff --git a/scripts/migrations/1 b/scripts/migrations/1 index eb460c8c..d2be8ce2 100755 --- a/scripts/migrations/1 +++ b/scripts/migrations/1 @@ -14,5 +14,12 @@ if kubectl get hr -n cozy-fluxcd cozy-fluxcd 2>/dev/null; then fi kubectl delete secret -n cozy-fluxcd -l name=fluxcd +# Fix kubeovn crds +kubeovn_crds=$(kubectl get crd -o name | grep '\.kubeovn\.io$') +if [ -n "$kubeovn_crds" ]; then + kubectl annotate $kubeovn_crds meta.helm.sh/release-namespace=cozy-kubeovn meta.helm.sh/release-name=kubeovn + kubectl label $kubeovn_crds app.kubernetes.io/managed-by=Helm +fi + # Write version to cozystack-version config kubectl create configmap -n cozy-system cozystack-version --from-literal=version=2 --dry-run=client -o yaml | kubectl apply -f-