starlingx/platform-armada-app
Code Issues Proposed changes

Adjust platform docker images to get from registry.local

Browse Source 
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 <Felipe.SanchesZanoni@windriver.com>
This commit is contained in:
Felipe Sanches Zanoni 2023-04-10 14:28:28 -03:00
parent 33d690327f
commit ef33b99009
6 changed files with 105 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
platform-helm/debian/deb_folder/patches/0002-ceph-csi-cephfs-add-default-fields-to-values.yaml.patch
View File

@ -1,22 +1,22 @@
From e62aec935061204fa6a65ae1fd4f9a0ec6e86da4 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva
<hediberto.cavalcantedasilva@windriver.com>
Date: Wed, 14 Dec 2022 18:28:47 -0300
From 94c6020f3c3032103b39f0261905c2393ae10e60 Mon Sep 17 00:00:00 2001
From: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
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 <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
---
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

19
platform-helm/debian/deb_folder/patches/0003-ceph-csi-cephfs-add-storage-init.yaml.patch
View File

@ -1,10 +1,10 @@
From c9e0b07973375966cd150a6926d7b6b1ef3686fb Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva
<hediberto.cavalcantedasilva@windriver.com>
Date: Fri, 17 Feb 2023 20:22:16 -0300
From 74e705c1e18766f1e7492685c6068887c133e7a7 Mon Sep 17 00:00:00 2001
From: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
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 <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
---
.../templates/storage-init.yaml | 264 ++++++++++++++++++
1 file changed, 264 insertions(+)
@ -12,13 +12,13 @@ Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windri
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..0839da7
index 0000000..3e29fc7
--- /dev/null
+++ b/charts/ceph-csi-cephfs/templates/storage-init.yaml
@@ -0,0 +1,264 @@
+{{/*
+#
+# Copyright (c) 2020-2022 Wind River Systems, Inc.
+# Copyright (c) 2020-2023 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
@ -242,7 +242,7 @@ index 0000000..0839da7
+ containers:
+ {{- range $sc := .Values.classes }}
+ - name: storage-init-{{- $sc.name }}
+ image: {{ $.Values.images.tags.cephfs_provisioner_storage_init | quote }}
+ image: "{{ $.Values.storage_init.image.repository }}:{{ $.Values.storage_init.image.tag }}"
+ command: ["/bin/bash", "/tmp/storage-init.sh"]
+ env:
+ - name: NAMESPACE
@ -280,5 +280,6 @@ index 0000000..0839da7
+ tolerations:
+{{ toYaml . | indent 8 }}
+{{- end}}
--
2.17.1
--
2.25.1

45
platform-helm/debian/deb_folder/patches/0007-ceph-csi-rbd-add-default-fields-to-values.yaml.patch
View File

@ -1,22 +1,22 @@
From 61cb77334fea26559d1b4691adaaf829195f1fb2 Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva
<hediberto.cavalcantedasilva@windriver.com>
Date: Wed, 14 Dec 2022 18:42:27 -0300
From 737ac21548a787c72f2c5a4d41b3116a3586b726 Mon Sep 17 00:00:00 2001
From: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
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 <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
---
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

19
platform-helm/debian/deb_folder/patches/0008-ceph-csi-rbd-add-storage-init.yaml.patch
View File

@ -1,10 +1,10 @@
From 16ec84eec326de67b3b56edb2b2fffeb604f044d Mon Sep 17 00:00:00 2001
From: Hediberto Cavalcante da Silva
<hediberto.cavalcantedasilva@windriver.com>
Date: Fri, 17 Feb 2023 20:10:50 -0300
From c30981ae7f7a231e0d302b552a416f7f6048b204 Mon Sep 17 00:00:00 2001
From: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
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 <hediberto.cavalcantedasilva@windriver.com>
Signed-off-by: Felipe Sanches Zanoni <Felipe.SanchesZanoni@windriver.com>
---
.../ceph-csi-rbd/templates/storage-init.yaml | 296 ++++++++++++++++++
1 file changed, 296 insertions(+)
@ -12,13 +12,13 @@ Signed-off-by: Hediberto Cavalcante da Silva <hediberto.cavalcantedasilva@windri
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..8d9f8b0
index 0000000..365b475
--- /dev/null
+++ b/charts/ceph-csi-rbd/templates/storage-init.yaml
@@ -0,0 +1,296 @@
+{{/*
+#
+# Copyright (c) 2020-2022 Wind River Systems, Inc.
+# Copyright (c) 2020-2023 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
@ -277,7 +277,7 @@ index 0000000..8d9f8b0
+ containers:
+ {{- range $sc := .Values.classes }}
+ - name: storage-init-{{- $sc.name }}
+ image: {{ $.Values.images.tags.rbd_provisioner_storage_init | quote }}
+ image: "{{ $.Values.storage_init.image.repository }}:{{ $.Values.storage_init.image.tag }}"
+ command: [ "/bin/bash", "/tmp/storage-init.sh" ]
+ env:
+ - name: NAMESPACE
@ -312,5 +312,6 @@ index 0000000..8d9f8b0
+ tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
--
2.17.1
--
2.25.1

48
stx-platform-helm/stx-platform-helm/fluxcd-manifests/cephfs-provisioner/cephfs-provisioner-static-overrides.yaml
View File

@ -28,6 +28,22 @@ provisioner:
enabled: false
service:
enabled: false
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
resizer:
image:
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: v1.4.0
snapshotter:
image:
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: v4.2.0
nodeplugin:
name: cephfs-nodeplugin
@ -40,6 +56,14 @@ nodeplugin:
enabled: false
service:
enabled: false
registrar:
image:
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: v2.4.0
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.6.2
serviceAccounts:
nodeplugin:
@ -85,23 +109,7 @@ cephconf: |-
# see https://github.com/ceph/ceph-csi/issues/1928
fuse_big_writes = true
#
# 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
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_bionic-20220802

48
stx-platform-helm/stx-platform-helm/fluxcd-manifests/rbd-provisioner/rbd-provisioner-static-overrides.yaml
View File

@ -32,8 +32,20 @@ provisioner:
image:
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: v3.1.0
pullPolicy: IfNotPresent
resources: {}
attacher:
name: attacher
image:
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: v3.4.0
resizer:
name: resizer
image:
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: v1.4.0
snapshotter:
image:
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: v4.2.0
nodeplugin:
name: rbd-nodeplugin
@ -46,6 +58,14 @@ nodeplugin:
enabled: false
service:
enabled: false
registrar:
image:
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: v2.4.0
plugin:
image:
repository: quay.io/cephcsi/cephcsi
tag: v3.6.2
serviceAccounts:
nodeplugin:
@ -84,23 +104,7 @@ cephconf: |-
# see https://github.com/ceph/ceph-csi/issues/1928
fuse_big_writes = true
#
# 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
- image_repo_sync
storage_init:
image:
repository: docker.io/openstackhelm/ceph-config-helper
tag: ubuntu_bionic-20220802