From 3f7acd5c3214fb93afc75ee23c0eabe6089d0c32 Mon Sep 17 00:00:00 2001 From: Daniel Safta Date: Tue, 5 Jan 2021 14:14:33 +0000 Subject: [PATCH] Fixed the default storageclass and replicas number A previous update that added a new storageclass using cephfs-provisioner affects the installation of some application that are trying to use the default storageclass. When an application will try to use the default storageclass it will find two default storageclasses and we want to avoid this problem by using a single default storageclass that can be changed by the user through helm overrides. Also this fixes the replicas number for the deployment, it was hardcoded with 1, but now it can be changed by the user. This commit address an application issue with https://review.opendev.org/c/starlingx/platform-armada-app/+/758786 Signed-off-by: Daniel Safta Story: 2008162 Task: 40908 Change-Id: Ib1e4db29397e674a17d45120f6c0b3babaf1880b --- .../k8sapp_platform/k8sapp_platform/common/constants.py | 1 - .../k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py | 1 - .../helm-charts/cephfs-provisioner/templates/provisioner.yaml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py index edd1ce9..97addfb 100644 --- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py +++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/common/constants.py @@ -16,7 +16,6 @@ HELM_NS_CEPH_FS_PROVISIONER = common.HELM_NS_KUBE_SYSTEM HELM_CEPH_FS_PROVISIONER_CLAIM_ROOT = '/pvc-volumes' HELM_CHART_CEPH_FS_PROVISIONER_NAME = 'ceph.com/cephfs' -K8S_CEPHFS_PROVISIONER_STOR_CLASS_NAME = 'cephfs' K8S_CEPHFS_PROVISIONER_ADMIN_SECRET_NAME = 'ceph-secret-admin' K8S_CEPHFS_PROVISIONER_ADMIN_SECRET_NAMESPACE = 'kube-system' K8S_CEPHFS_PROVISIONER_USER_NAME = 'admin' diff --git a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py index c93ea75..1a7ef22 100644 --- a/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py +++ b/python-k8sapp-platform/k8sapp_platform/k8sapp_platform/helm/ceph_fs_provisioner.py @@ -171,7 +171,6 @@ class CephFSProvisionerHelm(base.BaseHelm): global_settings = { "replicas": self._num_provisioned_controllers(), - "defaultStorageClass": app_constants.K8S_CEPHFS_PROVISIONER_STOR_CLASS_NAME } overrides = { diff --git a/stx-platform-helm/stx-platform-helm/helm-charts/cephfs-provisioner/templates/provisioner.yaml b/stx-platform-helm/stx-platform-helm/helm-charts/cephfs-provisioner/templates/provisioner.yaml index a7ccbcd..0ac21ea 100644 --- a/stx-platform-helm/stx-platform-helm/helm-charts/cephfs-provisioner/templates/provisioner.yaml +++ b/stx-platform-helm/stx-platform-helm/helm-charts/cephfs-provisioner/templates/provisioner.yaml @@ -16,7 +16,7 @@ metadata: name: {{ $defaults.provisionerConfigName }} namespace: {{ $defaults.cephFSNamespace }} spec: - replicas: 1 + replicas: {{ .Values.global.replicas }} strategy: type: Recreate selector: