From 55cd7dfa2ed6edd59fbeced738efe4677127d681 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Fri, 28 Nov 2025 13:05:35 -0300 Subject: [PATCH 1/4] [patch] add support for pvc --- src/mas/devops/mas.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 4f091e58..7392a905 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -58,6 +58,12 @@ def getDefaultStorageClasses(dynClient: DynamicClient) -> dict: result.rwo = "ibmc-block-gold" result.rwx = "ibmc-file-gold-gid" break + if storageClass.metadata.name in ["ibmc-vpc-file-min-iops", "ibmc-vpc-block-10iops-tier"]: + result.provider = "ibmc-vpc" + result.providerName = "IBMCloud VPC Storage" + result.rwo = "ibmc-vpc-block-10iops-tier" + result.rwx = "ibmc-vpc-file-min-iops" + break elif storageClass.metadata.name in ["ocs-storagecluster-ceph-rbd", "ocs-storagecluster-cephfs"]: result.provider = "ocs" result.providerName = "OpenShift Container Storage" From c719ab1d0bfb504cac060ddd9585ff610c000fb4 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:36:10 -0300 Subject: [PATCH 2/4] [patch] add grafana storage class parameter --- src/mas/devops/mas.py | 12 ++++++------ src/mas/devops/templates/pipelinerun-install.yml.j2 | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 7392a905..4e90e18c 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -58,12 +58,12 @@ def getDefaultStorageClasses(dynClient: DynamicClient) -> dict: result.rwo = "ibmc-block-gold" result.rwx = "ibmc-file-gold-gid" break - if storageClass.metadata.name in ["ibmc-vpc-file-min-iops", "ibmc-vpc-block-10iops-tier"]: - result.provider = "ibmc-vpc" - result.providerName = "IBMCloud VPC Storage" - result.rwo = "ibmc-vpc-block-10iops-tier" - result.rwx = "ibmc-vpc-file-min-iops" - break + # if storageClass.metadata.name in ["ibmc-vpc-file-min-iops", "ibmc-vpc-block-10iops-tier"]: + # result.provider = "ibmc-vpc" + # result.providerName = "IBMCloud VPC Storage" + # result.rwo = "ibmc-vpc-block-10iops-tier" + # result.rwx = "ibmc-vpc-file-min-iops" + # break elif storageClass.metadata.name in ["ocs-storagecluster-ceph-rbd", "ocs-storagecluster-cephfs"]: result.provider = "ocs" result.providerName = "OpenShift Container Storage" diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 1c4797f7..3d16a541 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -732,6 +732,8 @@ spec: value: "{{ grafana_v5_namespace }}" - name: grafana_instance_storage_size value: "{{ grafana_instance_storage_size }}" + - name: grafana_instance_storage_class + value: "{{ grafana_instance_storage_class }}" {%- endif %} {%- if mas_app_channel_facilities is defined and mas_app_channel_facilities != "" %} From d9cdb000c94665628f604b4eb32787a657f87ecb Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:45:51 -0300 Subject: [PATCH 3/4] [patch] add kafka and zookeeper storage class parameters --- src/mas/devops/templates/pipelinerun-install.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2 index 3d16a541..c7b058cb 100644 --- a/src/mas/devops/templates/pipelinerun-install.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-install.yml.j2 @@ -226,6 +226,10 @@ spec: value: "{{ kafka_namespace }}" - name: kafka_version value: "{{ kafka_version }}" + - name: kafka_storage_class + value: "{{ kafka_storage_class }}" + - name: zookeeper_storage_class + value: "{{ zookeeper_storage_class }}" {%- if kafka_provider == "aws" %} # Dependencies - AWS MSK From 10e0c5014d4d1d742245f9581507b901343586e9 Mon Sep 17 00:00:00 2001 From: terc1997 <64480693+terc1997@users.noreply.github.com> Date: Mon, 8 Dec 2025 14:30:27 -0300 Subject: [PATCH 4/4] [patch] remove mas devops changes --- src/mas/devops/mas.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mas/devops/mas.py b/src/mas/devops/mas.py index 3acbfeac..61b4bc23 100644 --- a/src/mas/devops/mas.py +++ b/src/mas/devops/mas.py @@ -59,12 +59,6 @@ def getDefaultStorageClasses(dynClient: DynamicClient) -> dict: result.rwo = "ibmc-block-gold" result.rwx = "ibmc-file-gold-gid" break - # if storageClass.metadata.name in ["ibmc-vpc-file-min-iops", "ibmc-vpc-block-10iops-tier"]: - # result.provider = "ibmc-vpc" - # result.providerName = "IBMCloud VPC Storage" - # result.rwo = "ibmc-vpc-block-10iops-tier" - # result.rwx = "ibmc-vpc-file-min-iops" - # break elif storageClass.metadata.name in ["ocs-storagecluster-ceph-rbd", "ocs-storagecluster-cephfs"]: result.provider = "ocs" result.providerName = "OpenShift Container Storage"