diff --git a/platform-helm/debian/deb_folder/changelog b/platform-helm/debian/deb_folder/changelog index 7e09d0d..21b40a4 100644 --- a/platform-helm/debian/deb_folder/changelog +++ b/platform-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +platform-helm (3.8-0) unstable; urgency=medium + + * New upstream release. + + -- Erickson Silva de Oliveira Wed, 17 May 2023 08:35:00 +0000 + platform-helm (1.0-1) unstable; urgency=medium * Initial release. diff --git a/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch b/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch index f9629c6..c408d65 100644 --- a/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch +++ b/platform-helm/debian/deb_folder/patches/0001-ceph-csi-cephfs-replace-appVersion-version.patch @@ -1,30 +1,30 @@ -From 1ba67e3a997fced5fe94fc6042838f3f65d59b27 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 15 Mar 2023 20:02:47 -0300 +From d074298e621a0611d1ba6973fdf1f22595df84ed Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 16:17:14 -0300 Subject: [PATCH] ceph-csi-cephfs: replace appVersion/version Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-cephfs/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-cephfs/Chart.yaml b/charts/ceph-csi-cephfs/Chart.yaml -index 9238c26..99d8a0f 100644 +index 46d38df97..f6f89c92d 100644 --- a/charts/ceph-csi-cephfs/Chart.yaml +++ b/charts/ceph-csi-cephfs/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: canary -+appVersion: 3.6.2-1 ++appVersion: 3.8.0 description: "Container Storage Interface (CSI) driver, - provisioner, snapshotter and attacher for Ceph cephfs" + provisioner, snapshotter and resizer for Ceph cephfs" name: ceph-csi-cephfs -version: 3-canary -+version: 3.6.2-1 ++version: 3.8.0 keywords: - ceph - cephfs -- -2.17.1 +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch b/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch index 54bb92d..8c857a3 100644 --- a/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch @@ -1,22 +1,23 @@ -From 94c6020f3c3032103b39f0261905c2393ae10e60 Mon Sep 17 00:00:00 2001 -From: Felipe Sanches Zanoni -Date: Mon, 10 Apr 2023 13:55:17 -0300 +From 5bbeeaa51fa344a5eda63c7bfd917d08718f5979 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 24 Apr 2023 16:28:18 -0300 Subject: [PATCH] ceph-csi-cephfs: add default fields to values.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-cephfs/values.yaml | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml -index 7375ea6..422859d 100644 +index 2e483fda4..f688b2585 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml -@@ -276,6 +276,24 @@ storageClass: +@@ -274,6 +274,24 @@ storageClass: # mountOptions: # - discard - + + # Ceph user name to access this pool + userId: kube + # K8 secret name with key for accessing the Ceph pool @@ -38,7 +39,7 @@ index 7375ea6..422859d 100644 secret: # Specifies whether the secret should be created create: false -@@ -326,3 +344,20 @@ configMapName: ceph-csi-config +@@ -321,3 +339,20 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config @@ -58,7 +59,6 @@ index 7375ea6..422859d 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper -+ tag: ubuntu_bionic-20220802 --- ++ tag: ubuntu_focal-20230424 +-- 2.25.1 - diff --git a/platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch b/platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch index f27fe33..ed70de0 100644 --- a/platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch @@ -1,22 +1,22 @@ -From 74e705c1e18766f1e7492685c6068887c133e7a7 Mon Sep 17 00:00:00 2001 -From: Felipe Sanches Zanoni -Date: Mon, 10 Apr 2023 13:56:31 -0300 +From 239cfdde94db341aad0ccb15e420c4ecc3157d21 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 24 Apr 2023 16:57:46 -0300 Subject: [PATCH] ceph-csi-cephfs: add storage-init.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni -Signed-off-by: Erickson Silva +Signed-off-by: Erickson Silva de Oliveira --- - .../templates/storage-init.yaml | 353 ++++++++++++++++++ - 1 file changed, 353 insertions(+) + .../templates/storage-init.yaml | 369 ++++++++++++++++++ + 1 file changed, 369 insertions(+) create mode 100644 charts/ceph-csi-cephfs/templates/storage-init.yaml diff --git a/charts/ceph-csi-cephfs/templates/storage-init.yaml b/charts/ceph-csi-cephfs/templates/storage-init.yaml new file mode 100644 -index 0000000..3e29fc7 +index 000000000..97052d7a9 --- /dev/null +++ b/charts/ceph-csi-cephfs/templates/storage-init.yaml -@@ -0,0 +1,353 @@ +@@ -0,0 +1,369 @@ +{{/* +# +# Copyright (c) 2020-2023 Wind River Systems, Inc. @@ -47,6 +47,9 @@ index 0000000..3e29fc7 + - apiGroups: [""] + resources: ["namespaces"] + verbs: ["get", "create", "list", "update"] ++ - apiGroups: ["storage.k8s.io"] ++ resources: ["csidrivers"] ++ verbs: ["get", "delete"] + +--- + @@ -163,6 +166,17 @@ index 0000000..3e29fc7 + fi + } + ++ # Delete old driver if current fsGroupPolicy is different from "File" ++ # See: https://github.com/ceph/ceph-csi/issues/3397 ++ CURRENT_FS_GROUP_POLICY=$(kubectl describe csidriver "${CSI_DRIVER_NAME}" 2>/dev/null | grep -oP 'Fs Group Policy:\K.*' | tr -d ' ') ++ if [ -n "${CURRENT_FS_GROUP_POLICY}" ] && [ "${CURRENT_FS_GROUP_POLICY}" != "File" ]; then ++ echo "Deleting old CSI driver" ++ kubectl delete csidriver "${CSI_DRIVER_NAME}" ++ if [ $? -ne 0 ]; then ++ echo "Error deleting csi driver ${CSI_DRIVER_NAME}" ++ fi ++ fi ++ + # Copy from read only mount to Ceph config folder + cp /tmp/ceph.conf /etc/ceph/ + @@ -357,6 +371,8 @@ index 0000000..3e29fc7 + value: {{ $sc.replication | quote }} + - name: POOL_CRUSH_RULE_NAME + value: {{ $sc.crush_rule_name | quote }} ++ - name: CSI_DRIVER_NAME ++ value: {{ $.Values.driverName }} + volumeMounts: + - name: cephfs-storage-init-configmap-volume + mountPath: /tmp @@ -370,6 +386,5 @@ index 0000000..3e29fc7 + tolerations: +{{ toYaml . | indent 8 }} +{{- end}} --- +-- 2.25.1 - diff --git a/platform-helm/debian/deb_folder/patches/0004-ceph-csi-cephfs-add-imagePullSecrets-to-ServiceAccount.patch b/platform-helm/debian/deb_folder/patches/0004-ceph-csi-cephfs-add-imagePullSecrets-to-ServiceAccount.patch index 9a6c56e..91fbd62 100644 --- a/platform-helm/debian/deb_folder/patches/0004-ceph-csi-cephfs-add-imagePullSecrets-to-ServiceAccount.patch +++ b/platform-helm/debian/deb_folder/patches/0004-ceph-csi-cephfs-add-imagePullSecrets-to-ServiceAccount.patch @@ -1,37 +1,36 @@ -From 1b00f927ef2f3a279ede03d8971d0cdc306fd43a Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Sun, 6 Nov 2022 18:28:54 -0300 +From 232834abe5d043a4d0a7db12da76bd034065e901 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 17:27:34 -0300 Subject: [PATCH] ceph-csi-cephfs: add imagePullSecrets to ServiceAccount Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml | 2 ++ .../ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml -index 5dedaf4..7c93f52 100644 +index 77b5d5e83..5ec323f61 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-serviceaccount.yaml -@@ -10,4 +10,6 @@ metadata: - component: {{ .Values.nodeplugin.name }} +@@ -11,4 +11,6 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} +imagePullSecrets: + - name: default-registry-key {{- end -}} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml -index c4ba5c1..3d85b0f 100644 +index 0207133bb..aea3846d9 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-serviceaccount.yaml -@@ -10,4 +10,6 @@ metadata: - component: {{ .Values.provisioner.name }} +@@ -11,4 +11,6 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} +imagePullSecrets: + - name: default-registry-key {{- end -}} -- -2.17.1 - +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch b/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch index 1fcba8d..10a9f84 100644 --- a/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch +++ b/platform-helm/debian/deb_folder/patches/0005-ceph-csi-cephfs-add-annotations-to-provisioner-deployment.patch @@ -1,29 +1,36 @@ -From 727a0bd641df4e6e750242341a9a5b3223b4347a Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 9 Nov 2022 16:21:04 -0300 -Subject: [PATCH] ceph-csi-cephfs: add annotations to - provisioner-deployment.yaml +From 3636dd3743e4d03394576464132d3df005c41848 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 17:37:28 -0300 +Subject: [PATCH] ceph-csi-cephfs: add annotations to provisioner-deployment.yaml Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- - charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 3 +++ - 1 file changed, 3 insertions(+) + charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml -index c455b86..91b7042 100644 +index 13c083aba..462ee6aaa 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml -@@ -9,6 +9,9 @@ metadata: - component: {{ .Values.provisioner.name }} +@@ -10,6 +10,9 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} + annotations: + "helm.sh/hook": "post-upgrade, post-install" + "helm.sh/hook-delete-policy": "before-hook-creation" spec: replicas: {{ .Values.provisioner.replicaCount }} strategy: +@@ -86,7 +89,7 @@ spec: + - "--v={{ .Values.sidecarLogLevel }}" + - "--timeout={{ .Values.provisioner.timeout }}" + - "--leader-election=true" +- - "--extra-create-metadata=true" ++ - "--extra-create-metadata=false" + {{- range .Values.provisioner.snapshotter.extraArgs }} + - "--{{ . }}" + {{- end }} -- -2.17.1 - +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch b/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch index 94d7a34..fbaa05d 100644 --- a/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch +++ b/platform-helm/debian/deb_folder/patches/0006-ceph-csi-rbd-replace-appVersion-version.patch @@ -1,30 +1,30 @@ -From c8d18c38d8d5a4033ac82bd1d5e9a316b7666c79 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 15 Mar 2023 19:59:04 -0300 +From e7ef42866c92299c0eab127721e3cf304a8168c6 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 16:20:09 -0300 Subject: [PATCH] ceph-csi-rbd: replace appVersion/version Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-rbd/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-rbd/Chart.yaml b/charts/ceph-csi-rbd/Chart.yaml -index 107647b..5bc257a 100644 +index 5ab42a106..f4538734e 100644 --- a/charts/ceph-csi-rbd/Chart.yaml +++ b/charts/ceph-csi-rbd/Chart.yaml @@ -1,10 +1,10 @@ --- apiVersion: v1 -appVersion: canary -+appVersion: 3.6.2-1 ++appVersion: 3.8.0 description: "Container Storage Interface (CSI) driver, - provisioner, snapshotter, and attacher for Ceph RBD" + provisioner, snapshotter, resizer and attacher for Ceph RBD" name: ceph-csi-rbd -version: 3-canary -+version: 3.6.2-1 ++version: 3.8.0 keywords: - ceph - rbd -- -2.17.1 +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch b/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch index 72044cf..edf510c 100644 --- a/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch @@ -1,22 +1,23 @@ -From 737ac21548a787c72f2c5a4d41b3116a3586b726 Mon Sep 17 00:00:00 2001 -From: Felipe Sanches Zanoni -Date: Mon, 10 Apr 2023 13:58:11 -0300 +From cb5f1ad019e4e186c6db8986c6dd12a44ad8e60f Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 24 Apr 2023 17:11:36 -0300 Subject: [PATCH] ceph-csi-rbd: add default fields to values.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni +Signed-off-by: Erickson Silva de Oliveira --- - charts/ceph-csi-rbd/values.yaml | 35 +++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) + charts/ceph-csi-rbd/values.yaml | 36 +++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml -index 42a06c4..b313a38 100644 +index 45f4a9073..d74652be1 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml -@@ -406,6 +406,22 @@ storageClass: +@@ -419,6 +419,22 @@ storageClass: # mountOptions: # - discard - + + # Ceph user name to access this pool + userId: kube + # K8 secret name with key for accessing the Ceph pool @@ -36,7 +37,7 @@ index 42a06c4..b313a38 100644 # Mount the host /etc/selinux inside pods to support # selinux-enabled filesystems selinuxMount: true -@@ -458,3 +474,22 @@ externallyManagedConfigmap: false +@@ -471,3 +487,23 @@ externallyManagedConfigmap: false cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config @@ -59,6 +60,6 @@ index 42a06c4..b313a38 100644 +storage_init: + image: + repository: docker.io/openstackhelm/ceph-config-helper --- ++ tag: ubuntu_focal-20230424 +-- 2.25.1 - diff --git a/platform-helm/debian/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch b/platform-helm/debian/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch index 4ed97b6..e4b9d8f 100644 --- a/platform-helm/debian/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch +++ b/platform-helm/debian/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch @@ -1,22 +1,22 @@ -From c30981ae7f7a231e0d302b552a416f7f6048b204 Mon Sep 17 00:00:00 2001 -From: Felipe Sanches Zanoni -Date: Mon, 10 Apr 2023 13:59:10 -0300 +From 4e3d4d76c16c4d03ba33afd0581ceac5f5ea3147 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 24 Apr 2023 17:04:02 -0300 Subject: [PATCH] ceph-csi-rbd: add storage-init.yaml Signed-off-by: Hediberto Cavalcante da Silva Signed-off-by: Felipe Sanches Zanoni -Signed-off-by: Erickson Silva +Signed-off-by: Erickson Silva de Oliveira --- - .../ceph-csi-rbd/templates/storage-init.yaml | 379 ++++++++++++++++++ - 1 file changed, 379 insertions(+) + .../ceph-csi-rbd/templates/storage-init.yaml | 394 ++++++++++++++++++ + 1 file changed, 394 insertions(+) create mode 100644 charts/ceph-csi-rbd/templates/storage-init.yaml diff --git a/charts/ceph-csi-rbd/templates/storage-init.yaml b/charts/ceph-csi-rbd/templates/storage-init.yaml new file mode 100644 -index 0000000..365b475 +index 000000000..6abd8ec3f --- /dev/null +++ b/charts/ceph-csi-rbd/templates/storage-init.yaml -@@ -0,0 +1,379 @@ +@@ -0,0 +1,394 @@ +{{/* +# +# Copyright (c) 2020-2023 Wind River Systems, Inc. @@ -47,7 +47,9 @@ index 0000000..365b475 + - apiGroups: [""] + resources: ["namespaces"] + verbs: ["get", "create", "list", "update"] -+ ++ - apiGroups: ["storage.k8s.io"] ++ resources: ["csidrivers"] ++ verbs: ["get", "delete"] +--- + +kind: ClusterRoleBinding @@ -122,6 +124,17 @@ index 0000000..365b475 + # SPDX-License-Identifier: Apache-2.0 + # + ++ # Delete old driver if current fsGroupPolicy is different from "File" ++ # See: https://github.com/ceph/ceph-csi/issues/3397 ++ CURRENT_FS_GROUP_POLICY=$(kubectl describe csidriver "${CSI_DRIVER_NAME}" 2>/dev/null | grep -oP 'Fs Group Policy:\K.*' | tr -d ' ') ++ if [ -n "${CURRENT_FS_GROUP_POLICY}" ] && [ "${CURRENT_FS_GROUP_POLICY}" != "File" ]; then ++ echo "Deleting old CSI driver" ++ kubectl delete csidriver "${CSI_DRIVER_NAME}" ++ if [ $? -ne 0 ]; then ++ echo "Error deleting csi driver ${CSI_DRIVER_NAME}" ++ fi ++ fi ++ + # Copy from read only mount to Ceph config folder + cp /tmp/ceph.conf /etc/ceph/ + @@ -384,6 +397,8 @@ index 0000000..365b475 + value: {{ $sc.crush_rule_name | quote }} + - name: POOL_CHUNK_SIZE + value: {{ $sc.chunk_size | quote }} ++ - name: CSI_DRIVER_NAME ++ value: {{ $.Values.driverName }} + volumeMounts: + - name: rbd-storage-init-configmap-volume + mountPath: /tmp @@ -396,6 +411,5 @@ index 0000000..365b475 + tolerations: +{{ toYaml . | indent 8 }} +{{- end }} --- +-- 2.25.1 - diff --git a/platform-helm/debian/deb_folder/patches/0009-ceph-csi-rbd-add-imagePullSecrets-to-ServiceAccount.patch b/platform-helm/debian/deb_folder/patches/0009-ceph-csi-rbd-add-imagePullSecrets-to-ServiceAccount.patch index 3ffe199..09f52d0 100644 --- a/platform-helm/debian/deb_folder/patches/0009-ceph-csi-rbd-add-imagePullSecrets-to-ServiceAccount.patch +++ b/platform-helm/debian/deb_folder/patches/0009-ceph-csi-rbd-add-imagePullSecrets-to-ServiceAccount.patch @@ -1,37 +1,36 @@ -From 72e79f8c37dd5509a2cfdd6157ea505f0b15b8d4 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Sun, 6 Nov 2022 18:25:44 -0300 +From 63434ea464026efe0bbaf461561bc98bdd19a3bd Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 17:42:23 -0300 Subject: [PATCH] ceph-csi-rbd: add imagePullSecrets to ServiceAccount Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml | 2 ++ charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml -index 36e1ee7..30080ad 100644 +index 56bd024dd..61ae1b1b3 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-serviceaccount.yaml -@@ -10,4 +10,6 @@ metadata: - component: {{ .Values.nodeplugin.name }} +@@ -11,4 +11,6 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} +imagePullSecrets: + - name: default-registry-key {{- end -}} diff --git a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml -index 893b43a..cebb2e7 100644 +index 8acf41a24..3da42d7a0 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-serviceaccount.yaml -@@ -10,4 +10,6 @@ metadata: - component: {{ .Values.provisioner.name }} +@@ -11,4 +11,6 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} +imagePullSecrets: + - name: default-registry-key {{- end -}} -- -2.17.1 - +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0010-ceph-csi-rbd-add-annotations-to-provisioner-deployment.patch b/platform-helm/debian/deb_folder/patches/0010-ceph-csi-rbd-add-annotations-to-provisioner-deployment.patch index b4c9799..742f54f 100644 --- a/platform-helm/debian/deb_folder/patches/0010-ceph-csi-rbd-add-annotations-to-provisioner-deployment.patch +++ b/platform-helm/debian/deb_folder/patches/0010-ceph-csi-rbd-add-annotations-to-provisioner-deployment.patch @@ -1,22 +1,22 @@ -From c5d76ee99c1728e341a8631d1c06708a63dc6304 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 9 Nov 2022 09:20:34 -0300 +From a23aa2ccc5e14f8cc2abcd17c2e0e97891f1c2cb Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 17:44:46 -0300 Subject: [PATCH] ceph-csi-rbd: add annotations to provisioner-deployment.yaml Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml -index b3b0916..0aab501 100644 +index fc1f28cdf..b9903f666 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml -@@ -9,6 +9,9 @@ metadata: - component: {{ .Values.provisioner.name }} +@@ -10,6 +10,9 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} + annotations: + "helm.sh/hook": "post-upgrade, post-install" + "helm.sh/hook-delete-policy": "before-hook-creation" @@ -24,5 +24,4 @@ index b3b0916..0aab501 100644 replicas: {{ .Values.provisioner.replicaCount }} strategy: -- -2.17.1 - +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch b/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch index 07261d2..3994b7c 100644 --- a/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch +++ b/platform-helm/debian/deb_folder/patches/0011-ceph-csi-rbd-update-storageclass.patch @@ -1,19 +1,19 @@ -From d428ff944c757f46c0f4aa756ccfac83f55c2c72 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 14 Dec 2022 18:51:01 -0300 +From e02f28d37a57550e4e4127c5b3758e865cfc4d7e Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Mon, 20 Mar 2023 17:56:25 -0300 Subject: [PATCH] ceph-csi-rbd: update storageclass Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- - .../ceph-csi-rbd/templates/storageclass.yaml | 161 ++++++++++-------- - 1 file changed, 93 insertions(+), 68 deletions(-) + .../ceph-csi-rbd/templates/storageclass.yaml | 162 ++++++++++-------- + 1 file changed, 93 insertions(+), 69 deletions(-) diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml -index fda713a..d246776 100644 +index a559456aa..b53c3dc6c 100644 --- a/charts/ceph-csi-rbd/templates/storageclass.yaml +++ b/charts/ceph-csi-rbd/templates/storageclass.yaml -@@ -1,81 +1,106 @@ +@@ -1,82 +1,106 @@ {{- if .Values.storageClass.create -}} +{{- $cephCsiDefault := .Values.storageClass }} +{{- $defaults := .Values.classdefaults }} @@ -36,6 +36,7 @@ index fda713a..d246776 100644 - chart: {{ include "ceph-csi-rbd.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} +- {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} -provisioner: {{ .Values.driverName }} + app: {{ include "ceph-csi-rbd.name" $ }} + chart: {{ include "ceph-csi-rbd.chart" $ }} @@ -189,4 +190,4 @@ index fda713a..d246776 100644 {{- end }} {{- end -}} -- -2.17.1 +2.25.1 diff --git a/platform-helm/debian/deb_folder/patches/0012-ceph-csi-cephfs-update-storageclass.patch b/platform-helm/debian/deb_folder/patches/0012-ceph-csi-cephfs-update-storageclass.patch index c2a8a6e..de2b2d6 100644 --- a/platform-helm/debian/deb_folder/patches/0012-ceph-csi-cephfs-update-storageclass.patch +++ b/platform-helm/debian/deb_folder/patches/0012-ceph-csi-cephfs-update-storageclass.patch @@ -1,19 +1,19 @@ -From c8215e9440f617580fae8ce89db5d48fc2f1d98d Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 14 Dec 2022 18:55:44 -0300 +From 8ef1e051d4166dd0f9f8c931465b27cadfde7ca0 Mon Sep 17 00:00:00 2001 +From: Erickson Silva de Oliveira +Date: Tue, 21 Mar 2023 21:09:29 -0300 Subject: [PATCH] ceph-csi-cephfs: update storageclass Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Erickson Silva de Oliveira --- - .../templates/storageclass.yaml | 102 ++++++++++-------- - 1 file changed, 55 insertions(+), 47 deletions(-) + .../templates/storageclass.yaml | 104 ++++++++++-------- + 1 file changed, 56 insertions(+), 48 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/storageclass.yaml b/charts/ceph-csi-cephfs/templates/storageclass.yaml -index 4041dec..754ff44 100644 +index a21c99824..e3a27b455 100644 --- a/charts/ceph-csi-cephfs/templates/storageclass.yaml +++ b/charts/ceph-csi-cephfs/templates/storageclass.yaml -@@ -1,60 +1,68 @@ +@@ -1,61 +1,69 @@ {{- if .Values.storageClass.create -}} +{{- $cephCsiDefault := .Values.storageClass }} +{{- $defaults := .Values.classdefaults }} @@ -34,11 +34,13 @@ index 4041dec..754ff44 100644 - chart: {{ include "ceph-csi-cephfs.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} +- {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} -provisioner: {{ .Values.driverName }} + app: {{ include "ceph-csi-cephfs.name" $ }} + chart: {{ include "ceph-csi-cephfs.chart" $ }} + release: {{ $.Release.Name }} + heritage: {{ $.Release.Service }} ++ {{- with $.Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }} +provisioner: {{ $.Values.driverName }} parameters: - clusterID: {{ .Values.storageClass.clusterID }} @@ -130,4 +132,4 @@ index 4041dec..754ff44 100644 {{- end }} {{- end -}} -- -2.17.1 +2.25.1 diff --git a/platform-helm/debian/meta_data.yaml b/platform-helm/debian/meta_data.yaml index 1f5d3bb..a869d9e 100644 --- a/platform-helm/debian/meta_data.yaml +++ b/platform-helm/debian/meta_data.yaml @@ -1,10 +1,10 @@ --- debname: platform-helm -debver: 1.0-1 +debver: 3.8-0 dl_path: - name: ceph-csi-3.6.2.tar.gz - url: https://github.com/ceph/ceph-csi/archive/v3.6.2.tar.gz - md5sum: a5fd6785c521faf0cb7df008a1012381 + name: ceph-csi-3.8.0.tar.gz + url: https://github.com/ceph/ceph-csi/archive/v3.8.0.tar.gz + md5sum: f4100ceca0fe60150cf07cbdfbe68c61 src_files: - platform-helm/files/Makefile revision: diff --git a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py index a63c18c..7a64055 100644 --- a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py +++ b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/lifecycle/lifecycle_platform.py @@ -16,6 +16,8 @@ import os from oslo_log import log as logging from sysinv.common import constants from sysinv.common import exception +from sysinv.common import kubernetes +from sysinv.common import utils as cutils from sysinv.helm import lifecycle_base as base from sysinv.helm import lifecycle_utils as lifecycle_utils @@ -48,6 +50,8 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator): elif hook_info.operation == constants.APP_REMOVE_OP and \ hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_POST: return lifecycle_utils.delete_rbd_provisioner_secrets(app_op, app, hook_info) + elif hook_info.operation == constants.APP_RECOVER_OP: + return self.delete_csi_drivers(app) # Resources elif hook_info.lifecycle_type == constants.APP_LIFECYCLE_TYPE_RESOURCE: @@ -94,3 +98,18 @@ class PlatformAppLifecycleOperator(base.AppLifecycleOperator): vim_progress_status=constants.VIM_SERVICES_ENABLED) < 1: raise exception.LifecycleSemanticCheckException( "Not enough hosts in desired state") + + def delete_csi_drivers(self, app): + """ Delete CSI drivers + + This function is invoked when a recovery occurs, + deleting the drivers created during the update. + + :param app: AppOperator.Application object + + """ + drivers = ["cephfs.csi.ceph.com", "rbd.csi.ceph.com"] + for driver in drivers: + cmd = ["kubectl", "--kubeconfig", kubernetes.KUBERNETES_ADMIN_CONF, "delete", "csidriver", driver] + stdout, stderr = cutils.trycmd(*cmd) + LOG.debug("{} app: cmd={} stdout={} stderr={}".format(app.name, cmd, stdout, stderr)) diff --git a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_platform.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_platform.py new file mode 100644 index 0000000..3be48cd --- /dev/null +++ b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_platform.py @@ -0,0 +1,28 @@ +# +# Copyright (c) 2023 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +from k8sapp_platform.tests import test_plugins + +from sysinv.db import api as dbapi +from sysinv.tests.helm import base +from sysinv.tests.db import base as dbbase +from sysinv.tests.db import utils as dbutils + + +class PlatformTestCase(test_plugins.K8SAppPlatformAppMixin, + base.HelmTestCaseMixin): + + def setUp(self): + super(PlatformTestCase, self).setUp() + self.app = dbutils.create_test_app(name='platform') + self.dbapi = dbapi.get_instance() + + +class PlatformTestCaseDummy(PlatformTestCase, + dbbase.ProvisionedControllerHostTestCase): + # without a test zuul will fail + def test_dummy(self): + pass diff --git a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py index a30c462..dbe271b 100644 --- a/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py +++ b/python3-k8sapp-platform/k8sapp_platform/k8sapp_platform/tests/test_plugins.py @@ -1,11 +1,10 @@ # -# Copyright (c) 2021 Wind River Systems, Inc. +# Copyright (c) 2021-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # from sysinv.tests.db import base as dbbase -from sysinv.tests.helm.test_helm import HelmOperatorTestSuiteMixin from sysinv.common import constants @@ -25,7 +24,6 @@ class K8SAppPlatformAppMixin(object): class K8SAppPlatformControllerTestCase(K8SAppPlatformAppMixin, dbbase.BaseIPv6Mixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.ControllerHostTestCase): pass @@ -37,6 +35,5 @@ class K8SAppPlatformControllerTestCase(K8SAppPlatformAppMixin, # - platform-integ-apps app class K8SAppPlatformAIOTestCase(K8SAppPlatformAppMixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.AIOSimplexHostTestCase): pass diff --git a/python3-k8sapp-platform/k8sapp_platform/tox.ini b/python3-k8sapp-platform/k8sapp_platform/tox.ini index 821c608..f73607e 100644 --- a/python3-k8sapp-platform/k8sapp_platform/tox.ini +++ b/python3-k8sapp-platform/k8sapp_platform/tox.ini @@ -114,7 +114,6 @@ commands = stestr run {posargs} stestr slowest - [testenv:pep8] # testenv:flake8 clone basepython = {[testenv:flake8]basepython} diff --git a/stx-platform-helm/debian/deb_folder/changelog b/stx-platform-helm/debian/deb_folder/changelog index 648b079..120da6b 100644 --- a/stx-platform-helm/debian/deb_folder/changelog +++ b/stx-platform-helm/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +stx-platform-helm (1.1-0) unstable; urgency=medium + + * New upstream release. + + -- Erickson Silva de Oliveira Wed, 17 May 2023 08:45:00 +0000 + stx-platform-helm (1.0-1) unstable; urgency=medium * Initial release. diff --git a/stx-platform-helm/debian/meta_data.yaml b/stx-platform-helm/debian/meta_data.yaml index dc330af..300091c 100644 --- a/stx-platform-helm/debian/meta_data.yaml +++ b/stx-platform-helm/debian/meta_data.yaml @@ -1,6 +1,6 @@ --- debname: stx-platform-helm -debver: 1.0-1 +debver: 1.1-0 src_path: stx-platform-helm src_files: - ${MY_REPO}/stx/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml index 3ad7e2a..aa9bfc5 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -31,19 +31,15 @@ provisioner: provisioner: image: repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v3.1.0 - attacher: - image: - repository: k8s.gcr.io/sig-storage/csi-attacher - tag: v3.4.0 + tag: v3.4.1 resizer: image: repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v1.4.0 + tag: v1.7.0 snapshotter: image: repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v4.2.0 + tag: v6.2.1 nodeplugin: name: cephfs-nodeplugin @@ -59,11 +55,11 @@ nodeplugin: registrar: image: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v2.4.0 + tag: v2.6.3 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.2 + tag: v3.8.0 serviceAccounts: nodeplugin: @@ -112,4 +108,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_bionic-20220802 + tag: ubuntu_focal-20230424 diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml index eef608f..629e3e6 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/helmrelease.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: ceph-csi-cephfs - version: 3.6.2-1 + version: 3.8.0 sourceRef: kind: HelmRepository name: stx-platform diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml index 0e86a42..41ae56a 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/helmrelease.yaml @@ -15,7 +15,7 @@ spec: chart: spec: chart: ceph-csi-rbd - version: 3.6.2-1 + version: 3.8.0 sourceRef: kind: HelmRepository name: stx-platform diff --git a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml index 16b9fe0..c0da9f1 100644 --- a/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml +++ b/stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Wind River Systems, Inc. +# Copyright (c) 2022-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -31,21 +31,21 @@ provisioner: provisioner: image: repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v3.1.0 + tag: v3.4.1 attacher: name: attacher image: repository: k8s.gcr.io/sig-storage/csi-attacher - tag: v3.4.0 + tag: v4.2.0 resizer: name: resizer image: repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v1.4.0 + tag: v1.7.0 snapshotter: image: repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v4.2.0 + tag: v6.2.1 nodeplugin: name: rbd-nodeplugin @@ -61,11 +61,11 @@ nodeplugin: registrar: image: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v2.4.0 + tag: v2.6.3 plugin: image: repository: quay.io/cephcsi/cephcsi - tag: v3.6.2 + tag: v3.8.0 serviceAccounts: nodeplugin: @@ -107,4 +107,4 @@ cephconf: |- storage_init: image: repository: docker.io/openstackhelm/ceph-config-helper - tag: ubuntu_bionic-20220802 \ No newline at end of file + tag: ubuntu_focal-20230424 diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml index 5c3ac06..0a5c6de 100644 --- a/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml +++ b/stx-platform-helm/stx-platform-helm/helm-charts/ceph-pools-audit/values.yaml @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2021 Wind River Systems, Inc. +# Copyright (c) 2019-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -26,7 +26,7 @@ conf: images: tags: - ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20220802 + ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230424 pullPolicy: "IfNotPresent" local_registry: active: false