diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index e58b44db..c3186105 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -54,6 +54,11 @@ spec: selector: matchLabels: app: cozystack + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 0 + maxUnavailable: 1 template: metadata: labels: @@ -63,7 +68,7 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.4.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.5.0" env: - name: KUBERNETES_SERVICE_HOST value: localhost @@ -82,7 +87,7 @@ spec: fieldRef: fieldPath: metadata.name - name: darkhttpd - image: "ghcr.io/aenix-io/cozystack/cozystack:v0.4.0" + image: "ghcr.io/aenix-io/cozystack/cozystack:v0.5.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 fb130a5e..4314d5f3 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:2be806d1d79cbb979b71774d75e610ebbaf1c22608402249a83e043860d754c7", - "containerimage.digest": "sha256:49e22533ee97b90a716923aebf5f2654c4a8b47db0b2fab9daf8ecc34c40e7d0" + "containerimage.config.digest": "sha256:fbf82620e58e1502946ab32b5b11ada483f06c0c903d6a532a46ab842f913555", + "containerimage.digest": "sha256:f51a4f2f3d9452ead2c77e3a85a29167d08d86e924196b250c5f7d3b8ebf990c" } \ 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 a793874a..70490771 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:a7e8e6e35ac07bcf6253c9cfcf21fd3c315bd0653ad0427dd5f0cae95ffd3722", - "containerimage.digest": "sha256:c03bffeeb70fe7dd680d2eca3021d2405fbcd9961dd38437f5673560c31c72cc" + "containerimage.config.digest": "sha256:77f663f46e86e66579e9025bb96511b9f547470bbd78716c11f9ccc25587c597", + "containerimage.digest": "sha256:e3e5e5ec8732c5d585ccba38fd457dc9bf0b0d9bc394131c19934c2c11b66ec9" } \ No newline at end of file diff --git a/packages/apps/mysql/templates/mariadb.yaml b/packages/apps/mysql/templates/mariadb.yaml index 185e0a41..61dbd0f2 100644 --- a/packages/apps/mysql/templates/mariadb.yaml +++ b/packages/apps/mysql/templates/mariadb.yaml @@ -4,9 +4,11 @@ kind: MariaDB metadata: name: {{ .Release.Name }} spec: + {{- if (and .Values.users.root .Values.users.root.password) }} rootPasswordSecretKeyRef: name: {{ .Release.Name }} key: root-password + {{- end }} image: "mariadb:11.0.2" diff --git a/packages/apps/mysql/templates/secret.yaml b/packages/apps/mysql/templates/secret.yaml index b4d87862..821b3a00 100644 --- a/packages/apps/mysql/templates/secret.yaml +++ b/packages/apps/mysql/templates/secret.yaml @@ -7,11 +7,3 @@ stringData: {{- range $name, $u := .Values.users }} {{ $name }}-password: {{ $u.password }} {{- end }} - {{- if not (and .Values.users.root .Values.users.root.password) }} - {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace .Release.Name }} - {{- if and $existingSecret (index $existingSecret.data "root-password") }} - root-password: {{ index $existingSecret.data "root-password" }} - {{- else }} - root-password: {{ randAlphaNum 10 }} - {{- end }} - {{- end }} diff --git a/packages/core/installer/images/cozystack.json b/packages/core/installer/images/cozystack.json index 4b535def..ebbb5138 100644 --- a/packages/core/installer/images/cozystack.json +++ b/packages/core/installer/images/cozystack.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:cf9793f2de9d8f1400234a73f9446f3f9876b807463dae985d3cef4aafb33aae", - "containerimage.digest": "sha256:ce3d54b388d9027ed6ca2d3d67b1759e9f061e5736f61a75d586f33a1ee19fa4" + "containerimage.config.digest": "sha256:dac122af1e85d9d668e0a0260d08bb80892f1087b09fb4a4ace2e568257889d2", + "containerimage.digest": "sha256:bc9029117d985748290b88839082b65b28aaa718b694ff686d6cf49971be424f" } \ No newline at end of file diff --git a/packages/core/installer/images/cozystack.tag b/packages/core/installer/images/cozystack.tag index bf9be686..ac4f6a03 100644 --- a/packages/core/installer/images/cozystack.tag +++ b/packages/core/installer/images/cozystack.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/cozystack:v0.4.0 +ghcr.io/aenix-io/cozystack/cozystack:v0.5.0 diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json index 046265bb..bae7399c 100644 --- a/packages/core/installer/images/matchbox.json +++ b/packages/core/installer/images/matchbox.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:68ea72fcc581352fabfd87fa6fd482968cc85ee520cab7a614f1244d7ae36eb0", - "containerimage.digest": "sha256:cea915e08a19eb6892f3facf3b3648368cd4a05abefc49bc2616ba3340c27e82" + "containerimage.config.digest": "sha256:f731c71f65f96700528d89de985fb0adea867dbe9952b11c146c89eea809986c", + "containerimage.digest": "sha256:701b57ae218d71616432ef9f02f53ba5fcca98057f201b8f5db37d24281f1fae" } \ No newline at end of file diff --git a/packages/system/dashboard/images/dashboard.json b/packages/system/dashboard/images/dashboard.json index 3e20e20a..bd6daef8 100644 --- a/packages/system/dashboard/images/dashboard.json +++ b/packages/system/dashboard/images/dashboard.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:78b413d1c9a4ecf3bec9383444b3e85c01d8b33bf903c6443bfa5bdfd8b5bc04", - "containerimage.digest": "sha256:ddfaadb33e33123f553a36a3ee5857a1bf53f312043f91d76ad24316591fd26e" + "containerimage.config.digest": "sha256:ff8fcec27b1ef0a815cb94bc71e616392e096c0b554e4c1e1c149fec7bbc85d0", + "containerimage.digest": "sha256:ad0ecbe1e5b63f4a9842918014f644e2667327c946a5308dbab530bbcb543b92" } \ No newline at end of file diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag index c4909a16..3d28767b 100644 --- a/packages/system/dashboard/images/dashboard.tag +++ b/packages/system/dashboard/images/dashboard.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/dashboard:v0.4.0 +ghcr.io/aenix-io/cozystack/dashboard:v0.5.0 diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index c381203f..7a39f578 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:bfc18fe2675fa774463e6de108e6a474b7b8c1601027f6160208e493fe2cbfde", - "containerimage.digest": "sha256:2c5c2e9b123d9a795bb17f33755a826e98c1bd537544d21c9cd395ad509ecb25" + "containerimage.config.digest": "sha256:582aef7b5b407698dd98c0491cfd0150303c489a42869ccd92ea08f7e0155a7f", + "containerimage.digest": "sha256:7587d68b7797ccf70c9775a543f28301c71553c2fef6e80d510a181c08021ce8" } \ 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 bca201b9..8d97f7de 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.4.0 +ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.5.0 diff --git a/scripts/installer.sh b/scripts/installer.sh index ad303840..5fd5b0be 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -3,7 +3,7 @@ set -o pipefail set -e BUNDLE=$(set -x; kubectl get configmap -n cozy-system cozystack -o 'go-template={{index .data "bundle-name"}}') -VERSION=2 +VERSION=3 run_migrations() { if ! kubectl get configmap -n cozy-system cozystack-version; then diff --git a/scripts/migrations/2 b/scripts/migrations/2 new file mode 100755 index 00000000..0c082452 --- /dev/null +++ b/scripts/migrations/2 @@ -0,0 +1,14 @@ +#!/bin/sh +# Migration 2 --> 3 + +kubectl apply -f packages/system/mariadb-operator/charts/mariadb-operator/crds/crds.yaml --server-side --force-conflicts + +# Fix mariadb-operator crds +mariadb_crds=$(kubectl get crd -o name | grep '\.k8s\.mariadb\.com$') +if [ -n "$mariadb_crds" ]; then + kubectl annotate $mariadb_crds meta.helm.sh/release-namespace=cozy-mariadb-operator meta.helm.sh/release-name=mariadb-operator + kubectl label $mariadb_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=3 --dry-run=client -o yaml | kubectl apply -f-