From 4ea3b376000492911bebe5816fa6f63cca60139d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 24 Jul 2025 01:20:25 +0200 Subject: [PATCH 01/32] [kubernetes] fix volumesnapshotclass installation (#1238) Signed-off-by: Andrei Kvapil ## What this PR does This PR fixes regression introduced by https://github.com/cozystack/cozystack/pull/1203 error: ``` Helm install failed for release cozy-volumesnapshot-crd-for-tenant-k8s/volumesnapshot-crd-for-tenant-k8s with chart cozy-volumesnapshot-crd-for-tenant-k8s@0.34.0: unable to build kubernetes objects from release manifest: resource mapping not found for name: "kubevirt-snapshots" namespace: "" from "": no matches for kind "VolumeSnapshotClass" in version "snapshot.storage.k8s.io/v1"... ``` ### Release note ```release-note [kubernetes] fix volumesnapshotclass installation ``` --- .../templates/volumesnapshotclass.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/system/{volumesnapshot-crd-for-tenant-k8s => kubevirt-csi-node}/templates/volumesnapshotclass.yaml (100%) diff --git a/packages/system/volumesnapshot-crd-for-tenant-k8s/templates/volumesnapshotclass.yaml b/packages/system/kubevirt-csi-node/templates/volumesnapshotclass.yaml similarity index 100% rename from packages/system/volumesnapshot-crd-for-tenant-k8s/templates/volumesnapshotclass.yaml rename to packages/system/kubevirt-csi-node/templates/volumesnapshotclass.yaml From a9e9dfca1fadde1bf2b4e100753e0731bbcfe923 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 24 Jul 2025 01:24:13 +0200 Subject: [PATCH 02/32] [cosi] fix building objectstorage images Signed-off-by: Andrei Kvapil --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8cc1b01e..fd5fa28e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ build: build-deps make -C packages/system/metallb image make -C packages/system/kamaji image make -C packages/system/bucket image + make -C packages/system/objectstorage-controller image make -C packages/core/testing image make -C packages/core/installer image make manifests From e67c55bc7cdacbad785fd004cd56c02df70db35f Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Wed, 23 Jul 2025 23:48:00 +0000 Subject: [PATCH 03/32] Prepare release v0.34.1 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- .../apps/http-cache/images/nginx-cache.tag | 2 +- .../kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- .../system/cozystack-controller/values.yaml | 4 +-- .../templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 6 ++-- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- .../objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 31 +++++-------------- 16 files changed, 26 insertions(+), 41 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index ac7fd7f0..5452b4cf 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:b7633717cd7449c0042ae92d8ca9b36e4d69566561f5c7d44e21058e7d05c6d5 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index 9ccb507d..72457675 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 16b250eb..b2fa9ad9 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.0@sha256:3716c495c7d5c1f321e59cdc445e0853e8219932ee40e07ffcec99da7fcc7c6c + image: ghcr.io/cozystack/cozystack/installer:v0.34.1@sha256:9a804dca6727229a9de3cbb5d90329ef3a1420f8633eff29e80b1e1ab6448b97 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index a45e82a3..716eadb3 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.0@sha256:2c7dab87c149b63f74f18a591f38b1253ab581055351aec81816519245bc04aa + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.1@sha256:72c3bbdac5142c4c48ce7882dfcf16407546a43c430fea251402860ff35f950d diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index 8438d210..f6899942 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.0@sha256:22a11dd07e3eaed843c1ab4f589b629740159a65aeeec9afc495ddd818868dfc +ghcr.io/cozystack/cozystack/matchbox:v0.34.1@sha256:d855e00efd7bbfbe0ed869c44bde9eee6cb9b13366784720933ca306b68e2566 diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 35e8e1ce..5dd041d6 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:208d8ea43b4b493ee0bea80606f6b3041a02460be79c52ed12aecccd35ec2a02 +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index d386967e..2a73a12d 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.0@sha256:dad88c168719dcaa0b2e6bab352a90f44f4e23c58f525f96841cfce357920bdf + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.1@sha256:7b2bb5ea99649f7f918e2052363f6e80f55bd0eaba69b105fc318d411b6ee265 diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 5dc3e593..9642bf35 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.0@sha256:ef725447d1ddadbceb5218d6a2eb68b5fbace838173fbe00eb67ba72662ad171 + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.1@sha256:b3c7fa5a0a1af50b787d72593a8dd8e21df1965d10440e1652dda53e773db4bd debug: false disableTelemetry: false - cozystackVersion: "v0.34.0" + cozystackVersion: "v0.34.1" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 6cbe1d73..8cb29989 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.0", + "appVersion": "v0.34.1", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 75ed3640..448423d3 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,7 +19,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.0 + tag: v0.34.1 digest: "sha256:ad4b95660b6c5c1b9736ca4768a3f9648705c2855d0a08880d570b4e480dba78" redis: master: @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.0 - digest: "sha256:9f376d82db6802af32d137fef722237e1037e92ac8feb39131fcdfb5a0b02d30" + tag: v0.34.1 + digest: "sha256:dda59798174bbcf36c95dd3e4d0d5ea7d17c0e1623aadcd485dfe3c311daaf16" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index 7057c5e1..f4204379 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.0@sha256:09465ae8285b4ae43203581e443409cd4e1e119dde62a5c14d63ce064fb840b0 + tag: v0.34.1@sha256:de8006f07e78fe9f3e9dd5a0d68330f521b3efae86683e0066ec0ecd7b933192 repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index ea59780f..a6ab60bf 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.0@sha256:b7841916659646823f556b7ce299f6ed55a2d10ca81736c19e721a890efd4694 +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.1@sha256:29adfc95801c9bb26472362f842f8a798d145b4e3d6408be8f5abd74e5bbdf79 diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index 7a75d75f..eebb60dd 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:8409b093deada39a210784fd96461f16c1b1d5ae50e8a2285416b36a8ff6e13e + tag: v1.13.14@sha256:e6fb49200335bd75c19e927c806ca9e8df811f59893b55dd4ba99253bd0d039d diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index 2413c033..bed1fd42 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index 0a649151..aad111b2 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:latest@sha256:173067339794fbf94534132eec5968b5fb6718037b77aefa00fd70b7413a8d4c" + image: "" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index f7e3c5d9..63f94789 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -4,7 +4,6 @@ global: extraEnvironmentVars: WEED_CLUSTER_SW_MASTER: "seaweedfs-master:9333" WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888" - seaweedfs: master: replicas: 3 @@ -14,24 +13,19 @@ seaweedfs: # Y number of replica in other racks in the same data center # Z number of replica in other servers in the same rack defaultReplication: "001" - data: type: "emptyDir" - logs: type: "" - volume: replicas: 2 # minimum free disk space(in percents). If free disk space lower this value - all volumes marks as ReadOnly minFreeSpacePercent: 5 - dataDirs: - - name: data1 - type: "persistentVolumeClaim" - size: "10Gi" - maxVolumes: 0 - + - name: data1 + type: "persistentVolumeClaim" + size: "10Gi" + maxVolumes: 0 filer: replicas: 2 # replication type is XYZ: @@ -41,10 +35,8 @@ seaweedfs: defaultReplicaPlacement: "001" data: type: "emptyDir" - logs: type: "" - extraEnvironmentVars: WEED_LEVELDB2_ENABLED: "false" WEED_POSTGRES2_ENABLED: "true" @@ -73,7 +65,6 @@ seaweedfs: secretKeyRef: key: password name: seaweedfs-db-app - s3: enabled: true port: 8333 @@ -86,13 +77,10 @@ seaweedfs: # should have a secret key called seaweedfs_s3_config with an inline json configure existingConfigSecret: null auditLogConfig: {} - s3: enableAuth: true - logs: type: "" - ingress: enabled: true className: "tenant-root" @@ -104,9 +92,8 @@ seaweedfs: cert-manager.io/cluster-issuer: letsencrypt-prod tls: - hosts: - - seaweedfs.demo.cozystack.io + - seaweedfs.demo.cozystack.io secretName: seaweedfs-s3-ingress-tls - cosi: enabled: true podLabels: @@ -114,14 +101,12 @@ seaweedfs: driverName: "seaweedfs.objectstorage.k8s.io" bucketClassName: "seaweedfs" region: "" - sidecar: - image: "ghcr.io/kvaps/test:cosi-provisioner-sidecar-25" - + image: "" certificates: commonName: "SeaweedFS CA" ipAddresses: [] keyAlgorithm: RSA keySize: 2048 - duration: 2160h # 90d - renewBefore: 360h # 15d + duration: 2160h # 90d + renewBefore: 360h # 15d From 4d9a8389d6bc7e86d63dd976ec853b374a91a637 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 24 Jul 2025 15:17:32 +0200 Subject: [PATCH 04/32] Fix recording image for objectstorage Signed-off-by: Andrei Kvapil --- packages/system/objectstorage-controller/Makefile | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/system/objectstorage-controller/Makefile b/packages/system/objectstorage-controller/Makefile index b947ce36..96bb664c 100644 --- a/packages/system/objectstorage-controller/Makefile +++ b/packages/system/objectstorage-controller/Makefile @@ -24,6 +24,6 @@ image-controller image-sidecar: --metadata-file images/$(TARGET).json \ --push=$(PUSH) --provenance=false --load=$(LOAD) \ --label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" - IMAGE="$(REGISTRY)/objectstorage-$(TARGET):$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/$(TARGET).json -r)" && \ + IMAGE="$(REGISTRY)/objectstorage-$(TARGET):$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/$(TARGET).json -r)" \ yq -i '$(YAML_PATH) = strenv(IMAGE)' $(VALUES_FILE) rm -f images/$(TARGET).json diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index aad111b2..8b05a49b 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:latest@sha256:2fe77880b81b0210273c85a142cb13e6857d13dd941337456b426597f5778bc3" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 63f94789..a9cb5459 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:latest@sha256:6bdb9ff087097be1f25759165da8f1c8674fb30ee41a93750219c8f8d9dfd942" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From d80a4a34f688ad8655192ea1addb526a858d2a8f Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Thu, 24 Jul 2025 13:21:49 +0000 Subject: [PATCH 05/32] Prepare release v0.34.2 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 8 ++++---- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index 5452b4cf..ac7fd7f0 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:b7633717cd7449c0042ae92d8ca9b36e4d69566561f5c7d44e21058e7d05c6d5 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index 72457675..9ccb507d 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index b2fa9ad9..ca13be8f 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.1@sha256:9a804dca6727229a9de3cbb5d90329ef3a1420f8633eff29e80b1e1ab6448b97 + image: ghcr.io/cozystack/cozystack/installer:v0.34.2@sha256:ad596b3c34f41087597cb28ae3365e82e4e74b62c16a4c8eafc5ad6670564851 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 716eadb3..9ec736f4 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.1@sha256:72c3bbdac5142c4c48ce7882dfcf16407546a43c430fea251402860ff35f950d + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.2@sha256:ff93361a7b55de4d4c8adb7d7b69e7d60cc67d055de7d2f5cacf26847fda8262 diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index f6899942..ec88279c 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.1@sha256:d855e00efd7bbfbe0ed869c44bde9eee6cb9b13366784720933ca306b68e2566 +ghcr.io/cozystack/cozystack/matchbox:v0.34.2@sha256:2f2bd75d39a02316e458df9fca95ddb6610557a26cfd53c8dbcef47c0a784507 diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 5dd041d6..8c36d03c 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b4d19f3448d77b55974cccb6c8a0a2d0a54ad3af3880dcf0d84d8941430959f7 diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 2a73a12d..7117f3a1 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.1@sha256:7b2bb5ea99649f7f918e2052363f6e80f55bd0eaba69b105fc318d411b6ee265 + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.2@sha256:afe3505e148cea237fcd34a440c9f9b09449d208f9ca365b3ab09902fe303431 diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 9642bf35..953d0ce2 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.1@sha256:b3c7fa5a0a1af50b787d72593a8dd8e21df1965d10440e1652dda53e773db4bd + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.2@sha256:efc7c74d2c45f6a83350a7715e3b6217883fa8bfc65a24ad71364dd34b1b8804 debug: false disableTelemetry: false - cozystackVersion: "v0.34.1" + cozystackVersion: "v0.34.2" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 8cb29989..81c287ed 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.1", + "appVersion": "v0.34.2", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 448423d3..c04ec5aa 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,8 +19,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.1 - digest: "sha256:ad4b95660b6c5c1b9736ca4768a3f9648705c2855d0a08880d570b4e480dba78" + tag: v0.34.2 + digest: "sha256:84c333ce0ecddb153a6886b1c633e4480c78690fb0b49cc0f4cb980bee565134" redis: master: resourcesPreset: "none" @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.1 - digest: "sha256:dda59798174bbcf36c95dd3e4d0d5ea7d17c0e1623aadcd485dfe3c311daaf16" + tag: v0.34.2 + digest: "sha256:674a78dc5fa45213a1b717f9a5fde1d3d47b36c92c4988994918dc42ead9dbe3" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index f4204379..f6f94252 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.1@sha256:de8006f07e78fe9f3e9dd5a0d68330f521b3efae86683e0066ec0ecd7b933192 + tag: v0.34.2@sha256:dd662e320f44342fe5f10d63545bf1915e97de380c1685e7b28f7a7fce87512e repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index a6ab60bf..238957c8 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.1@sha256:29adfc95801c9bb26472362f842f8a798d145b4e3d6408be8f5abd74e5bbdf79 +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.2@sha256:22c91ff21e44aef520a5daa5b83608fb2c5c796ed1c5a645c0a9a0dc69f086cf diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index eebb60dd..75a842ba 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:e6fb49200335bd75c19e927c806ca9e8df811f59893b55dd4ba99253bd0d039d + tag: v1.13.14@sha256:9136c774410bf4d4343fca7e1e8901c05fd698b9b91cbf6bcf7183a0e4752316 diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index bed1fd42..2413c033 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index 8b05a49b..83aff4b8 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:latest@sha256:2fe77880b81b0210273c85a142cb13e6857d13dd941337456b426597f5778bc3" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.2@sha256:4d3f20ae946736d9260193dd1ce0e72114ad6bd6f78fb6528a68efffa2092b07" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index a9cb5459..4a823b6d 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:latest@sha256:6bdb9ff087097be1f25759165da8f1c8674fb30ee41a93750219c8f8d9dfd942" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.2@sha256:e751c20edbefb1e458d9272ec5faea011e41bb828c067a562d8ddbd8d9da7242" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From 958aca2b32f25b0eda85203adc55fb8b4863617f Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Thu, 24 Jul 2025 17:28:07 +0300 Subject: [PATCH 06/32] fix net pod policy Signed-off-by: kklinch0 (cherry picked from commit 6598213b5824ca32461d2c2dc97cc6085ff71893) --- packages/apps/tenant/Chart.yaml | 2 +- packages/apps/tenant/templates/networkpolicy.yaml | 14 ++++++++++++++ packages/apps/versions_map | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml index 0839086b..0bcb4d79 100644 --- a/packages/apps/tenant/Chart.yaml +++ b/packages/apps/tenant/Chart.yaml @@ -4,4 +4,4 @@ description: Separated tenant namespace icon: /logos/tenant.svg type: application -version: 1.11.1 +version: 1.11.2 diff --git a/packages/apps/tenant/templates/networkpolicy.yaml b/packages/apps/tenant/templates/networkpolicy.yaml index 6d80f996..b66e85ff 100644 --- a/packages/apps/tenant/templates/networkpolicy.yaml +++ b/packages/apps/tenant/templates/networkpolicy.yaml @@ -48,6 +48,20 @@ spec: {{- range $i, $v := $parts }} {{- if ne $i 0 }} - matchLabels: + "k8s:app.kubernetes.io/name": "vminsert" + "k8s:io.kubernetes.pod.namespace": {{ join "-" (slice $parts 0 (add $i 1)) }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if ne (include "tenant.name" .) "tenant-root" }} + - toEndpoints: + {{- if hasPrefix "tenant-" .Release.Namespace }} + {{- $parts := splitList "-" .Release.Namespace }} + {{- range $i, $v := $parts }} + {{- if ne $i 0 }} + - matchLabels: + "k8s:app.kubernetes.io/instance": "etcd" "k8s:io.kubernetes.pod.namespace": {{ join "-" (slice $parts 0 (add $i 1)) }} {{- end }} {{- end }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index d8272612..a3e5c39c 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -151,7 +151,8 @@ tcp-balancer 0.5.0 08cb7c0f tcp-balancer 0.5.1 HEAD tenant 1.10.0 4369b031 tenant 1.11.0 08cb7c0f -tenant 1.11.1 HEAD +tenant 1.11.1 28c9fcd6 +tenant 1.11.2 HEAD virtual-machine 0.1.4 f2015d65 virtual-machine 0.1.5 263e47be virtual-machine 0.2.0 c0685f43 From b66843f023e306a9f4765ad24c34abd9300bade4 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 24 Jul 2025 20:24:31 +0200 Subject: [PATCH 07/32] [kubernetes] Add dependency for snapshot CRD and migration to latest version Signed-off-by: Andrei Kvapil (cherry picked from commit 02436f312f4157d0286098cda3b36c9179198b53) --- packages/apps/kubernetes/Chart.yaml | 2 +- .../apps/kubernetes/templates/helmreleases/csi.yaml | 2 ++ packages/apps/versions_map | 3 ++- scripts/migrations/17 | 10 ++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100755 scripts/migrations/17 diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index 2c49af9b..ff5deeec 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.26.0 +version: 0.26.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kubernetes/templates/helmreleases/csi.yaml b/packages/apps/kubernetes/templates/helmreleases/csi.yaml index 8bbb1b9d..780181fa 100644 --- a/packages/apps/kubernetes/templates/helmreleases/csi.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/csi.yaml @@ -35,6 +35,8 @@ spec: storageClass: "{{ . }}" {{- end }} dependsOn: + - name: {{ .Release.Name }}-volumesnapshot-crd-for-tenant-k8s + namespace: {{ .Release.Namespace }} {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index a3e5c39c..9e6b4e05 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -61,7 +61,8 @@ kubernetes 0.24.0 62cb694d kubernetes 0.25.0 70f82667 kubernetes 0.25.1 acd4663a kubernetes 0.25.2 08cb7c0f -kubernetes 0.26.0 HEAD +kubernetes 0.26.0 9584e5f5 +kubernetes 0.26.1 HEAD mysql 0.1.0 263e47be mysql 0.2.0 c24a103f mysql 0.3.0 53f2365e diff --git a/scripts/migrations/17 b/scripts/migrations/17 new file mode 100755 index 00000000..9749c0e2 --- /dev/null +++ b/scripts/migrations/17 @@ -0,0 +1,10 @@ +#!/bin/sh +# Migration 17 --> 18 + +# Upgrade kubernetes.apps to new chart version +kubectl get kuberneteses.apps.cozystack.io -A --no-headers --output=custom-columns='NAMESPACE:.metadata.namespace,NAME:.metadata.name' | while read NAMESPACE NAME; do + kubectl patch kuberneteses.apps.cozystack.io -n "$NAMESPACE" "$NAME" --type merge -p '{"appVersion":"0.26.1"}' +done + +# Write version to cozystack-version config +kubectl create configmap -n cozy-system cozystack-version --from-literal=version=18 --dry-run=client -o yaml | kubectl apply -f- From ec41826251242117407fb9a9df694c2d6433dd92 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 25 Jul 2025 04:06:47 +0200 Subject: [PATCH 08/32] [seaweedfs] Client mode refactoring and fix issues (#1277) - update cosi-driver - add support exporting via nginx-ingress - add support for whitelist Signed-off-by: Andrei Kvapil ```release-note [seaweedfs] Client mode refactoring and fix issues - update cosi-driver - add support exporting via nginx-ingress - add support for whitelist ``` --- packages/extra/seaweedfs/Chart.yaml | 2 +- packages/extra/seaweedfs/Makefile | 2 +- packages/extra/seaweedfs/README.md | 5 +- .../images/objectstorage-sidecar.tag | 1 + .../images/seaweedfs-cosi-driver.tag | 1 + .../templates/client/cosi-bucket-class.yaml | 16 ++++ .../templates/client/cosi-cluster-role.yaml | 61 +++++++++++++ .../templates/client/cosi-deployment.yaml | 88 +++++++++++++++++++ .../client/cosi-service-account.yaml | 8 ++ packages/extra/seaweedfs/templates/cm.yaml | 6 ++ .../templates/dashboard-resourcemap.yaml | 5 +- .../extra/seaweedfs/templates/ingress.yaml | 44 ++++++++++ .../extra/seaweedfs/templates/seaweedfs.yaml | 28 ++++-- packages/extra/seaweedfs/templates/vpa.yaml | 2 + packages/extra/seaweedfs/values.schema.json | 26 +++++- packages/extra/seaweedfs/values.yaml | 10 ++- packages/extra/versions_map | 3 +- 17 files changed, 292 insertions(+), 16 deletions(-) create mode 100644 packages/extra/seaweedfs/images/objectstorage-sidecar.tag create mode 100644 packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag create mode 100644 packages/extra/seaweedfs/templates/client/cosi-bucket-class.yaml create mode 100644 packages/extra/seaweedfs/templates/client/cosi-cluster-role.yaml create mode 100644 packages/extra/seaweedfs/templates/client/cosi-deployment.yaml create mode 100644 packages/extra/seaweedfs/templates/client/cosi-service-account.yaml create mode 100644 packages/extra/seaweedfs/templates/cm.yaml create mode 100644 packages/extra/seaweedfs/templates/ingress.yaml diff --git a/packages/extra/seaweedfs/Chart.yaml b/packages/extra/seaweedfs/Chart.yaml index 233b0c8b..24796add 100644 --- a/packages/extra/seaweedfs/Chart.yaml +++ b/packages/extra/seaweedfs/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.6.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/extra/seaweedfs/Makefile b/packages/extra/seaweedfs/Makefile index a2504ed5..78e21e04 100644 --- a/packages/extra/seaweedfs/Makefile +++ b/packages/extra/seaweedfs/Makefile @@ -4,4 +4,4 @@ include ../../../scripts/package.mk generate: readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md - yq -o json -i '.properties.topology.enum = ["Simple","MultiZone"]' values.schema.json + yq -o json -i '.properties.topology.enum = ["Simple","MultiZone","Client"]' values.schema.json diff --git a/packages/extra/seaweedfs/README.md b/packages/extra/seaweedfs/README.md index f52bc9d3..aea13939 100644 --- a/packages/extra/seaweedfs/README.md +++ b/packages/extra/seaweedfs/README.md @@ -7,9 +7,12 @@ | Name | Description | Value | | ------------------- | ------------------------------------------------------------------------------------------------------ | -------- | | `host` | The hostname used to access the SeaweedFS externally (defaults to 's3' subdomain for the tenant host). | `""` | -| `topology` | The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone) | `Simple` | +| `topology` | The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone, Client) | `Simple` | | `replicationFactor` | The number of replicas for each volume in the SeaweedFS cluster. | `2` | | `replicas` | Persistent Volume size for SeaweedFS | `2` | | `size` | Persistent Volume size | `10Gi` | | `storageClass` | StorageClass used to store the data | `""` | | `zones` | A map of zones for MultiZone topology. Each zone can have its own number of replicas and size. | `{}` | +| `filer.grpcHost` | The hostname used to expose or access the filer service externally. | `""` | +| `filer.grpcPort` | The port used to access the filer service externally. | `443` | +| `filer.whitelist` | A list of IP addresses or CIDR ranges that are allowed to access the filer service. | `[]` | diff --git a/packages/extra/seaweedfs/images/objectstorage-sidecar.tag b/packages/extra/seaweedfs/images/objectstorage-sidecar.tag new file mode 100644 index 00000000..28f01a1a --- /dev/null +++ b/packages/extra/seaweedfs/images/objectstorage-sidecar.tag @@ -0,0 +1 @@ +ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.35.0-alpha.1@sha256:e4f9a7302285ea9febeb28fc2fa97cb7c01bb91e602f975c31aad1fe46f778f7 diff --git a/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag b/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag new file mode 100644 index 00000000..f07c125d --- /dev/null +++ b/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag @@ -0,0 +1 @@ +ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.2.0 diff --git a/packages/extra/seaweedfs/templates/client/cosi-bucket-class.yaml b/packages/extra/seaweedfs/templates/client/cosi-bucket-class.yaml new file mode 100644 index 00000000..76eda0dc --- /dev/null +++ b/packages/extra/seaweedfs/templates/client/cosi-bucket-class.yaml @@ -0,0 +1,16 @@ +{{- if eq .Values.topology "Client" }} +--- +kind: BucketClass +apiVersion: objectstorage.k8s.io/v1alpha1 +metadata: + name: {{ .Release.Namespace }} +driverName: {{ .Release.Namespace }}.seaweedfs.objectstorage.k8s.io +deletionPolicy: Delete +--- +kind: BucketAccessClass +apiVersion: objectstorage.k8s.io/v1alpha1 +metadata: + name: {{ .Release.Namespace }} +driverName: {{ .Release.Namespace }}.seaweedfs.objectstorage.k8s.io +authenticationType: KEY +{{- end }} diff --git a/packages/extra/seaweedfs/templates/client/cosi-cluster-role.yaml b/packages/extra/seaweedfs/templates/client/cosi-cluster-role.yaml new file mode 100644 index 00000000..4ee30f30 --- /dev/null +++ b/packages/extra/seaweedfs/templates/client/cosi-cluster-role.yaml @@ -0,0 +1,61 @@ +{{- if eq .Values.topology "Client" }} +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ .Release.Namespace }}-objectstorage-provisioner +rules: +- apiGroups: ["objectstorage.k8s.io"] + resources: + - "buckets" + - "bucketaccesses" + - "bucketclaims" + - "bucketclasses" + - "bucketclasses/status" + - "bucketaccessclasses" + - "buckets/status" + - "bucketaccesses/status" + - "bucketclaims/status" + - "bucketaccessclasses/status" + verbs: + - "get" + - "list" + - "watch" + - "update" + - "create" + - "delete" +- apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: + - "get" + - "watch" + - "list" + - "delete" + - "update" + - "create" +- apiGroups: [""] + resources: + - "secrets" + - "events" + verbs: + - "get" + - "list" + - "watch" + - "update" + - "create" + - "delete" + - "patch" +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ .Release.Namespace }}-objectstorage-provisioner +subjects: + - kind: ServiceAccount + name: {{ .Release.Name }}-objectstorage-provisioner + namespace: {{ .Release.Namespace }} +roleRef: + kind: ClusterRole + name: {{ .Release.Namespace }}-objectstorage-provisioner + apiGroup: rbac.authorization.k8s.io +{{- end }} diff --git a/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml b/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml new file mode 100644 index 00000000..5307a67f --- /dev/null +++ b/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml @@ -0,0 +1,88 @@ +{{- if eq .Values.topology "Client" }} +{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} +{{- $ingress := index $myNS.metadata.annotations "namespace.cozystack.io/ingress" }} +{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $.Release.Name }}-objectstorage-provisioner + namespace: {{ $.Release.Namespace }} + labels: + app.kubernetes.io/component: objectstorage-provisioner + app.kubernetes.io/instance: seaweedfs + app.kubernetes.io/name: {{ $.Release.Name }} +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/component: objectstorage-provisioner + app.kubernetes.io/instance: seaweedfs + app.kubernetes.io/name: {{ $.Release.Name }} + strategy: + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate + template: + metadata: + creationTimestamp: null + labels: + policy.cozystack.io/allow-to-apiserver: "true" + app.kubernetes.io/component: objectstorage-provisioner + app.kubernetes.io/instance: seaweedfs + app.kubernetes.io/name: {{ $.Release.Name }} + spec: + containers: + - name: seaweedfs-cosi-driver + image: "{{ $.Files.Get "images/seaweedfs-cosi-driver.tag" | trim }}" + imagePullPolicy: IfNotPresent + env: + - name: DRIVERNAME + value: {{ .Release.Namespace }}.seaweedfs.objectstorage.k8s.io + - name: ENDPOINT + value: https://{{ .Values.host | default (printf "s3.%s" $host) }} + - name: SEAWEEDFS_FILER + value: "{{ .Values.filer.grpcHost }}:{{ .Values.filer.grpcPort }}" + - name: WEED_GRPC_CLIENT_KEY + value: /usr/local/share/ca-certificates/client/tls.key + - name: WEED_GRPC_CLIENT_CERT + value: /usr/local/share/ca-certificates/client/tls.crt + - name: WEED_GRPC_CA + value: /usr/local/share/ca-certificates/client/ca.crt + resources: + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 100m + memory: 128Mi + volumeMounts: + - mountPath: /var/lib/cosi + name: socket + - mountPath: /usr/local/share/ca-certificates/client/ + name: client-cert + readOnly: true + - name: seaweedfs-cosi-sidecar + image: "{{ $.Files.Get "images/objectstorage-sidecar.tag" | trim }}" + imagePullPolicy: IfNotPresent + args: + - --v=5 + env: + - name: POD_NAMESPACE + value: {{ .Release.Namespace }} + volumeMounts: + - mountPath: /var/lib/cosi + name: socket + enableServiceLinks: false + restartPolicy: Always + terminationGracePeriodSeconds: 10 + serviceAccountName: {{ .Release.Name }}-objectstorage-provisioner + volumes: + - name: socket + emptyDir: {} + - name: client-cert + secret: + defaultMode: 420 + secretName: seaweedfs-client-cert +{{- end }} diff --git a/packages/extra/seaweedfs/templates/client/cosi-service-account.yaml b/packages/extra/seaweedfs/templates/client/cosi-service-account.yaml new file mode 100644 index 00000000..20407dee --- /dev/null +++ b/packages/extra/seaweedfs/templates/client/cosi-service-account.yaml @@ -0,0 +1,8 @@ +{{- if eq .Values.topology "Client" }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Release.Name }}-objectstorage-provisioner + namespace: {{ .Release.Namespace }} +automountServiceAccountToken: true +{{- end }} diff --git a/packages/extra/seaweedfs/templates/cm.yaml b/packages/extra/seaweedfs/templates/cm.yaml new file mode 100644 index 00000000..1aec9a1b --- /dev/null +++ b/packages/extra/seaweedfs/templates/cm.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: "{{ .Release.Name }}-deployed-topology" +data: + topology: {{ quote .Values.topology }} diff --git a/packages/extra/seaweedfs/templates/dashboard-resourcemap.yaml b/packages/extra/seaweedfs/templates/dashboard-resourcemap.yaml index 02c9b2aa..ec8860b7 100644 --- a/packages/extra/seaweedfs/templates/dashboard-resourcemap.yaml +++ b/packages/extra/seaweedfs/templates/dashboard-resourcemap.yaml @@ -3,6 +3,7 @@ kind: Role metadata: name: {{ .Release.Name }}-dashboard-resources rules: +{{- if not (eq .Values.topology "Client") }} - apiGroups: - "" resources: @@ -27,13 +28,15 @@ rules: - {{ $.Release.Name }}-volume - {{ $.Release.Name }}-db verbs: ["get", "list", "watch"] +{{- end }} + --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ .Release.Name }}-dashboard-resources subjects: -{{ include "cozy-lib.rbac.subjectsForTenantAndAccessLevel" (list "admin" .Release.Namespace) }} +{{ include "cozy-lib.rbac.subjectsForTenantAndAccessLevel" (list "super-admin" .Release.Namespace) }} roleRef: kind: Role name: {{ .Release.Name }}-dashboard-resources diff --git a/packages/extra/seaweedfs/templates/ingress.yaml b/packages/extra/seaweedfs/templates/ingress.yaml new file mode 100644 index 00000000..05bf201d --- /dev/null +++ b/packages/extra/seaweedfs/templates/ingress.yaml @@ -0,0 +1,44 @@ +{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }} +{{- $issuerType := (index $cozyConfig.data "clusterissuer") | default "http01" }} + +{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} +{{- $ingress := index $myNS.metadata.annotations "namespace.cozystack.io/ingress" }} +{{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }} +{{- if and (not (eq .Values.topology "Client")) (.Values.filer.grpcHost) }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/backend-protocol: GRPCS + nginx.ingress.kubernetes.io/ssl-passthrough: "true" + nginx.ingress.kubernetes.io/whitelist-source-range: "{{ join "," (.Values.filer.whitelist | default "0.0.0.0/32") }}" + name: seaweedfs-filer-external +spec: + ingressClassName: tenant-root + rules: + - host: {{ .Values.filer.grpcHost | default (printf "filer.%s" $host) }} + http: + paths: + - backend: + service: + name: {{ $.Release.Name }}-filer-external + port: + number: 18888 + path: / + pathType: ImplementationSpecific +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ $.Release.Name }}-filer-external +spec: + ports: + - name: swfs-filer-grpc + port: 18888 + protocol: TCP + targetPort: 18888 + selector: + app.kubernetes.io/component: filer + app.kubernetes.io/name: {{ $.Release.Name }} +{{- end }} diff --git a/packages/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml index eafdb4e3..af485c46 100644 --- a/packages/extra/seaweedfs/templates/seaweedfs.yaml +++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml @@ -1,6 +1,9 @@ {{- /* Preflight checks for Helm template */ -}} -{{- if not (has .Values.topology (list "Simple" "MultiZone")) }} -{{- fail "Invalid value for .Values.topology. Must be one of 'Simple' or 'MultiZone'." }} +{{- if not (has .Values.topology (list "Simple" "MultiZone" "Client")) }} +{{- fail "Invalid value for .Values.topology. Must be one of 'Simple', 'MultiZone' or 'Client'." }} +{{- end }} +{{- if and (eq .Values.topology "Client") (not .Values.filer.grpcHost) }} +{{- fail "When topology is 'Client', .Values.filer.grpcHost must be set to a valid remote filer GRPC service endpoint." }} {{- end }} {{- if lt (int .Values.replicationFactor) 1 }} {{- fail "Invalid value for .Values.replicationFactor. Must be at least 1." }} @@ -13,16 +16,24 @@ {{- fail "replicationFactor must be less than or equal to the number of zones defined in .Values.zones." }} {{- end }} {{- end }} -{{- if lookup "v1" "PersistentVolumeClaim" "" (printf "%s-data1-seaweedfs-volume-0" .Release.Name) }} -{{- if eq .Values.topology "MultiZone" }} -{{- fail "Not allowed to switch between Simple and MultiZone topologies after the first deployment." }} -{{- end }} + +{{- $detectedTopology := "Unknown" }} +{{- $configMap := lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-deployed-topology" .Release.Name) }} +{{- if $configMap }} +{{- $detectedTopology = dig "data" "topology" "Unknown" $configMap }} {{- else }} -{{- if and (eq .Values.topology "Simple") (.Release.IsUpgrade) }} -{{- fail "Not allowed to switch between Simple and MultiZone topologies after the first deployment." }} +{{- if lookup "v1" "PersistentVolumeClaim" .Release.Namespace (printf "data1-%s-volume-0" .Release.Name) }} +{{- $detectedTopology = "Simple" }} +{{- else if lookup "apps/v1" "StatefulSet" .Release.Namespace (printf "%s-master" .Release.Name) }} +{{- $detectedTopology = "MultiZone" }} {{- end }} {{- end }} +{{- if not (has $detectedTopology (list .Values.topology "Unknown")) }} +{{- fail (printf "Not allowed to switch between topologies after the first deployment: %s" $detectedTopology) }} +{{- end }} + +{{- if not (eq .Values.topology "Client") }} {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} {{- $ingress := index $myNS.metadata.annotations "namespace.cozystack.io/ingress" }} {{- $host := index $myNS.metadata.annotations "namespace.cozystack.io/host" }} @@ -198,3 +209,4 @@ spec: cnpg.io/cluster: seaweedfs-db cnpg.io/podRole: instance version: {{ $.Chart.Version }} +{{- end }} diff --git a/packages/extra/seaweedfs/templates/vpa.yaml b/packages/extra/seaweedfs/templates/vpa.yaml index a0c6d6a7..acdd8f47 100644 --- a/packages/extra/seaweedfs/templates/vpa.yaml +++ b/packages/extra/seaweedfs/templates/vpa.yaml @@ -1,3 +1,4 @@ +{{- if not (eq .Values.topology "Client") }} apiVersion: autoscaling.k8s.io/v1 kind: VerticalPodAutoscaler metadata: @@ -64,3 +65,4 @@ spec: maxAllowed: cpu: "1" memory: 2048Mi +{{- end }} diff --git a/packages/extra/seaweedfs/values.schema.json b/packages/extra/seaweedfs/values.schema.json index 2f6e48bd..e822eda0 100644 --- a/packages/extra/seaweedfs/values.schema.json +++ b/packages/extra/seaweedfs/values.schema.json @@ -1,5 +1,26 @@ { "properties": { + "filer": { + "properties": { + "grpcHost": { + "default": "", + "description": "The hostname used to expose or access the filer service externally.", + "type": "string" + }, + "grpcPort": { + "default": 443, + "description": "The port used to access the filer service externally.", + "type": "number" + }, + "whitelist": { + "default": [], + "description": "A list of IP addresses or CIDR ranges that are allowed to access the filer service.", + "items": {}, + "type": "array" + } + }, + "type": "object" + }, "host": { "default": "", "description": "The hostname used to access the SeaweedFS externally (defaults to 's3' subdomain for the tenant host).", @@ -27,11 +48,12 @@ }, "topology": { "default": "Simple", - "description": "The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone)", + "description": "The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone, Client)", "type": "string", "enum": [ "Simple", - "MultiZone" + "MultiZone", + "Client" ] }, "zones": { diff --git a/packages/extra/seaweedfs/values.yaml b/packages/extra/seaweedfs/values.yaml index 50846fcc..c1f73a53 100644 --- a/packages/extra/seaweedfs/values.yaml +++ b/packages/extra/seaweedfs/values.yaml @@ -3,7 +3,7 @@ ## @param host The hostname used to access the SeaweedFS externally (defaults to 's3' subdomain for the tenant host). host: "" -## @param topology The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone) +## @param topology The topology of the SeaweedFS cluster. (allowed values: Simple, MultiZone, Client) ## topology: Simple @@ -31,3 +31,11 @@ storageClass: "" ## replicas: 2 ## size: 10Gi zones: {} + +## @param filer.grpcHost The hostname used to expose or access the filer service externally. +## @param filer.grpcPort The port used to access the filer service externally. +## @param filer.whitelist A list of IP addresses or CIDR ranges that are allowed to access the filer service. +filer: + grpcHost: "" + grpcPort: 443 + whitelist: [] diff --git a/packages/extra/versions_map b/packages/extra/versions_map index cb9683bb..bc581f82 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -54,4 +54,5 @@ seaweedfs 0.2.1 fde4bcfa seaweedfs 0.3.0 45a7416c seaweedfs 0.4.0 632224a3 seaweedfs 0.4.1 8c86905b -seaweedfs 0.5.0 HEAD +seaweedfs 0.5.0 9584e5f5 +seaweedfs 0.6.0 HEAD From 01053f7c3180d1bd045d7c5fb949984c2bdaf19d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 25 Jul 2025 17:44:16 +0200 Subject: [PATCH 09/32] Fix regression with optiona=true field Signed-off-by: Andrei Kvapil --- packages/apps/virtual-machine/Makefile | 4 ++-- packages/apps/virtual-machine/values.schema.json | 2 -- packages/apps/vm-instance/Makefile | 4 ++-- packages/apps/vm-instance/values.schema.json | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/apps/virtual-machine/Makefile b/packages/apps/virtual-machine/Makefile index 5aaa17e1..4bbfcd8c 100644 --- a/packages/apps/virtual-machine/Makefile +++ b/packages/apps/virtual-machine/Makefile @@ -4,9 +4,9 @@ generate: readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md yq -o json -i '.properties.gpus.items.type = "object" | .properties.gpus.default = []' values.schema.json INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceType.optional=true | .properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json + && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json + && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json yq -i -o json '.properties.systemDisk.properties.image.enum = ["ubuntu", "cirros", "alpine", "fedora", "talos"]' values.schema.json yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json diff --git a/packages/apps/virtual-machine/values.schema.json b/packages/apps/virtual-machine/values.schema.json index 48650049..92b7da9e 100644 --- a/packages/apps/virtual-machine/values.schema.json +++ b/packages/apps/virtual-machine/values.schema.json @@ -44,7 +44,6 @@ "default": "ubuntu", "description": "Virtual Machine preferences profile", "type": "string", - "optional": true, "enum": [ "alpine", "centos.7", @@ -95,7 +94,6 @@ "default": "u1.medium", "description": "Virtual Machine instance type", "type": "string", - "optional": true, "enum": [ "cx1.2xlarge", "cx1.4xlarge", diff --git a/packages/apps/vm-instance/Makefile b/packages/apps/vm-instance/Makefile index f400058e..3a21209b 100644 --- a/packages/apps/vm-instance/Makefile +++ b/packages/apps/vm-instance/Makefile @@ -5,8 +5,8 @@ generate: yq -o json -i '.properties.disks.items.type = "object" | .properties.disks.default = []' values.schema.json yq -o json -i '.properties.gpus.items.type = "object" | .properties.gpus.default = []' values.schema.json INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceType.optional=true | .properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json + && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceProfile.optional=true | .properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json + && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json yq -i -o json '.properties.externalMethod.enum = ["PortList", "WholeIP"]' values.schema.json diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json index acde789f..05b49a0d 100644 --- a/packages/apps/vm-instance/values.schema.json +++ b/packages/apps/vm-instance/values.schema.json @@ -52,7 +52,6 @@ "default": "ubuntu", "description": "Virtual Machine preferences profile", "type": "string", - "optional": true, "enum": [ "alpine", "centos.7", @@ -103,7 +102,6 @@ "default": "u1.medium", "description": "Virtual Machine instance type", "type": "string", - "optional": true, "enum": [ "cx1.2xlarge", "cx1.4xlarge", From 3c7e256906e1dbb0f957dc3a205fa77a147d419d Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 25 Jul 2025 17:48:45 +0200 Subject: [PATCH 10/32] Fix building Kubevirt CCM Signed-off-by: Andrei Kvapil --- .../apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile b/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile index 563251d8..58a4d039 100644 --- a/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile +++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile @@ -21,6 +21,6 @@ RUN go mod vendor RUN CGO_ENABLED=0 go build -mod=vendor -ldflags="-s -w" -o bin/kubevirt-cloud-controller-manager ./cmd/kubevirt-cloud-controller-manager -FROM registry.access.redhat.com/ubi9/ubi-micro +FROM scratch COPY --from=builder /go/src/kubevirt.io/cloud-provider-kubevirt/bin/kubevirt-cloud-controller-manager /bin/kubevirt-cloud-controller-manager ENTRYPOINT [ "/bin/kubevirt-cloud-controller-manager" ] From 86bc540ba591940b1b65f60f470bd533dab76786 Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Fri, 25 Jul 2025 16:42:24 +0000 Subject: [PATCH 11/32] Prepare release v0.34.3 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/cluster-autoscaler.tag | 2 +- packages/apps/kubernetes/images/kubevirt-cloud-provider.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 6 +++--- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index ac7fd7f0..5452b4cf 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:b7633717cd7449c0042ae92d8ca9b36e4d69566561f5c7d44e21058e7d05c6d5 diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag index f187c45e..112eac53 100644 --- a/packages/apps/kubernetes/images/cluster-autoscaler.tag +++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.0@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e +ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.1@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag index c3535424..ec6955a4 100644 --- a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag +++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.0@sha256:49843a0b670eab061627e48df338b2b8bc9f577dc2cfd4c2ed4071e02e64b424 +ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.1@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index 9ccb507d..ce541953 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.1@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index ca13be8f..8b2e2e24 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.2@sha256:ad596b3c34f41087597cb28ae3365e82e4e74b62c16a4c8eafc5ad6670564851 + image: ghcr.io/cozystack/cozystack/installer:v0.34.3@sha256:ffda94ae41ae04e56222a8ddf3601cf09f41049f0997aff4e35df88ceda27e85 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 9ec736f4..61ac16f9 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.2@sha256:ff93361a7b55de4d4c8adb7d7b69e7d60cc67d055de7d2f5cacf26847fda8262 + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.3@sha256:7364fba9e9146fc50d3fbe0d4273fe85f95cee2a793a889504213e564bd9ea3c diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index ec88279c..957297c4 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.2@sha256:2f2bd75d39a02316e458df9fca95ddb6610557a26cfd53c8dbcef47c0a784507 +ghcr.io/cozystack/cozystack/matchbox:v0.34.3@sha256:5c6c6c712a5788dd264a72bbc76752d49ef166fe46c30b41e2c10b275f7c06f0 diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 8c36d03c..5dd041d6 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b4d19f3448d77b55974cccb6c8a0a2d0a54ad3af3880dcf0d84d8941430959f7 +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 7117f3a1..b68176f8 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.2@sha256:afe3505e148cea237fcd34a440c9f9b09449d208f9ca365b3ab09902fe303431 + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.3@sha256:6be0b38a6c1d1e9e94caaf817eac7f22e27f3d2f1ce90a7ee70171e8d374faca diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 953d0ce2..26fd4303 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.2@sha256:efc7c74d2c45f6a83350a7715e3b6217883fa8bfc65a24ad71364dd34b1b8804 + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.3@sha256:293dbc30f7e00f5193010134c96d95bf2a9c0b641b47ab0c65174159a281ff99 debug: false disableTelemetry: false - cozystackVersion: "v0.34.2" + cozystackVersion: "v0.34.3" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 81c287ed..b64872c2 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.2", + "appVersion": "v0.34.3", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index c04ec5aa..4bdf34ce 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,7 +19,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.2 + tag: v0.34.3 digest: "sha256:84c333ce0ecddb153a6886b1c633e4480c78690fb0b49cc0f4cb980bee565134" redis: master: @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.2 - digest: "sha256:674a78dc5fa45213a1b717f9a5fde1d3d47b36c92c4988994918dc42ead9dbe3" + tag: v0.34.3 + digest: "sha256:715e0ee7c23029f308d2b28bb8c5cf84e06ad16bceda7d7772458aba97ee11a7" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index f6f94252..f52409d5 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.2@sha256:dd662e320f44342fe5f10d63545bf1915e97de380c1685e7b28f7a7fce87512e + tag: v0.34.3@sha256:e85d6bf82faac7164a00c4afd455cac1e1e0cb942be6f2a0cc988a5fa43b86cd repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index 238957c8..f46ef638 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.2@sha256:22c91ff21e44aef520a5daa5b83608fb2c5c796ed1c5a645c0a9a0dc69f086cf +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.3@sha256:98102a8bcc07b5e032d85d96a97b8e3e087be3e85c725147a9f900995aa0a056 diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index 75a842ba..d65e69ea 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:9136c774410bf4d4343fca7e1e8901c05fd698b9b91cbf6bcf7183a0e4752316 + tag: v1.13.14@sha256:7ac24e9df7227055ee70a15b8da90bdcdaddddb22879510e56ee396187f8f345 diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index 2413c033..f8a0ae51 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.0@sha256:445c2727b04ac68595b43c988ff17b3d69a7b22b0644fde3b10c65b47a7bc036 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.1@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index 83aff4b8..aac745de 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.2@sha256:4d3f20ae946736d9260193dd1ce0e72114ad6bd6f78fb6528a68efffa2092b07" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.3@sha256:2fe77880b81b0210273c85a142cb13e6857d13dd941337456b426597f5778bc3" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 4a823b6d..c4ac1dbf 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.2@sha256:e751c20edbefb1e458d9272ec5faea011e41bb828c067a562d8ddbd8d9da7242" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.3@sha256:ee07471e050f470187cc5210a25e17f535e56da274fbd360fa04d87e1f28a054" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From af7a8a67ccb2d9c512e176ce3729eaf1b20e699a Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Wed, 30 Jul 2025 16:07:22 +0300 Subject: [PATCH 12/32] keycloak enable cookie-secure Signed-off-by: kklinch0 (cherry picked from commit 7918e282bf42c08f40f966089535f1acc931f93a) --- .../system/keycloak-configure/templates/configure-kk.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/system/keycloak-configure/templates/configure-kk.yaml b/packages/system/keycloak-configure/templates/configure-kk.yaml index adee11b6..00673c03 100644 --- a/packages/system/keycloak-configure/templates/configure-kk.yaml +++ b/packages/system/keycloak-configure/templates/configure-kk.yaml @@ -200,7 +200,7 @@ spec: - groups - kubernetes-client redirectUris: - - "http://dashboard.{{ $host }}/oauth2/callback/*" + - "https://dashboard.{{ $host }}/oauth2/callback/*" {{- range $i, $v := $extraRedirectUris }} - "{{ $v }}" {{- end }} @@ -223,8 +223,6 @@ data: clientSecret: {{ $kubeappsClient }} cookieSecret: {{ $cookieSecret }} extraFlags: - - --ssl-insecure-skip-verify - - --cookie-secure=false - --scope=openid email groups - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/cozy From 5b2310e6fbdd1427cd26bf1f6710bacb6b464d77 Mon Sep 17 00:00:00 2001 From: klinch0 <68821526+klinch0@users.noreply.github.com> Date: Thu, 31 Jul 2025 17:13:25 +0300 Subject: [PATCH 13/32] Update packages/system/keycloak-configure/templates/configure-kk.yaml Co-authored-by: Timofei Larkin Signed-off-by: klinch0 <68821526+klinch0@users.noreply.github.com> (cherry picked from commit 1ab63187c97d65134dcd9ccca208730260642490) --- packages/system/keycloak-configure/templates/configure-kk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/system/keycloak-configure/templates/configure-kk.yaml b/packages/system/keycloak-configure/templates/configure-kk.yaml index 00673c03..c49a3889 100644 --- a/packages/system/keycloak-configure/templates/configure-kk.yaml +++ b/packages/system/keycloak-configure/templates/configure-kk.yaml @@ -223,6 +223,7 @@ data: clientSecret: {{ $kubeappsClient }} cookieSecret: {{ $cookieSecret }} extraFlags: + - --cookie-secure - --scope=openid email groups - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/cozy From 1e3d1c79a4fecb5a9bd5a1d37bb742da55577a05 Mon Sep 17 00:00:00 2001 From: IvanHunters Date: Mon, 28 Jul 2025 16:18:07 +0300 Subject: [PATCH 14/32] [seaweed] add tests Signed-off-by: IvanHunters (cherry picked from commit 730584bd157a05e90ac05140f8951dcfd0ba2b4b) --- hack/e2e-apps/bucket.bats | 47 +++++++++++++++++++ hack/e2e-install-cozystack.bats | 6 +-- .../testing/images/e2e-sandbox/Dockerfile | 3 +- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 hack/e2e-apps/bucket.bats diff --git a/hack/e2e-apps/bucket.bats b/hack/e2e-apps/bucket.bats new file mode 100644 index 00000000..2621812a --- /dev/null +++ b/hack/e2e-apps/bucket.bats @@ -0,0 +1,47 @@ +#!/usr/bin/env bats + +@test "Create and Verify Seeweedfs Bucket" { + # Create the bucket resource + name='test' + kubectl apply -f - < bucket-test-credentials.json + + # Get credentials from the secret + ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' bucket-test-credentials.json) + SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' bucket-test-credentials.json) + BUCKET_NAME=$(jq -r '.spec.bucketName' bucket-test-credentials.json) + + # Start port-forwarding + bash -c 'timeout 100s kubectl port-forward service/seaweedfs-s3 -n tenant-root 8333:8333 > /dev/null 2>&1 &' + + # Wait for port-forward to be ready + timeout 30 sh -ec 'until nc -z localhost 8333; do sleep 1; done' + + # Set up MinIO alias with error handling + mc alias set local https://localhost:8333 $ACCESS_KEY $SECRET_KEY --insecure + + # Upload file to bucket + mc cp bucket-test-credentials.json $BUCKET_NAME/bucket-test-credentials.json + + # Verify file was uploaded + mc ls $BUCKET_NAME/bucket-test-credentials.json + + # Clean up uploaded file + mc rm $BUCKET_NAME/bucket-test-credentials.json + + kubectl -n tenant-test delete bucket.apps.cozystack.io ${name} +} diff --git a/hack/e2e-install-cozystack.bats b/hack/e2e-install-cozystack.bats index 80a0b2d0..d55324b3 100644 --- a/hack/e2e-install-cozystack.bats +++ b/hack/e2e-install-cozystack.bats @@ -123,10 +123,10 @@ EOF @test "Configure Tenant and wait for applications" { # Patch root tenant and wait for its releases - kubectl patch tenants/root -n tenant-root --type merge -p '{"spec":{"host":"example.org","ingress":true,"monitoring":true,"etcd":true,"isolated":true}}' + kubectl patch tenants/root -n tenant-root --type merge -p '{"spec":{"host":"example.org","ingress":true,"monitoring":true,"etcd":true,"isolated":true, "seaweedfs": true}}' - timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root >/dev/null 2>&1; do sleep 1; done' - kubectl wait hr/etcd hr/ingress hr/tenant-root -n tenant-root --timeout=2m --for=condition=ready + timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress monitoring seaweedfs tenant-root >/dev/null 2>&1; do sleep 1; done' + kubectl wait hr/etcd hr/ingress hr/tenant-root hr/seaweedfs -n tenant-root --timeout=4m --for=condition=ready if ! kubectl wait hr/monitoring -n tenant-root --timeout=2m --for=condition=ready; then flux reconcile hr monitoring -n tenant-root --force diff --git a/packages/core/testing/images/e2e-sandbox/Dockerfile b/packages/core/testing/images/e2e-sandbox/Dockerfile index d67dec13..069a1905 100755 --- a/packages/core/testing/images/e2e-sandbox/Dockerfile +++ b/packages/core/testing/images/e2e-sandbox/Dockerfile @@ -19,6 +19,7 @@ RUN curl -sSL "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_${TA && chmod +x /usr/local/bin/yq RUN curl -sSL "https://fluxcd.io/install.sh" | bash RUN curl -sSL "https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh" | sh -s -- -v "${COZYPKG_VERSION}" - +RUN curl https://dl.min.io/client/mc/release/${TARGETOS}-${TARGETARCH}/mc --create-dirs -o /usr/local/bin/mc \ +&& chmod +x /usr/local/bin/mc COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] From beb993c62ca151f9966ef5ea4cc8fcede2fae857 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 31 Jul 2025 17:18:25 +0200 Subject: [PATCH 15/32] [cozystack-api] fix type for ApplicationList Signed-off-by: Andrei Kvapil (cherry picked from commit f057d92a4d66fd11b3eb35ba16d95e9a9d96ee3d) --- pkg/registry/apps/application/rest.go | 46 +++++++++++++++++---------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkg/registry/apps/application/rest.go b/pkg/registry/apps/application/rest.go index 4b80daa3..8cd246eb 100644 --- a/pkg/registry/apps/application/rest.go +++ b/pkg/registry/apps/application/rest.go @@ -254,7 +254,6 @@ func (r *REST) List(ctx context.Context, options *metainternalversion.ListOption klog.Errorf("Invalid field selector: %v", err) return nil, fmt.Errorf("invalid field selector: %v", err) } - // Check if selector is for metadata.name if name, exists := fs.RequiresExactMatch("metadata.name"); exists { // Convert Application name to HelmRelease name @@ -304,17 +303,8 @@ func (r *REST) List(ctx context.Context, options *metainternalversion.ListOption return nil, err } - // Initialize empty Application list - appList := &appsv1alpha1.ApplicationList{ - TypeMeta: metav1.TypeMeta{ - APIVersion: "apps.cozystack.io/v1alpha1", - Kind: "ApplicationList", - }, - ListMeta: metav1.ListMeta{ - ResourceVersion: hrList.GetResourceVersion(), - }, - Items: []appsv1alpha1.Application{}, - } + // Initialize unstructured items array + items := make([]unstructured.Unstructured, 0) // Iterate over HelmReleases and convert to Applications for _, hr := range hrList.Items { @@ -352,7 +342,6 @@ func (r *REST) List(ctx context.Context, options *metainternalversion.ListOption klog.Errorf("Invalid field selector: %v", err) continue } - fieldsSet := fields.Set{ "metadata.name": app.Name, "metadata.namespace": app.Namespace, @@ -362,10 +351,23 @@ func (r *REST) List(ctx context.Context, options *metainternalversion.ListOption } } - appList.Items = append(appList.Items, app) + // Convert Application to unstructured + unstructuredApp, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&app) + if err != nil { + klog.Errorf("Error converting Application %s to unstructured: %v", app.Name, err) + continue + } + items = append(items, unstructured.Unstructured{Object: unstructuredApp}) } - klog.V(6).Infof("Successfully listed %d Application resources in namespace %s", len(appList.Items), namespace) + // Explicitly set apiVersion and kind in unstructured object + appList := &unstructured.UnstructuredList{} + appList.SetAPIVersion("apps.cozystack.io/v1alpha1") + appList.SetKind(r.kindName + "List") + appList.SetResourceVersion(hrList.GetResourceVersion()) + appList.Items = items + + klog.V(6).Infof("Successfully listed %d Application resources in namespace %s", len(items), namespace) return appList, nil } @@ -1015,6 +1017,19 @@ func (r *REST) ConvertToTable(ctx context.Context, object runtime.Object, tableO case *appsv1alpha1.Application: table = r.buildTableFromApplication(*obj) table.ListMeta.ResourceVersion = obj.GetResourceVersion() + case *unstructured.UnstructuredList: + apps := make([]appsv1alpha1.Application, 0, len(obj.Items)) + for _, u := range obj.Items { + var a appsv1alpha1.Application + err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &a) + if err != nil { + klog.Errorf("Failed to convert Unstructured to Application: %v", err) + continue + } + apps = append(apps, a) + } + table = r.buildTableFromApplications(apps) + table.ListMeta.ResourceVersion = obj.GetResourceVersion() case *unstructured.Unstructured: var app appsv1alpha1.Application err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &app) @@ -1046,7 +1061,6 @@ func (r *REST) ConvertToTable(ctx context.Context, object runtime.Object, tableO } klog.V(6).Infof("ConvertToTable: returning table with %d rows", len(table.Rows)) - return &table, nil } From 7d19b0306ea30f9230237190a0f57c432a976ffc Mon Sep 17 00:00:00 2001 From: klinch0 <68821526+klinch0@users.noreply.github.com> Date: Thu, 31 Jul 2025 17:12:57 +0300 Subject: [PATCH 16/32] k8s make volumesnapshot crd name shorter (#1284) ## What this PR does ### Release note ```release-note - k8s make volumesnapshot crd name shorter ``` ## Summary by CodeRabbit * **Chores** * Updated chart version for the Kubernetes application. * Changed Helm chart and namespace references to use a new, shorter name. * Updated version mapping to reflect the latest Kubernetes package version. * Renamed the Helm chart for volume snapshot resources to a shorter name. --- packages/apps/kubernetes/Chart.yaml | 2 +- .../apps/kubernetes/templates/helmreleases/csi.yaml | 2 +- .../templates/helmreleases/volumesnapshot_crd.yaml | 10 +++++----- packages/apps/versions_map | 3 ++- .../volumesnapshot-crd-for-tenant-k8s/Chart.yaml | 2 +- .../system/volumesnapshot-crd-for-tenant-k8s/Makefile | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index ff5deeec..e0c4762e 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.26.1 +version: 0.26.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kubernetes/templates/helmreleases/csi.yaml b/packages/apps/kubernetes/templates/helmreleases/csi.yaml index 780181fa..09927e8a 100644 --- a/packages/apps/kubernetes/templates/helmreleases/csi.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/csi.yaml @@ -35,7 +35,7 @@ spec: storageClass: "{{ . }}" {{- end }} dependsOn: - - name: {{ .Release.Name }}-volumesnapshot-crd-for-tenant-k8s + - name: {{ .Release.Name }}-vsnap-crd namespace: {{ .Release.Namespace }} {{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }} - name: {{ .Release.Name }} diff --git a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml index a21a913c..d12b669f 100644 --- a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml @@ -1,16 +1,16 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: {{ .Release.Name }}-volumesnapshot-crd-for-tenant-k8s + name: {{ .Release.Name }}-vsnap-crd labels: cozystack.io/repository: system cozystack.io/target-cluster-name: {{ .Release.Name }} spec: interval: 5m - releaseName: volumesnapshot-crd-for-tenant-k8s + releaseName: vsnap-crd chart: spec: - chart: cozy-volumesnapshot-crd-for-tenant-k8s + chart: cozy-vsnap-crd reconcileStrategy: Revision sourceRef: kind: HelmRepository @@ -21,8 +21,8 @@ spec: secretRef: name: {{ .Release.Name }}-admin-kubeconfig key: super-admin.svc - targetNamespace: cozy-volumesnapshot-crd-for-tenant-k8s - storageNamespace: cozy-volumesnapshot-crd-for-tenant-k8s + targetNamespace: cozy-vsnap-crd + storageNamespace: cozy-vsnap-crd install: createNamespace: true remediation: diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 9e6b4e05..95b80bb3 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -62,7 +62,8 @@ kubernetes 0.25.0 70f82667 kubernetes 0.25.1 acd4663a kubernetes 0.25.2 08cb7c0f kubernetes 0.26.0 9584e5f5 -kubernetes 0.26.1 HEAD +kubernetes 0.26.1 0e47e1e8 +kubernetes 0.26.2 HEAD mysql 0.1.0 263e47be mysql 0.2.0 c24a103f mysql 0.3.0 53f2365e diff --git a/packages/system/volumesnapshot-crd-for-tenant-k8s/Chart.yaml b/packages/system/volumesnapshot-crd-for-tenant-k8s/Chart.yaml index 46aa7f59..42d950ed 100644 --- a/packages/system/volumesnapshot-crd-for-tenant-k8s/Chart.yaml +++ b/packages/system/volumesnapshot-crd-for-tenant-k8s/Chart.yaml @@ -1,3 +1,3 @@ apiVersion: v2 -name: cozy-volumesnapshot-crd-for-tenant-k8s +name: cozy-vsnap-crd version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process diff --git a/packages/system/volumesnapshot-crd-for-tenant-k8s/Makefile b/packages/system/volumesnapshot-crd-for-tenant-k8s/Makefile index e45b7069..57e5a290 100644 --- a/packages/system/volumesnapshot-crd-for-tenant-k8s/Makefile +++ b/packages/system/volumesnapshot-crd-for-tenant-k8s/Makefile @@ -1,4 +1,4 @@ -export NAME=volumesnapshot-crd-for-tenant-k8s +export NAME=vsnap-crd export NAMESPACE=cozy-$(NAME) include ../../../scripts/package.mk From d82a6a78095973e5cdfc3f07572816cfaf793987 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 1 Aug 2025 18:52:56 +0200 Subject: [PATCH 17/32] [ci] Fix creating draft release Signed-off-by: Andrei Kvapil --- .github/workflows/tags.yaml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tags.yaml b/.github/workflows/tags.yaml index e2418962..80100f23 100644 --- a/.github/workflows/tags.yaml +++ b/.github/workflows/tags.yaml @@ -149,36 +149,35 @@ jobs: version: ${{ steps.tag.outputs.tag }} # A compare-to: ${{ steps.latest_release.outputs.tag }} # B - # Create or reuse DRAFT GitHub Release + # Create or reuse draft release - name: Create / reuse draft release if: steps.check_release.outputs.skip == 'false' id: release uses: actions/github-script@v7 with: script: | - const tag = '${{ steps.tag.outputs.tag }}'; - const isRc = ${{ steps.tag.outputs.is_rc }}; - const outdated = '${{ steps.semver.outputs.comparison-result }}' === '<'; - const makeLatest = outdated ? false : 'legacy'; - const releases = await github.rest.repos.listReleases({ + const tag = '${{ steps.tag.outputs.tag }}'; + const isRc = ${{ steps.tag.outputs.is_rc }}; + const releases = await github.rest.repos.listReleases({ owner: context.repo.owner, repo: context.repo.repo }); - let rel = releases.data.find(r => r.tag_name === tag); + + let rel = releases.data.find(r => r.tag_name === tag); if (!rel) { rel = await github.rest.repos.createRelease({ owner: context.repo.owner, repo: context.repo.repo, - tag_name: tag, - name: tag, - draft: true, - prerelease: isRc, - make_latest: makeLatest + tag_name: tag, + name: tag, + draft: true, + prerelease: isRc // no make_latest for drafts }); console.log(`Draft release created for ${tag}`); } else { console.log(`Re-using existing release ${tag}`); } + core.setOutput('upload_url', rel.upload_url); # Build + upload assets (optional) From 8eebbd2a23a955406b86297758cee50f8f5d6831 Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 13:04:53 +0000 Subject: [PATCH 18/32] Prepare release v0.34.4 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/cluster-autoscaler.tag | 2 +- packages/apps/kubernetes/images/kubevirt-cloud-provider.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 4 ++-- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index 5452b4cf..ac7fd7f0 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:b7633717cd7449c0042ae92d8ca9b36e4d69566561f5c7d44e21058e7d05c6d5 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag index 112eac53..7e710659 100644 --- a/packages/apps/kubernetes/images/cluster-autoscaler.tag +++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.1@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e +ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.2@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag index ec6955a4..3535de68 100644 --- a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag +++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.1@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2 +ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.2@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index ce541953..e78ff813 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.1@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.2@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 8b2e2e24..743c6c8d 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.3@sha256:ffda94ae41ae04e56222a8ddf3601cf09f41049f0997aff4e35df88ceda27e85 + image: ghcr.io/cozystack/cozystack/installer:v0.34.4@sha256:0a5b95cd24a93c17a03823e863edf76717b8568314e26ef5c2ed2b259f685221 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 61ac16f9..74f4d65d 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.3@sha256:7364fba9e9146fc50d3fbe0d4273fe85f95cee2a793a889504213e564bd9ea3c + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.4@sha256:82e42c2416d6704786d37920d162416efc02083a1c30605d22b8213198b515a8 diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index 957297c4..237dea0e 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.3@sha256:5c6c6c712a5788dd264a72bbc76752d49ef166fe46c30b41e2c10b275f7c06f0 +ghcr.io/cozystack/cozystack/matchbox:v0.34.4@sha256:c3a6a374300550480405027212b4ae9b09f3fd92d77c935b2d649bb3b9e9d32f diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 5dd041d6..8c36d03c 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b4d19f3448d77b55974cccb6c8a0a2d0a54ad3af3880dcf0d84d8941430959f7 diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index b68176f8..99b325ac 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.3@sha256:6be0b38a6c1d1e9e94caaf817eac7f22e27f3d2f1ce90a7ee70171e8d374faca + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.4@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 26fd4303..105910a5 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.3@sha256:293dbc30f7e00f5193010134c96d95bf2a9c0b641b47ab0c65174159a281ff99 + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.4@sha256:2465b04edda48033f6f413ddf31748a08fed2d62728f8c26658fa99dd78001d0 debug: false disableTelemetry: false - cozystackVersion: "v0.34.3" + cozystackVersion: "v0.34.4" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index b64872c2..2b03a5e8 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.3", + "appVersion": "v0.34.4", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 4bdf34ce..3c119fee 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,7 +19,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.3 + tag: v0.34.4 digest: "sha256:84c333ce0ecddb153a6886b1c633e4480c78690fb0b49cc0f4cb980bee565134" redis: master: @@ -37,7 +37,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.3 + tag: v0.34.4 digest: "sha256:715e0ee7c23029f308d2b28bb8c5cf84e06ad16bceda7d7772458aba97ee11a7" pluginConfig: flux: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index f52409d5..35a8ea97 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.3@sha256:e85d6bf82faac7164a00c4afd455cac1e1e0cb942be6f2a0cc988a5fa43b86cd + tag: v0.34.4@sha256:7ce47da363e7be4f297e6de42a72416238c66c613e2effdbfa3fef987701d61a repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index f46ef638..551e7a4b 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.3@sha256:98102a8bcc07b5e032d85d96a97b8e3e087be3e85c725147a9f900995aa0a056 +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.4@sha256:6bbb002c6019b222f21d59f7b4d7464fa4c341f22ce72ad5ad24f1291e77e1ce diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index d65e69ea..00279adc 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:7ac24e9df7227055ee70a15b8da90bdcdaddddb22879510e56ee396187f8f345 + tag: v1.13.14@sha256:700909bc6ce8cb958acebe2e4304f05f385a6a9ea91b82d872a1cf1ed935be4c diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index f8a0ae51..645ef8f1 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.1@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.2@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index aac745de..0e62dda4 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.3@sha256:2fe77880b81b0210273c85a142cb13e6857d13dd941337456b426597f5778bc3" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.4@sha256:e1b7b313fc00653d9515aa5ff90c6feb9fd0a4aaf140cbe9a1cf8baf02e44823" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index c4ac1dbf..e06d2b0d 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.3@sha256:ee07471e050f470187cc5210a25e17f535e56da274fbd360fa04d87e1f28a054" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.4@sha256:a11b4d153e6d38247d2b4a814e6b4f8e5287b23c23878313b25b48a399fe5735" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From 278e512afd7ffec7a862ea3ce066490170556b10 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Mon, 4 Aug 2025 15:26:31 +0300 Subject: [PATCH 19/32] [kubernetes] Disable VPA for VPA in tenant k8s This patch disables the VPA for VPA deployment in tenant kubernetes clusters. This feature was never designed for deployment in tenant clusters and causes unexpected errors. [kubernetes] Disable VPA for VPA feature for tenant clusters, fixing an unintended regression. Signed-off-by: Timofei Larkin (cherry picked from commit 080289fa00fccc79476eae3d6b544eb939770b6d) --- packages/apps/kubernetes/Chart.yaml | 2 +- .../templates/helmreleases/vertical-pod-autoscaler.yaml | 1 + packages/apps/versions_map | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index e0c4762e..79133ac1 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.26.2 +version: 0.26.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml index 0d86b24e..9bb81ed8 100644 --- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml @@ -4,6 +4,7 @@ {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} {{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }} vertical-pod-autoscaler: + vpaForVPA: false recommender: extraArgs: container-name-label: container diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 95b80bb3..022e4b1a 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -63,7 +63,8 @@ kubernetes 0.25.1 acd4663a kubernetes 0.25.2 08cb7c0f kubernetes 0.26.0 9584e5f5 kubernetes 0.26.1 0e47e1e8 -kubernetes 0.26.2 HEAD +kubernetes 0.26.2 8ddbe32e +kubernetes 0.26.3 HEAD mysql 0.1.0 263e47be mysql 0.2.0 c24a103f mysql 0.3.0 53f2365e From 6e05e1275c9a83934d257eee7414a442a332151b Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Mon, 4 Aug 2025 14:12:37 +0300 Subject: [PATCH 20/32] [virtual-machine] Disable instanceType validation Workaround for #1299. If a Cozystack installation provides custom instance types for virtual machines, the static validation rules prevent such instance types from being used, as they are included in the OpenAPI schema of the Cozystack API server and then once more applied in the dependent HelmRelease, offering users no easy way to remedy this in runtime. [virtual-machine] Disable instanceType validation to enable using custom instance types. Signed-off-by: Timofei Larkin (cherry picked from commit 44fabd4abcbebea765a7f86c87d9b9811b774f8c) --- packages/apps/versions_map | 6 ++- packages/apps/virtual-machine/Chart.yaml | 2 +- packages/apps/virtual-machine/Makefile | 4 +- .../apps/virtual-machine/values.schema.json | 53 +------------------ packages/apps/vm-instance/Chart.yaml | 2 +- packages/apps/vm-instance/Makefile | 4 +- packages/apps/vm-instance/values.schema.json | 53 +------------------ 7 files changed, 12 insertions(+), 112 deletions(-) diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 95b80bb3..2b8cb331 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -174,7 +174,8 @@ virtual-machine 0.10.2 632224a3 virtual-machine 0.11.0 4369b031 virtual-machine 0.12.0 acd4663a virtual-machine 0.12.1 909208ba -virtual-machine 0.12.2 HEAD +virtual-machine 0.12.2 8ddbe32e +virtual-machine 0.12.3 HEAD vm-disk 0.1.0 d971f2ff vm-disk 0.1.1 6130f43d vm-disk 0.1.2 632224a3 @@ -193,7 +194,8 @@ vm-instance 0.7.2 632224a3 vm-instance 0.8.0 4369b031 vm-instance 0.9.0 acd4663a vm-instance 0.10.0 909208ba -vm-instance 0.10.1 HEAD +vm-instance 0.10.1 8ddbe32e +vm-instance 0.10.2 HEAD vpn 0.1.0 263e47be vpn 0.2.0 53f2365e vpn 0.3.0 6c5cf5bf diff --git a/packages/apps/virtual-machine/Chart.yaml b/packages/apps/virtual-machine/Chart.yaml index 68b5e986..e58f6a0c 100644 --- a/packages/apps/virtual-machine/Chart.yaml +++ b/packages/apps/virtual-machine/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.12.2 +version: 0.12.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/virtual-machine/Makefile b/packages/apps/virtual-machine/Makefile index 4bbfcd8c..5234bd85 100644 --- a/packages/apps/virtual-machine/Makefile +++ b/packages/apps/virtual-machine/Makefile @@ -3,8 +3,8 @@ include ../../../scripts/package.mk generate: readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md yq -o json -i '.properties.gpus.items.type = "object" | .properties.gpus.default = []' values.schema.json - INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json + # INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ + # && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json diff --git a/packages/apps/virtual-machine/values.schema.json b/packages/apps/virtual-machine/values.schema.json index 92b7da9e..2d328886 100644 --- a/packages/apps/virtual-machine/values.schema.json +++ b/packages/apps/virtual-machine/values.schema.json @@ -93,58 +93,7 @@ "instanceType": { "default": "u1.medium", "description": "Virtual Machine instance type", - "type": "string", - "enum": [ - "cx1.2xlarge", - "cx1.4xlarge", - "cx1.8xlarge", - "cx1.large", - "cx1.medium", - "cx1.xlarge", - "gn1.2xlarge", - "gn1.4xlarge", - "gn1.8xlarge", - "gn1.xlarge", - "m1.2xlarge", - "m1.4xlarge", - "m1.8xlarge", - "m1.large", - "m1.xlarge", - "n1.2xlarge", - "n1.4xlarge", - "n1.8xlarge", - "n1.large", - "n1.medium", - "n1.xlarge", - "o1.2xlarge", - "o1.4xlarge", - "o1.8xlarge", - "o1.large", - "o1.medium", - "o1.micro", - "o1.nano", - "o1.small", - "o1.xlarge", - "rt1.2xlarge", - "rt1.4xlarge", - "rt1.8xlarge", - "rt1.large", - "rt1.medium", - "rt1.micro", - "rt1.small", - "rt1.xlarge", - "u1.2xlarge", - "u1.2xmedium", - "u1.4xlarge", - "u1.8xlarge", - "u1.large", - "u1.medium", - "u1.micro", - "u1.nano", - "u1.small", - "u1.xlarge", - "" - ] + "type": "string" }, "resources": { "properties": { diff --git a/packages/apps/vm-instance/Chart.yaml b/packages/apps/vm-instance/Chart.yaml index 28733b49..3adb6a85 100644 --- a/packages/apps/vm-instance/Chart.yaml +++ b/packages/apps/vm-instance/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.1 +version: 0.10.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vm-instance/Makefile b/packages/apps/vm-instance/Makefile index 3a21209b..38d781ae 100644 --- a/packages/apps/vm-instance/Makefile +++ b/packages/apps/vm-instance/Makefile @@ -4,8 +4,8 @@ generate: readme-generator-for-helm -v values.yaml -s values.schema.json -r README.md yq -o json -i '.properties.disks.items.type = "object" | .properties.disks.default = []' values.schema.json yq -o json -i '.properties.gpus.items.type = "object" | .properties.gpus.default = []' values.schema.json - INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ - && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json + #INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \ + # && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json PREFERENCES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/preferences.yaml | yq 'split(" ") | . + [""]' -o json) \ && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json yq -i -o json '.properties.externalPorts.items.type = "integer"' values.schema.json diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json index 05b49a0d..c411e3ab 100644 --- a/packages/apps/vm-instance/values.schema.json +++ b/packages/apps/vm-instance/values.schema.json @@ -101,58 +101,7 @@ "instanceType": { "default": "u1.medium", "description": "Virtual Machine instance type", - "type": "string", - "enum": [ - "cx1.2xlarge", - "cx1.4xlarge", - "cx1.8xlarge", - "cx1.large", - "cx1.medium", - "cx1.xlarge", - "gn1.2xlarge", - "gn1.4xlarge", - "gn1.8xlarge", - "gn1.xlarge", - "m1.2xlarge", - "m1.4xlarge", - "m1.8xlarge", - "m1.large", - "m1.xlarge", - "n1.2xlarge", - "n1.4xlarge", - "n1.8xlarge", - "n1.large", - "n1.medium", - "n1.xlarge", - "o1.2xlarge", - "o1.4xlarge", - "o1.8xlarge", - "o1.large", - "o1.medium", - "o1.micro", - "o1.nano", - "o1.small", - "o1.xlarge", - "rt1.2xlarge", - "rt1.4xlarge", - "rt1.8xlarge", - "rt1.large", - "rt1.medium", - "rt1.micro", - "rt1.small", - "rt1.xlarge", - "u1.2xlarge", - "u1.2xmedium", - "u1.4xlarge", - "u1.8xlarge", - "u1.large", - "u1.medium", - "u1.micro", - "u1.nano", - "u1.small", - "u1.xlarge", - "" - ] + "type": "string" }, "resources": { "properties": { From d1e430dc6c80be1b8190443b9ff808f5ff89e4a8 Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Mon, 4 Aug 2025 14:56:40 +0000 Subject: [PATCH 21/32] Prepare release v0.34.5 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/cluster-autoscaler.tag | 2 +- .../apps/kubernetes/images/kubevirt-cloud-provider.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 8 ++++---- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index ac7fd7f0..facd7f1a 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:c1944c60a449e36e29153a38db6feee41139d38b02fe3670efb673feb3bc0ee6 diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag index 7e710659..009f1e2f 100644 --- a/packages/apps/kubernetes/images/cluster-autoscaler.tag +++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.2@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e +ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.3@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag index 3535de68..0a2d98d9 100644 --- a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag +++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.2@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2 +ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.26.3@sha256:5335c044313b69ee13b30ca4941687e509005e55f4ae25723861edbf2fbd6dd2 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index e78ff813..8870cebd 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.2@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 743c6c8d..fe43db6e 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.4@sha256:0a5b95cd24a93c17a03823e863edf76717b8568314e26ef5c2ed2b259f685221 + image: ghcr.io/cozystack/cozystack/installer:v0.34.5@sha256:8a0a5f57326dc281248030b593fdb1143e9acf8a0d0a87124809a13639680acd diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 74f4d65d..cfb33151 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.4@sha256:82e42c2416d6704786d37920d162416efc02083a1c30605d22b8213198b515a8 + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.5@sha256:62936c30bf782938bd29068156b8d5a36a8b84d0fa749c9500f11dbb3ec6f804 diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index 237dea0e..5a267a39 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.4@sha256:c3a6a374300550480405027212b4ae9b09f3fd92d77c935b2d649bb3b9e9d32f +ghcr.io/cozystack/cozystack/matchbox:v0.34.5@sha256:fd97aaa810d3e73eff7f3c2c1315dab91f5c65bca2bbc8d9c990de08374086dc diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 8c36d03c..dda4e5e5 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b4d19f3448d77b55974cccb6c8a0a2d0a54ad3af3880dcf0d84d8941430959f7 +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:dd078a49b1c1ab648af227ef7b2b4425db6eeafa560b5a0dc7294c02c8d5b296 diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 99b325ac..5c5e79a1 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.4@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.5@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 105910a5..a436b6b7 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.4@sha256:2465b04edda48033f6f413ddf31748a08fed2d62728f8c26658fa99dd78001d0 + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.5@sha256:b1d71049967a00271e1380f2ac60b2cde0d599a6d48d5e224033230facc4ca8e debug: false disableTelemetry: false - cozystackVersion: "v0.34.4" + cozystackVersion: "v0.34.5" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 2b03a5e8..5b3da893 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.4", + "appVersion": "v0.34.5", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 3c119fee..97e29574 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,8 +19,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.4 - digest: "sha256:84c333ce0ecddb153a6886b1c633e4480c78690fb0b49cc0f4cb980bee565134" + tag: v0.34.5 + digest: "sha256:ad4b95660b6c5c1b9736ca4768a3f9648705c2855d0a08880d570b4e480dba78" redis: master: resourcesPreset: "none" @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.4 - digest: "sha256:715e0ee7c23029f308d2b28bb8c5cf84e06ad16bceda7d7772458aba97ee11a7" + tag: v0.34.5 + digest: "sha256:2f405ba236c4b3a297695a4d6cc7a030acae8e900a22f1a88e0ab24119221836" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index 35a8ea97..caa69fbe 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.4@sha256:7ce47da363e7be4f297e6de42a72416238c66c613e2effdbfa3fef987701d61a + tag: v0.34.5@sha256:dd662e320f44342fe5f10d63545bf1915e97de380c1685e7b28f7a7fce87512e repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index 551e7a4b..95d58284 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.4@sha256:6bbb002c6019b222f21d59f7b4d7464fa4c341f22ce72ad5ad24f1291e77e1ce +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.5@sha256:a849e152b533eb795658b3e406ea0156178ac4bbab567bcf21bea38898bd6174 diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index 00279adc..f030ba5a 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:700909bc6ce8cb958acebe2e4304f05f385a6a9ea91b82d872a1cf1ed935be4c + tag: v1.13.14@sha256:d8baa0b06451c48986a85cc4ce90b91d7479df79b11de68d8fc2bce39f1ea74a diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index 645ef8f1..f0d14c5d 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.2@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index 0e62dda4..b39f4f78 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.4@sha256:e1b7b313fc00653d9515aa5ff90c6feb9fd0a4aaf140cbe9a1cf8baf02e44823" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.5@sha256:e1b7b313fc00653d9515aa5ff90c6feb9fd0a4aaf140cbe9a1cf8baf02e44823" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index e06d2b0d..862e5181 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.4@sha256:a11b4d153e6d38247d2b4a814e6b4f8e5287b23c23878313b25b48a399fe5735" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.5@sha256:6bdb9ff087097be1f25759165da8f1c8674fb30ee41a93750219c8f8d9dfd942" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From 56fca9bd75efeca25f9483f6c514b6fec26d5d22 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 5 Aug 2025 12:54:47 +0200 Subject: [PATCH 22/32] [dashboard] fix diff editor Signed-off-by: Andrei Kvapil --- packages/system/dashboard/images/dashboard/Dockerfile | 2 +- packages/system/dashboard/images/kubeapps-apis/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/system/dashboard/images/dashboard/Dockerfile b/packages/system/dashboard/images/dashboard/Dockerfile index 633d9e7f..48656a2c 100644 --- a/packages/system/dashboard/images/dashboard/Dockerfile +++ b/packages/system/dashboard/images/dashboard/Dockerfile @@ -1,7 +1,7 @@ FROM bitnami/node:20.15.1 AS build WORKDIR /app -ARG COMMIT_REF=cdf9095f50c74505870de337725d2a9d0bd20947 +ARG COMMIT_REF=4926bc68fabb0914afab574006643c85a597b371 RUN wget -O- https://github.com/cozystack/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=2 kubeapps-${COMMIT_REF}/dashboard RUN yarn install --frozen-lockfile diff --git a/packages/system/dashboard/images/kubeapps-apis/Dockerfile b/packages/system/dashboard/images/kubeapps-apis/Dockerfile index 619f9386..a525a170 100644 --- a/packages/system/dashboard/images/kubeapps-apis/Dockerfile +++ b/packages/system/dashboard/images/kubeapps-apis/Dockerfile @@ -4,7 +4,7 @@ # syntax = docker/dockerfile:1 FROM alpine AS source -ARG COMMIT_REF=cdf9095f50c74505870de337725d2a9d0bd20947 +ARG COMMIT_REF=4926bc68fabb0914afab574006643c85a597b371 RUN apk add --no-cache patch WORKDIR /source RUN wget -O- https://github.com/cozystack/kubeapps/archive/${COMMIT_REF}.tar.gz | tar xzf - --strip-components=1 From 255964bbe4a6a2bf6ed321130ffe84ae68b59d06 Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:57:37 +0000 Subject: [PATCH 23/32] Prepare release v0.34.6 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/kubernetes/images/cluster-autoscaler.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 8 ++++---- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag index 009f1e2f..71276b45 100644 --- a/packages/apps/kubernetes/images/cluster-autoscaler.tag +++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.3@sha256:3a8170433e1632e5cc2b6d9db34d0605e8e6c63c158282c38450415e700e932e +ghcr.io/cozystack/cozystack/cluster-autoscaler:0.26.3@sha256:e4fbb7d2043f25b90cc8840468d0880e9d3d72ae8b1c8801bf8c35f944cc485d diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index fe43db6e..82a1a18d 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.5@sha256:8a0a5f57326dc281248030b593fdb1143e9acf8a0d0a87124809a13639680acd + image: ghcr.io/cozystack/cozystack/installer:v0.34.6@sha256:3b84eaf0df5dd68269102042c5119d1e47958d18d12ab301a0fad458a31a6847 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index cfb33151..c27a1a50 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.5@sha256:62936c30bf782938bd29068156b8d5a36a8b84d0fa749c9500f11dbb3ec6f804 + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.6@sha256:f99eca85c60edd6ea54b272d365a9782b01a8a441e34e7f577188229981dfb07 diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index 5a267a39..269e2d77 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.5@sha256:fd97aaa810d3e73eff7f3c2c1315dab91f5c65bca2bbc8d9c990de08374086dc +ghcr.io/cozystack/cozystack/matchbox:v0.34.6@sha256:a80fc9c3fa4727c791f6de1e4dab5fa3710098afb98550d6ac90179b481dc4e8 diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index dda4e5e5..5dd041d6 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:dd078a49b1c1ab648af227ef7b2b4425db6eeafa560b5a0dc7294c02c8d5b296 +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 5c5e79a1..39116407 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.5@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.6@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index a436b6b7..59c26cd0 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.5@sha256:b1d71049967a00271e1380f2ac60b2cde0d599a6d48d5e224033230facc4ca8e + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.6@sha256:c4714f67542f32893cc56e98be6c331a5c205f397e733b8c5f3c88263066d0de debug: false disableTelemetry: false - cozystackVersion: "v0.34.5" + cozystackVersion: "v0.34.6" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 5b3da893..0eacef67 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.5", + "appVersion": "v0.34.6", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 97e29574..e039f598 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,8 +19,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.5 - digest: "sha256:ad4b95660b6c5c1b9736ca4768a3f9648705c2855d0a08880d570b4e480dba78" + tag: v0.34.6 + digest: "sha256:54906b3d2492c8603a347a5938b6db36e5ed5c4149111cae1804ac9110361947" redis: master: resourcesPreset: "none" @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.5 - digest: "sha256:2f405ba236c4b3a297695a4d6cc7a030acae8e900a22f1a88e0ab24119221836" + tag: v0.34.6 + digest: "sha256:9f1815ab926dda0c9d3d2f0643a7e3f85b64499cc89500894f505c06c25e5d28" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index caa69fbe..39bbd525 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.5@sha256:dd662e320f44342fe5f10d63545bf1915e97de380c1685e7b28f7a7fce87512e + tag: v0.34.6@sha256:34fd801c11ef8df168e9d367e2dc4a59564ed7210b60e088d058fce77b2c4f2d repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index 95d58284..e6753f15 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.5@sha256:a849e152b533eb795658b3e406ea0156178ac4bbab567bcf21bea38898bd6174 +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.6@sha256:92c6289c139d362903f2bc60b6e7ce4e9a14c3ccd533c83c2f95a1b833faf45d diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index b39f4f78..07a8e9b2 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.5@sha256:e1b7b313fc00653d9515aa5ff90c6feb9fd0a4aaf140cbe9a1cf8baf02e44823" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.6@sha256:064b955effb80676f1d4fa81944efc495fd4a4f8dec026eca308ef52c459c356" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 862e5181..5ed7fba7 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -102,7 +102,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.5@sha256:6bdb9ff087097be1f25759165da8f1c8674fb30ee41a93750219c8f8d9dfd942" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.6@sha256:9a5aa34e0b84d191ca84371ce3dfa3213e301b3ba2fbd017a2ce60baef32ebb9" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From 202e8d011c0d95529bcdc9b0c924580305c42f15 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Thu, 7 Aug 2025 13:37:15 +0300 Subject: [PATCH 24/32] [fix] Disable VPA for VPA The earlier PR was erroneously merged without including an amendment to the existing commits, so now this amendment must be included as a separate patch. See #1301 for details. Signed-off-by: Timofei Larkin (cherry picked from commit ff3305f43ce4ab3f228b15666ceb22c0b5ebd59e) --- .../templates/helmreleases/vertical-pod-autoscaler.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml index 9bb81ed8..34375d8c 100644 --- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml @@ -3,8 +3,8 @@ {{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }} {{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }} {{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }} +vpaForVPA: false vertical-pod-autoscaler: - vpaForVPA: false recommender: extraArgs: container-name-label: container From 4f52af254710eae2555e5bf14b0debd84d60be35 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 8 Aug 2025 11:33:27 +0200 Subject: [PATCH 25/32] Fix linstor metrics node label Signed-off-by: Andrei Kvapil (cherry picked from commit 19baa7b14fb75a10ee00fc129140c2f04e62de31) --- packages/system/linstor/templates/podscrape.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/system/linstor/templates/podscrape.yaml b/packages/system/linstor/templates/podscrape.yaml index 9c334527..eeb5c0af 100644 --- a/packages/system/linstor/templates/podscrape.yaml +++ b/packages/system/linstor/templates/podscrape.yaml @@ -14,7 +14,7 @@ spec: - replacement: linstor-controller targetLabel: job - sourceLabels: [__meta_kubernetes_pod_node_name] - targetLabel: node + targetLabel: controller_node - targetLabel: tier replacement: cluster selector: From 8f390a0e8ceaa6a232c1764c16a040d3c6cf5c21 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 8 Aug 2025 23:06:34 +0200 Subject: [PATCH 26/32] [seaweedfs] Add SeaweedFS tewaks Signed-off-by: Andrei Kvapil (cherry picked from commit a32de78c7c436242d1b052132ae9a65abc39e7c2) --- packages/extra/seaweedfs/templates/seaweedfs.yaml | 1 + packages/system/seaweedfs/values.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml index af485c46..9306bf61 100644 --- a/packages/extra/seaweedfs/templates/seaweedfs.yaml +++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml @@ -110,6 +110,7 @@ spec: {{- else if $.Values.storageClass }} storageClass: {{ $.Values.storageClass }} {{- end }} + maxVolumes: 0 nodeSelector: | topology.kubernetes.io/zone: {{ $zoneName }} dataCenter: {{ $zone.dataCenter | default $zoneName }} diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 5ed7fba7..b788b069 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -6,8 +6,8 @@ global: WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888" seaweedfs: master: + volumeSizeLimitMB: 30000 replicas: 3 - volumeSizeLimitMB: 100 # replication type is XYZ: # X number of replica in other data centers # Y number of replica in other racks in the same data center From 96d462e911d4458704b596533d3f10e4b5e80862 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 8 Aug 2025 23:27:01 +0200 Subject: [PATCH 27/32] [seaweedfs] disable proxy-buffering for ingress (#1330) Signed-off-by: Andrei Kvapil ## What this PR does ### Release note ```release-note [seaweedfs] disable proxy-buffering for ingress ``` --- packages/system/seaweedfs/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index b788b069..9b20305b 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -87,6 +87,8 @@ seaweedfs: host: "seaweedfs2.demo.cozystack.io" annotations: nginx.ingress.kubernetes.io/proxy-body-size: "0" + nginx.ingress.kubernetes.io/proxy-buffering: "off" + nginx.ingress.kubernetes.io/proxy-request-buffering: "off" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" acme.cert-manager.io/http01-ingress-class: tenant-root cert-manager.io/cluster-issuer: letsencrypt-prod From 859d760a7515f761f761483870d6df8a43f1308c Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Fri, 8 Aug 2025 21:34:10 +0000 Subject: [PATCH 28/32] Prepare release v0.34.7 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 6 +++--- packages/system/kamaji/values.yaml | 2 +- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index facd7f1a..ac7fd7f0 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:c1944c60a449e36e29153a38db6feee41139d38b02fe3670efb673feb3bc0ee6 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index 8870cebd..e4ea2e28 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:318ded0e7e2ca0329c86da13678699782bf5388cdcd074737c667872876f82fe diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 82a1a18d..1312f784 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.6@sha256:3b84eaf0df5dd68269102042c5119d1e47958d18d12ab301a0fad458a31a6847 + image: ghcr.io/cozystack/cozystack/installer:v0.34.7@sha256:fc481d8b11d3a044b3f9912f74a88d43468e338c7f34127a0ad5877870fe61d2 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index c27a1a50..36994cac 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.6@sha256:f99eca85c60edd6ea54b272d365a9782b01a8a441e34e7f577188229981dfb07 + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.7@sha256:b9b3597d2ffccef11e429f6bfe1ca71e9a5505464bb46aac2c188b674c137e3e diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index 269e2d77..a1f0e099 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.6@sha256:a80fc9c3fa4727c791f6de1e4dab5fa3710098afb98550d6ac90179b481dc4e8 +ghcr.io/cozystack/cozystack/matchbox:v0.34.7@sha256:6ceb04dcaf128ab65d3125eb87124346c97551d187d69ba0374903c6d612e06a diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index 5dd041d6..bff61a19 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:b39a00543d28cb72617bc50c7a9f873d65c3cd34114d9690cf044f7fac66c8da +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:8615db0155341488ccba16882046b254c932195a7538709349da9cb0a620b94a diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 39116407..0acfa2d8 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.6@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.7@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index 59c26cd0..d745d84e 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.6@sha256:c4714f67542f32893cc56e98be6c331a5c205f397e733b8c5f3c88263066d0de + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.7@sha256:b6ec5e882b0e45c9ea6502f363e692b6183a3a62720cece2e4ccc472f3c3d94a debug: false disableTelemetry: false - cozystackVersion: "v0.34.6" + cozystackVersion: "v0.34.7" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 0eacef67..6181d224 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.6", + "appVersion": "v0.34.7", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index e039f598..72d906a9 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,7 +19,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.6 + tag: v0.34.7 digest: "sha256:54906b3d2492c8603a347a5938b6db36e5ed5c4149111cae1804ac9110361947" redis: master: @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.6 - digest: "sha256:9f1815ab926dda0c9d3d2f0643a7e3f85b64499cc89500894f505c06c25e5d28" + tag: v0.34.7 + digest: "sha256:9fed0337a117f2b353e56074029b3657c35e191e38edf82eb4a8d08b9d74fe1a" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index 39bbd525..dc6d3bb3 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.6@sha256:34fd801c11ef8df168e9d367e2dc4a59564ed7210b60e088d058fce77b2c4f2d + tag: v0.34.7@sha256:908dc829ce8493607dffcf6de95e4993ff2bfc0d65949c501bd7119fad45127a repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index e6753f15..650255cb 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.6@sha256:92c6289c139d362903f2bc60b6e7ce4e9a14c3ccd533c83c2f95a1b833faf45d +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.7@sha256:e6c845b65142d554d34187aef29afcbd8f67fae7dcc787255fb53de2b6103386 diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index f030ba5a..4c05bd0e 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:d8baa0b06451c48986a85cc4ce90b91d7479df79b11de68d8fc2bce39f1ea74a + tag: v1.13.14@sha256:875846d46d9e4bc1880c4d55b06ec8e947d7f139eb8472dda989a15108a373d8 diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index f0d14c5d..3ded8c72 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:761e7235ff9cb7f6f223f00954943e6a5af32ed6624ee592a8610122f96febb0 + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:318ded0e7e2ca0329c86da13678699782bf5388cdcd074737c667872876f82fe diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index 07a8e9b2..bbb663e2 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.6@sha256:064b955effb80676f1d4fa81944efc495fd4a4f8dec026eca308ef52c459c356" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.7@sha256:5891c7fb46fb7c6ada4abc4e78e69b34631d13e32a30a86c0abc15cc17675450" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index 9b20305b..dddff7b2 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -104,7 +104,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.6@sha256:9a5aa34e0b84d191ca84371ce3dfa3213e301b3ba2fbd017a2ce60baef32ebb9" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.7@sha256:ccc7ec31b2beebf09413b9a41ffa8fd06899510127572c9e1c1e30ddab45ebe9" certificates: commonName: "SeaweedFS CA" ipAddresses: [] From 60dd5778a1f895ada520563e96b23dd4a4c1c9b6 Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Mon, 11 Aug 2025 11:29:39 +0300 Subject: [PATCH 29/32] fix etcd topologySpreadConstraints Signed-off-by: kklinch0 (cherry picked from commit 92f206cb93a584662bc67939e2f98fecc1e0f41c) --- packages/extra/etcd/Chart.yaml | 2 +- packages/extra/etcd/templates/etcd-cluster.yaml | 9 +++++++++ packages/extra/versions_map | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/extra/etcd/Chart.yaml b/packages/extra/etcd/Chart.yaml index cdc44062..acf80e4c 100644 --- a/packages/extra/etcd/Chart.yaml +++ b/packages/extra/etcd/Chart.yaml @@ -3,4 +3,4 @@ name: etcd description: Storage for Kubernetes clusters icon: /logos/etcd.svg type: application -version: 2.9.0 +version: 2.9.1 diff --git a/packages/extra/etcd/templates/etcd-cluster.yaml b/packages/extra/etcd/templates/etcd-cluster.yaml index f3b5637f..19cef37a 100644 --- a/packages/extra/etcd/templates/etcd-cluster.yaml +++ b/packages/extra/etcd/templates/etcd-cluster.yaml @@ -49,6 +49,14 @@ spec: {{- with .Values.resources }} resources: {{- include "cozy-lib.resources.sanitize" (list . $) | nindent 10 }} {{- end }} + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- $rawConstraints := "" }} + {{- if $configMap }} + {{- $rawConstraints = get $configMap.data "globalAppTopologySpreadConstraints" }} + {{- end }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 6 }} + {{- else }} topologySpreadConstraints: - maxSkew: 1 topologyKey: "kubernetes.io/hostname" @@ -56,6 +64,7 @@ spec: labelSelector: matchLabels: app.kubernetes.io/instance: etcd + {{- end }} podDisruptionBudgetTemplate: {} --- apiVersion: cert-manager.io/v1 diff --git a/packages/extra/versions_map b/packages/extra/versions_map index bc581f82..573257d3 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -13,7 +13,8 @@ etcd 2.6.0 8c460528 etcd 2.6.1 45a7416c etcd 2.7.0 632224a3 etcd 2.8.0 4369b031 -etcd 2.9.0 HEAD +etcd 2.9.0 8ddbe32e +etcd 2.9.1 HEAD info 1.0.0 93bdf411 info 1.0.1 632224a3 info 1.1.0 HEAD From 003aeac317cc3c72453017a2569d316bc6a8e6a6 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 12 Aug 2025 14:06:54 +0300 Subject: [PATCH 30/32] Fix linstor metrics node label Signed-off-by: Andrei Kvapil (cherry picked from commit 21d6c69f73ac369828b28d9a35f9045713d0d085) --- packages/system/linstor/templates/podscrape.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/system/linstor/templates/podscrape.yaml b/packages/system/linstor/templates/podscrape.yaml index eeb5c0af..786bc687 100644 --- a/packages/system/linstor/templates/podscrape.yaml +++ b/packages/system/linstor/templates/podscrape.yaml @@ -14,7 +14,7 @@ spec: - replacement: linstor-controller targetLabel: job - sourceLabels: [__meta_kubernetes_pod_node_name] - targetLabel: controller_node + targetLabel: node - targetLabel: tier replacement: cluster selector: @@ -37,7 +37,7 @@ spec: - replacement: linstor-satellite targetLabel: job - sourceLabels: [__meta_kubernetes_pod_node_name] - targetLabel: node + targetLabel: controller_node - targetLabel: tier replacement: cluster selector: From 824eccdbf16d409d725dcbec3b127c716f121c77 Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Tue, 12 Aug 2025 14:22:15 +0300 Subject: [PATCH 31/32] [kamaji] Pass in-tree image as migrate-image The in-tree build of the Kamaji image lacks the appropriate ldflags, resulting in invalid flags of the Kamaji controller manager binary. When a migration job starts, it tries to pull an image with an explicit empty string as a tag, which is invalid. This patch sets the in-tree image as the image for the migration job, both working around this issue, as well as being consistent in the image used. Signed-off-by: Timofei Larkin (cherry picked from commit fbc2c45e7f1701e568de33ca926ae370930d9d91) --- packages/system/kamaji/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile index aa864c1a..55921018 100644 --- a/packages/system/kamaji/Makefile +++ b/packages/system/kamaji/Makefile @@ -27,4 +27,5 @@ image: yq -i '.kamaji.image.repository = strenv(REPOSITORY)' values.yaml TAG=$(TAG)@$$(yq e '."containerimage.digest"' images/kamaji.json -o json -r) \ yq -i '.kamaji.image.tag = strenv(TAG)' values.yaml + yq -i '.kamaji.extraArgs[0] = "--migrate-image=" + .kamaji.image.repository + ":" + .kamaji.image.tag' values.yaml rm -f images/kamaji.json From c64f616eaed872b4523ad39d4b8a0c6201a37f59 Mon Sep 17 00:00:00 2001 From: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> Date: Tue, 12 Aug 2025 12:42:46 +0000 Subject: [PATCH 32/32] Prepare release v0.34.8 Signed-off-by: cozystack-bot <217169706+cozystack-bot@users.noreply.github.com> --- packages/apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/kubernetes/images/kubevirt-csi-driver.tag | 2 +- packages/core/installer/values.yaml | 2 +- packages/core/testing/values.yaml | 2 +- packages/extra/bootbox/images/matchbox.tag | 2 +- packages/system/bucket/images/s3manager.tag | 2 +- packages/system/cozystack-api/values.yaml | 2 +- packages/system/cozystack-controller/values.yaml | 4 ++-- .../charts/kubeapps/templates/dashboard/configmap.yaml | 2 +- packages/system/dashboard/values.yaml | 6 +++--- packages/system/kamaji/values.yaml | 4 +++- packages/system/kubeovn-webhook/values.yaml | 2 +- packages/system/kubeovn/values.yaml | 2 +- packages/system/kubevirt-csi-node/values.yaml | 2 +- packages/system/objectstorage-controller/values.yaml | 2 +- packages/system/seaweedfs/values.yaml | 2 +- 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index ac7fd7f0..987b0886 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:e0a07082bb6fc6aeaae2315f335386f1705a646c72f9e0af512aebbca5cb2b15 +ghcr.io/cozystack/cozystack/nginx-cache:0.6.1@sha256:50ac1581e3100bd6c477a71161cb455a341ffaf9e5e2f6086802e4e25271e8af diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag index e4ea2e28..fea2f898 100644 --- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag +++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:318ded0e7e2ca0329c86da13678699782bf5388cdcd074737c667872876f82fe +ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:df3a2f503b4a035567b20b81a0f105c15971274fd675101c3b3eb2413d966d2e diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 1312f784..be3b0fa1 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.34.7@sha256:fc481d8b11d3a044b3f9912f74a88d43468e338c7f34127a0ad5877870fe61d2 + image: ghcr.io/cozystack/cozystack/installer:v0.34.8@sha256:c9dae64d1cbb3882749aae3af47e63152a835cb603af12ba573618c0d0940437 diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml index 36994cac..99db3b67 100755 --- a/packages/core/testing/values.yaml +++ b/packages/core/testing/values.yaml @@ -1,2 +1,2 @@ e2e: - image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.7@sha256:b9b3597d2ffccef11e429f6bfe1ca71e9a5505464bb46aac2c188b674c137e3e + image: ghcr.io/cozystack/cozystack/e2e-sandbox:v0.34.8@sha256:f88293295f95419e0ec5484430ae3b46c58dc07050ccb12104b7b0e7902b1712 diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag index a1f0e099..192dcbf3 100644 --- a/packages/extra/bootbox/images/matchbox.tag +++ b/packages/extra/bootbox/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/matchbox:v0.34.7@sha256:6ceb04dcaf128ab65d3125eb87124346c97551d187d69ba0374903c6d612e06a +ghcr.io/cozystack/cozystack/matchbox:v0.34.8@sha256:9280492dad668db1aeb678e1d5d5cf29a86ada26776fbcbe36bbfa1fc1e9d311 diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag index bff61a19..4f804386 100644 --- a/packages/system/bucket/images/s3manager.tag +++ b/packages/system/bucket/images/s3manager.tag @@ -1 +1 @@ -ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:8615db0155341488ccba16882046b254c932195a7538709349da9cb0a620b94a +ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:a9c0a5d5519b2da200d7d035fe30087ea4834fc8013a482848c160610b5b9716 diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml index 0acfa2d8..a254eed9 100644 --- a/packages/system/cozystack-api/values.yaml +++ b/packages/system/cozystack-api/values.yaml @@ -1,2 +1,2 @@ cozystackAPI: - image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.7@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb + image: ghcr.io/cozystack/cozystack/cozystack-api:v0.34.8@sha256:86ef89a7be84761038cc25507a1b6e195c9f86c8051ac8aca8044dd8de39dedb diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml index d745d84e..d52183b4 100644 --- a/packages/system/cozystack-controller/values.yaml +++ b/packages/system/cozystack-controller/values.yaml @@ -1,5 +1,5 @@ cozystackController: - image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.7@sha256:b6ec5e882b0e45c9ea6502f363e692b6183a3a62720cece2e4ccc472f3c3d94a + image: ghcr.io/cozystack/cozystack/cozystack-controller:v0.34.8@sha256:cd4082e3672e793cbead467041ffb372d465085653614885f109fc7c582cd112 debug: false disableTelemetry: false - cozystackVersion: "v0.34.7" + cozystackVersion: "v0.34.8" diff --git a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml index 6181d224..75aae0d4 100644 --- a/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml +++ b/packages/system/dashboard/charts/kubeapps/templates/dashboard/configmap.yaml @@ -76,7 +76,7 @@ data: "kubeappsNamespace": {{ .Release.Namespace | quote }}, "helmGlobalNamespace": {{ include "kubeapps.helmGlobalPackagingNamespace" . | quote }}, "carvelGlobalNamespace": {{ .Values.kubeappsapis.pluginConfig.kappController.packages.v1alpha1.globalPackagingNamespace | quote }}, - "appVersion": "v0.34.7", + "appVersion": "v0.34.8", "authProxyEnabled": {{ .Values.authProxy.enabled }}, "oauthLoginURI": {{ .Values.authProxy.oauthLoginURI | quote }}, "oauthLogoutURI": {{ .Values.authProxy.oauthLogoutURI | quote }}, diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml index 72d906a9..1dc81f99 100644 --- a/packages/system/dashboard/values.yaml +++ b/packages/system/dashboard/values.yaml @@ -19,7 +19,7 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: dashboard - tag: v0.34.7 + tag: v0.34.8 digest: "sha256:54906b3d2492c8603a347a5938b6db36e5ed5c4149111cae1804ac9110361947" redis: master: @@ -37,8 +37,8 @@ kubeapps: image: registry: ghcr.io/cozystack/cozystack repository: kubeapps-apis - tag: v0.34.7 - digest: "sha256:9fed0337a117f2b353e56074029b3657c35e191e38edf82eb4a8d08b9d74fe1a" + tag: v0.34.8 + digest: "sha256:6a02c7ef1e851118472e80ec7dac961e7637a6d32f4bd35dc1d2f0b32bf217a3" pluginConfig: flux: packages: diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml index dc6d3bb3..c78de471 100644 --- a/packages/system/kamaji/values.yaml +++ b/packages/system/kamaji/values.yaml @@ -3,7 +3,7 @@ kamaji: deploy: false image: pullPolicy: IfNotPresent - tag: v0.34.7@sha256:908dc829ce8493607dffcf6de95e4993ff2bfc0d65949c501bd7119fad45127a + tag: v0.34.8@sha256:908dc829ce8493607dffcf6de95e4993ff2bfc0d65949c501bd7119fad45127a repository: ghcr.io/cozystack/cozystack/kamaji resources: limits: @@ -12,3 +12,5 @@ kamaji: requests: cpu: 100m memory: 100Mi + extraArgs: + - --migrate-image=ghcr.io/cozystack/cozystack/kamaji:v0.34.8@sha256:908dc829ce8493607dffcf6de95e4993ff2bfc0d65949c501bd7119fad45127a diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml index 650255cb..7a64ee68 100644 --- a/packages/system/kubeovn-webhook/values.yaml +++ b/packages/system/kubeovn-webhook/values.yaml @@ -1,3 +1,3 @@ portSecurity: true routes: "" -image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.7@sha256:e6c845b65142d554d34187aef29afcbd8f67fae7dcc787255fb53de2b6103386 +image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v0.34.8@sha256:e6c845b65142d554d34187aef29afcbd8f67fae7dcc787255fb53de2b6103386 diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml index 4c05bd0e..75428a73 100644 --- a/packages/system/kubeovn/values.yaml +++ b/packages/system/kubeovn/values.yaml @@ -64,4 +64,4 @@ global: images: kubeovn: repository: kubeovn - tag: v1.13.14@sha256:875846d46d9e4bc1880c4d55b06ec8e947d7f139eb8472dda989a15108a373d8 + tag: v1.13.14@sha256:0f27c268300fe30fe3ad61d145fdb276d5dddba2d792aacc26f3f512f7ef205d diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml index 3ded8c72..0966c50d 100644 --- a/packages/system/kubevirt-csi-node/values.yaml +++ b/packages/system/kubevirt-csi-node/values.yaml @@ -1,3 +1,3 @@ storageClass: replicated csiDriver: - image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:318ded0e7e2ca0329c86da13678699782bf5388cdcd074737c667872876f82fe + image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.26.3@sha256:df3a2f503b4a035567b20b81a0f105c15971274fd675101c3b3eb2413d966d2e diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml index bbb663e2..49568418 100644 --- a/packages/system/objectstorage-controller/values.yaml +++ b/packages/system/objectstorage-controller/values.yaml @@ -1,3 +1,3 @@ objectstorage: controller: - image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.7@sha256:5891c7fb46fb7c6ada4abc4e78e69b34631d13e32a30a86c0abc15cc17675450" + image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v0.34.8@sha256:5891c7fb46fb7c6ada4abc4e78e69b34631d13e32a30a86c0abc15cc17675450" diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml index dddff7b2..d6eb91c9 100644 --- a/packages/system/seaweedfs/values.yaml +++ b/packages/system/seaweedfs/values.yaml @@ -104,7 +104,7 @@ seaweedfs: bucketClassName: "seaweedfs" region: "" sidecar: - image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.7@sha256:ccc7ec31b2beebf09413b9a41ffa8fd06899510127572c9e1c1e30ddab45ebe9" + image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v0.34.8@sha256:ccc7ec31b2beebf09413b9a41ffa8fd06899510127572c9e1c1e30ddab45ebe9" certificates: commonName: "SeaweedFS CA" ipAddresses: []