From ef33b99009adb398486a75ee7198076bc1ba059e Mon Sep 17 00:00:00 2001 From: Felipe Sanches Zanoni Date: Mon, 10 Apr 2023 14:28:28 -0300 Subject: [PATCH] Adjust platform docker images to get from registry.local The platform-integ-apps docker images were pointing to the public registry. This was caused because the path for each image was defined in values.yml file for cephfs and rbd provisioners, but not defined in the static overrides files. This change adds the image paths to the static overrides files, so Conductor can change the prefix to registry.local:9001 in the deployments. Test-Plan: PASS: Fresh install AIO-SX and apply platform-integ-apps application. Verify if the deployments have all images pointing to registry.local:9001 registry. Closes-bug: 2015788 Change-Id: Icb04d4fb9c9073eeb8de4bd9507a8460f0fbda14 Signed-off-by: Felipe Sanches Zanoni --- ...fs-add-default-fields-to-values.yaml.patch | 47 +++++++----------- ...eph-csi-cephfs-add-storage-init.yaml.patch | 19 ++++---- ...bd-add-default-fields-to-values.yaml.patch | 45 ++++++----------- ...8-ceph-csi-rbd-add-storage-init.yaml.patch | 19 ++++---- .../cephfs-provisioner-static-overrides.yaml | 48 +++++++++++-------- .../rbd-provisioner-static-overrides.yaml | 48 ++++++++++--------- 6 files changed, 105 insertions(+), 121 deletions(-) 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 d67c239..54bb92d 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,22 @@ -From e62aec935061204fa6a65ae1fd4f9a0ec6e86da4 Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Wed, 14 Dec 2022 18:28:47 -0300 +From 94c6020f3c3032103b39f0261905c2393ae10e60 Mon Sep 17 00:00:00 2001 +From: Felipe Sanches Zanoni +Date: Mon, 10 Apr 2023 13:55:17 -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 --- - charts/ceph-csi-cephfs/values.yaml | 51 ++++++++++++++++++++++++++++++ - 1 file changed, 51 insertions(+) + 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..7762480 100644 +index 7375ea6..422859d 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -276,6 +276,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 +38,7 @@ index 7375ea6..7762480 100644 secret: # Specifies whether the secret should be created create: false -@@ -326,3 +344,36 @@ configMapName: ceph-csi-config +@@ -326,3 +344,20 @@ configMapName: ceph-csi-config externallyManagedConfigmap: false # Name of the configmap used for ceph.conf cephConfConfigMapName: ceph-config @@ -55,25 +55,10 @@ index 7375ea6..7762480 100644 + adminSecretName: ceph-secret-admin + cephFSNamespace: kube-system + -+# -+# Defines: -+# - Provisioner's image name including container registry. -+# - CEPH helper image -+# -+images: -+ tags: -+ csi_provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 -+ csi_snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0 -+ csi_attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 -+ csi_resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 -+ csi_cephcsi: quay.io/cephcsi/cephcsi:v3.6.2 -+ csi_registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0 -+ cephfs_provisioner_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20220802 -+ pull_policy: "IfNotPresent" -+ local_registry: -+ active: false -+ exclude: -+ - dep_check -+ - image_repo_sync --- -2.17.1 ++storage_init: ++ image: ++ repository: docker.io/openstackhelm/ceph-config-helper ++ tag: ubuntu_bionic-20220802 +-- +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 585f187..9dccd37 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,10 +1,10 @@ -From c9e0b07973375966cd150a6926d7b6b1ef3686fb Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Fri, 17 Feb 2023 20:22:16 -0300 +From 74e705c1e18766f1e7492685c6068887c133e7a7 Mon Sep 17 00:00:00 2001 +From: Felipe Sanches Zanoni +Date: Mon, 10 Apr 2023 13:56:31 -0300 Subject: [PATCH] ceph-csi-cephfs: add storage-init.yaml Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Felipe Sanches Zanoni --- .../templates/storage-init.yaml | 264 ++++++++++++++++++ 1 file changed, 264 insertions(+) @@ -12,13 +12,13 @@ Signed-off-by: Hediberto Cavalcante da Silva -Date: Wed, 14 Dec 2022 18:42:27 -0300 +From 737ac21548a787c72f2c5a4d41b3116a3586b726 Mon Sep 17 00:00:00 2001 +From: Felipe Sanches Zanoni +Date: Mon, 10 Apr 2023 13:58:11 -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 --- - charts/ceph-csi-rbd/values.yaml | 51 +++++++++++++++++++++++++++++++++ - 1 file changed, 51 insertions(+) + charts/ceph-csi-rbd/values.yaml | 35 +++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml -index 42a06c4..26ba675 100644 +index 42a06c4..b313a38 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -406,6 +406,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 +36,7 @@ index 42a06c4..26ba675 100644 # Mount the host /etc/selinux inside pods to support # selinux-enabled filesystems selinuxMount: true -@@ -458,3 +474,38 @@ externallyManagedConfigmap: false +@@ -458,3 +474,22 @@ externallyManagedConfigmap: false cephConfConfigMapName: ceph-config # Name of the configmap used for encryption kms configuration kmsConfigMapName: ceph-csi-encryption-kms-config @@ -56,24 +56,9 @@ index 42a06c4..26ba675 100644 + # Default StorageClass name + storageClass: general + -+# -+# Defines: -+# - Provisioner's image name including container registry. -+# - CEPH helper image -+# -+images: -+ tags: -+ csi_provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 -+ csi_snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0 -+ csi_attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 -+ csi_resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 -+ csi_cephcsi: quay.io/cephcsi/cephcsi:v3.6.2 -+ csi_registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0 -+ rbd_provisioner_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20220802 -+ pull_policy: "IfNotPresent" -+ local_registry: -+ active: false -+ exclude: -+ - dep_check --- -2.17.1 ++storage_init: ++ image: ++ repository: docker.io/openstackhelm/ceph-config-helper +-- +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 0c13147..f3b7c1b 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,10 +1,10 @@ -From 16ec84eec326de67b3b56edb2b2fffeb604f044d Mon Sep 17 00:00:00 2001 -From: Hediberto Cavalcante da Silva - -Date: Fri, 17 Feb 2023 20:10:50 -0300 +From c30981ae7f7a231e0d302b552a416f7f6048b204 Mon Sep 17 00:00:00 2001 +From: Felipe Sanches Zanoni +Date: Mon, 10 Apr 2023 13:59:10 -0300 Subject: [PATCH] ceph-csi-rbd: add storage-init.yaml Signed-off-by: Hediberto Cavalcante da Silva +Signed-off-by: Felipe Sanches Zanoni --- .../ceph-csi-rbd/templates/storage-init.yaml | 296 ++++++++++++++++++ 1 file changed, 296 insertions(+) @@ -12,13 +12,13 @@ Signed-off-by: Hediberto Cavalcante da Silva