From 7dd821ff698ce3462ef232fc985157cc3ddb0a23 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 8 Jan 2026 13:35:50 +0530 Subject: [PATCH 01/40] EFS CSI Driver operator changes --- .../000-efs-csi-driver/Chart.yaml | 11 +++ .../000-efs-csi-driver/README.md | 3 + .../templates/01-efs_OperatorGroup.yaml | 15 ++++ .../templates/02-efs-iam-role_Secret.yaml | 19 +++++ .../templates/02-efs_Subscription.yaml | 19 +++++ .../templates/04-efs_csi_driver.yaml | 7 ++ .../000-efs-csi-driver/values.yaml | 7 ++ .../templates/000-cluster-appset.yaml | 6 ++ .../templates/000-efs-csi-driver.yaml | 74 +++++++++++++++++++ 9 files changed, 161 insertions(+) create mode 100644 cluster-applications/000-efs-csi-driver/Chart.yaml create mode 100644 cluster-applications/000-efs-csi-driver/README.md create mode 100644 cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml create mode 100644 cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml create mode 100644 cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml create mode 100644 cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml create mode 100644 cluster-applications/000-efs-csi-driver/values.yaml create mode 100644 root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml diff --git a/cluster-applications/000-efs-csi-driver/Chart.yaml b/cluster-applications/000-efs-csi-driver/Chart.yaml new file mode 100644 index 000000000..96625d44f --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/Chart.yaml @@ -0,0 +1,11 @@ +apiVersion: v2 +name: ibm-efs-csi +description: IBM EFS CSI Driver Operator +type: application +version: 1.0.0 + +dependencies: +- name: junitreporter + version: 1.0.0 + repository: "file://../../sub-charts/junitreporter/" + condition: junitreporter.devops_mongo_uri != "" \ No newline at end of file diff --git a/cluster-applications/000-efs-csi-driver/README.md b/cluster-applications/000-efs-csi-driver/README.md new file mode 100644 index 000000000..f147f4118 --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/README.md @@ -0,0 +1,3 @@ +IBM EFS CSI Operator +=============================================================================== +Installs the AWS EFS CSI Driver Operator and EFS CSI Driver which connects to the created service account using a secret which points to IAM Role policy \ No newline at end of file diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml new file mode 100644 index 000000000..6f59d3b5a --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-cluster-csi-drivers + namespace: "{{ .Values.catalog_source_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "016" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + targetNamespaces: + - "{{ .Values.catalog_source_namespace }}" diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml new file mode 100644 index 000000000..0b36f9c96 --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml @@ -0,0 +1,19 @@ +--- +kind: Secret +apiVersion: v1 +metadata: + name: aws-efs-cloud-credentials + namespace: "{{ .Values.catalog_source_namespace }}" + annotations: + argocd.argoproj.io/sync-wave: "021" + cloudcredential.openshift.io/secret-sync: "true" +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +type: Opaque +stringData: + credentials: | + [default] + role_arn = {{ .Values.role_arn }} + web_identity_token_file = /var/run/secrets/openshift/serviceaccount/token diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml new file mode 100644 index 000000000..05352390a --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + annotations: + argocd.argoproj.io/sync-wave: "017" + name: aws-efs-csi-driver-operator + namespace: "{{ .Values.catalog_source_namespace }}" + labels: + operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + channel: stable + installPlanApproval: "{{ .Values.efs_install_plan }}" + name: aws-efs-csi-driver-operator + source: "{{ .Values.catalog_source }}" + sourceNamespace: "{{ .Values.catalog_source_namespace }}" \ No newline at end of file diff --git a/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml b/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml new file mode 100644 index 000000000..14b62ecd8 --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: operator.openshift.io/v1 +kind: ClusterCSIDriver +metadata: + name: efs.csi.aws.com +spec: + managementState: Managed \ No newline at end of file diff --git a/cluster-applications/000-efs-csi-driver/values.yaml b/cluster-applications/000-efs-csi-driver/values.yaml new file mode 100644 index 000000000..869d32369 --- /dev/null +++ b/cluster-applications/000-efs-csi-driver/values.yaml @@ -0,0 +1,7 @@ +--- +efs_csi_namespace: "openshift-cluster-csi-drivers" +efs_install_plan: Automatic +efs_subscription_source: redhat-operators +efs_subscription_sourceNamespace: openshift-marketplace + +run_sync_hooks: true \ No newline at end of file diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index ad98b38c0..70d94262e 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -102,6 +102,12 @@ spec: revision: "{{ .Values.generator.revision }}" files: - path: "{{ .Values.account.id }}/*/mas-provisioner.yaml" + - git: + repoURL: "{{ .Values.generator.repo_url }}" + revision: "{{ .Values.generator.revision }}" + files: + - path: "{{ .Values.account.id }}/*/efs_csi_driver.yaml" + syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" template: diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml new file mode 100644 index 000000000..fb2e96dbf --- /dev/null +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -0,0 +1,74 @@ +{{- if not (empty .Values.efs_csi_driver) }} + +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: efs-csi-driver.{{ .Values.cluster.id }} + namespace: {{ .Values.argo.namespace }} + labels: + environment: '{{ .Values.account.id }}' + region: '{{ .Values.region.id }}' + cluster: '{{ .Values.cluster.id }}' + annotations: + argocd.argoproj.io/sync-wave: "000" + healthCheckTimeout: "1800" + {{- if and .Values.notifications .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-failed.workspace1: {{ .Values.notifications.slack_channel_id }} + notifications.argoproj.io/subscribe.on-sync-succeeded.workspace1: {{ .Values.notifications.slack_channel_id }} + {{- end }} + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + ignoreDifferences: + - group: '*' + kind: ServiceAccount + jsonPointers: + - /imagePullSecrets + project: "{{ .Values.argo.projects.apps }}" + destination: + server: {{ .Values.cluster.url }} + namespace: openshift-config + source: + repoURL: "{{ .Values.source.repo_url }}" + path: cluster-applications/000-efs-csi-driver + targetRevision: "{{ .Values.source.revision }}" + plugin: + name: {{ .Values.avp.name }} + env: + - name: {{ .Values.avp.values_varname }} + value: | + + channel: {{ .Values.efs_csi_driver.channel }} + catalog_source: {{ .Values.efs_csi_driver.catalog_source }} + catalog_source_namespace: {{ .Values.efs_csi_driver.catalog_source_namespace }} + role_arn: {{ .Values.efs_csi_driver.role_arn }} + + junitreporter: + reporter_name: "efs-csi-driver" + cluster_id: "{{ .Values.cluster.id }}" + devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" + devops_build_number: "{{ .Values.devops.build_number }}" + gitops_version: "{{ .Values.source.revision }}" + cli_image_repo: {{ .Values.cli_image_repo }} + {{- if .Values.custom_labels }} + custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + - name: ARGOCD_APP_NAME + value: efscsidriverapp + {{- if not (empty .Values.avp.secret) }} + - name: AVP_SECRET + value: {{ .Values.avp.secret }} + {{- end }} + syncPolicy: + automated: + {{- if .Values.auto_delete }} + prune: true + {{- end }} + selfHeal: true + retry: + limit: 20 + syncOptions: + - CreateNamespace=true + - RespectIgnoreDifferences=true +{{- end }} \ No newline at end of file From f5ce69b66414e40cd7104e4bf7d7123a6047d474 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Thu, 5 Feb 2026 12:42:47 +0530 Subject: [PATCH 02/40] Modified EFS Operator Argo condition --- .../templates/10-postsync-setup-hadr.yaml | 6 +++--- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml index 23e557eba..4bfc50102 100644 --- a/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml +++ b/instance-applications/120-ibm-db2u-database/templates/10-postsync-setup-hadr.yaml @@ -465,7 +465,7 @@ spec: if [[ ! -z $timestamp ]]; then backup_filename=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "ls /mnt/backup/standby | grep ${timestamp}" db2inst1` echo "backup_filename - $backup_filename" - if [[ ${timestamp:0:8} == `date +%Y%m%d` ]]; then + if [[ e == `date +%Y%m%d` ]]; then is_backup_file_available=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "if [ -f /mnt/backup/standby/$backup_filename ]; then echo 'true'; else echo 'false'; fi"` fi fi @@ -480,7 +480,7 @@ spec: echo "" timestamp=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "cat /mnt/backup/standby/dbbackup.log | grep 'timestamp' | rev | cut -d ' ' -f1 | rev" db2inst1` echo "Timestamp of backup is ${timestamp}" - + backup_filename=`oc exec -n ${DB2_NAMESPACE} c-${PRIMARY_DB2_INSTANCE_NAME}-db2u-0 -- su -lc "ls /mnt/backup/standby | grep ${timestamp}" db2inst1` echo "Backup filename is ${backup_filename}" else @@ -494,7 +494,7 @@ spec: # copy backup to standby if it is not there or not a valid image echo "Checking if backup file was copied already to standby c-${DB2_INSTANCE_NAME}-db2u-0" - is_backup_copied=`oc exec -n ${DB2_NAMESPACE} c-${DB2_INSTANCE_NAME}-db2u-0 -- su -lc "if [ -f /mnt/backup/primary-backup/${backup_filename} ]; then echo 'true'; else echo 'false'; fi"` + is_backup_copied=`oc exec -n ${DB2_NAMESPACE} c-${DB2_INSTANCE_NAME}-db2u-0 -- su -lc "if [ -f lsprimary-backup/${backup_filename} ]; then echo 'true'; else echo 'false'; fi"` if [[ $rc != 0 || $is_backup_copied == 'false' ]]; then echo "" diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index fb2e96dbf..be44bfc88 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -1,4 +1,4 @@ -{{- if not (empty .Values.efs_csi_driver) }} +{{- if not (empty .Values.efs_csi_driver.role_arn) }} --- apiVersion: argoproj.io/v1alpha1 From 8f097667f095da68a4b986802fb5b0bcb1d0eb16 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Mon, 16 Feb 2026 11:39:45 +0530 Subject: [PATCH 03/40] RDS Testing --- instance-applications/120-ibm-dbs-rds-database/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/values.yaml b/instance-applications/120-ibm-dbs-rds-database/values.yaml index 18be43a63..d4b3b6bdb 100644 --- a/instance-applications/120-ibm-dbs-rds-database/values.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/values.yaml @@ -7,4 +7,4 @@ password: "dummy" db2_rds_instance_name: dbs-rds-inst1-manage scriptConfigMapName: dbs-rds-init-script -mas_application_id: \ No newline at end of file +mas_application_id: From 4875f220c6e8401fe105db08fabb0f884a4867bd Mon Sep 17 00:00:00 2001 From: amitpandey Date: Mon, 16 Feb 2026 12:10:46 +0530 Subject: [PATCH 04/40] Adding missing efs driver changes o values.yaml --- root-applications/ibm-mas-cluster-root/values.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 31e327fa3..550187b90 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -48,4 +48,12 @@ devops: custom_sa: custom_sa_namespace: - custom_sa_details: \ No newline at end of file + custom_sa_details: + +#EFS Driver changes +efs_csi_driver: + catalog_source: xxxx + catalog_source_namespace: xxxx + channel: xxxx + subscription_source_namespace: xxxx + role_arn: xxxx \ No newline at end of file From a2f4185d5bd6f18612383b6762426d396880743d Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 13:46:57 +0530 Subject: [PATCH 05/40] Mongo fix test --- root-applications/ibm-mas-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 6555471a9..5f13fed4a 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -46,4 +46,4 @@ run_sanity_test: false devops: mongo_uri: - build_number: \ No newline at end of file + build_number: From 75771fadd0575e543fcc2b37d3036e724b5eb718 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 15:16:47 +0530 Subject: [PATCH 06/40] RDS Connection string --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 8bf9424b3..4b6c12db1 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -52,7 +52,7 @@ data: f"SECURITY=SSL;" f"SSLServerCertificate={ssl_cert_path};" ) - + print(f"Connection String: {conn_rds_db2_str}") try: admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From a4a215ac9177368c58fe5040ebfa3dad9d7ccc96 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 16:20:55 +0530 Subject: [PATCH 07/40] RDS Connection string --- root-applications/ibm-mas-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5f13fed4a..6555471a9 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -46,4 +46,4 @@ run_sanity_test: false devops: mongo_uri: - build_number: + build_number: \ No newline at end of file From 3de8049eed1de80fefdbd3a5dba7125c675543fe Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 16:32:13 +0530 Subject: [PATCH 08/40] RDS Connection string --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 8bf9424b3..d860d4454 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -54,6 +54,7 @@ data: ) try: + print(f"Connection String admin db 1: {conn_rds_admin_str}") admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From 44992138864f92c056bfb145305e7e5112004a59 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 17:38:37 +0530 Subject: [PATCH 09/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index d860d4454..d931dbed4 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -37,7 +37,6 @@ data: f"PROTOCOL=TCPIP;" f"UID={username};" f"PWD={password};" - f"SECURITY=SSL;" f"SSLServerCertificate={ssl_cert_path};" ) @@ -49,7 +48,6 @@ data: f"PROTOCOL=TCPIP;" f"UID={username};" f"PWD={password};" - f"SECURITY=SSL;" f"SSLServerCertificate={ssl_cert_path};" ) From 29fa04b11422dd848d100cc357ba165150cf7729 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 17:49:08 +0530 Subject: [PATCH 10/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index d931dbed4..e9c08ee52 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -52,7 +52,7 @@ data: ) try: - print(f"Connection String admin db 1: {conn_rds_admin_str}") + print(f"Connection String admin db 2: {conn_rds_admin_str}") admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From a8a518e7e885b2fb5ce1cb497c3c599eca01c903 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 17:57:53 +0530 Subject: [PATCH 11/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index e9c08ee52..c713bc03e 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -52,7 +52,6 @@ data: ) try: - print(f"Connection String admin db 2: {conn_rds_admin_str}") admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From bd37ca1c5bb35d4dcb4470a28dec5bc2916fcbb5 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 17 Feb 2026 20:09:44 +0530 Subject: [PATCH 12/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 46afa3adf..894f6644b 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -50,7 +50,6 @@ data: f"PWD={password};" f"SSLServerCertificate={ssl_cert_path};" ) - print(f"Connection String: {conn_rds_db2_str}") try: admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From 77067cb5c156256ac5e4d4f5dc3911a8d5ca25e2 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 17 Feb 2026 20:22:30 +0530 Subject: [PATCH 13/40] changes for EFS config --- cluster-applications/000-efs-csi-driver/values.yaml | 5 ----- .../ibm-mas-account-root/templates/000-cluster-appset.yaml | 2 +- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 4 ++-- root-applications/ibm-mas-cluster-root/values.yaml | 7 ------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/values.yaml b/cluster-applications/000-efs-csi-driver/values.yaml index 869d32369..226d3daa0 100644 --- a/cluster-applications/000-efs-csi-driver/values.yaml +++ b/cluster-applications/000-efs-csi-driver/values.yaml @@ -1,7 +1,2 @@ --- -efs_csi_namespace: "openshift-cluster-csi-drivers" -efs_install_plan: Automatic -efs_subscription_source: redhat-operators -efs_subscription_sourceNamespace: openshift-marketplace - run_sync_hooks: true \ No newline at end of file diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index 70d94262e..879750727 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -106,7 +106,7 @@ spec: repoURL: "{{ .Values.generator.repo_url }}" revision: "{{ .Values.generator.revision }}" files: - - path: "{{ .Values.account.id }}/*/efs_csi_driver.yaml" + - path: "{{ .Values.account.id }}/*/efs-csi-driver.yaml" syncPolicy: applicationsSync: "{{- if .Values.auto_delete }}sync{{- else }}create-update{{- end }}" diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index be44bfc88..24fe87aee 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -1,4 +1,4 @@ -{{- if not (empty .Values.efs_csi_driver.role_arn) }} +{{- if and (not (empty .Values.account.hypervisor)) (eq .Values.Values.account.hypervisor "rosa") }} --- apiVersion: argoproj.io/v1alpha1 @@ -43,7 +43,7 @@ spec: catalog_source: {{ .Values.efs_csi_driver.catalog_source }} catalog_source_namespace: {{ .Values.efs_csi_driver.catalog_source_namespace }} role_arn: {{ .Values.efs_csi_driver.role_arn }} - + subscription_source_namespace: {{ .Values.efs_csi_driver.subscription_source_namespace }} junitreporter: reporter_name: "efs-csi-driver" cluster_id: "{{ .Values.cluster.id }}" diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 550187b90..5f840dd01 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -50,10 +50,3 @@ custom_sa: custom_sa_namespace: custom_sa_details: -#EFS Driver changes -efs_csi_driver: - catalog_source: xxxx - catalog_source_namespace: xxxx - channel: xxxx - subscription_source_namespace: xxxx - role_arn: xxxx \ No newline at end of file From 55dc00ce65174bfe4c9517d2dbc48ee3517b6318 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 17 Feb 2026 20:29:05 +0530 Subject: [PATCH 14/40] corrected condition syntax --- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index 24fe87aee..ec114d88b 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -1,4 +1,4 @@ -{{- if and (not (empty .Values.account.hypervisor)) (eq .Values.Values.account.hypervisor "rosa") }} +{{- if and (not (empty .Values.account.hypervisor)) (eq .Values.account.hypervisor "rosa") }} --- apiVersion: argoproj.io/v1alpha1 From 228d4d1381d0c8104a91eb108c383bc66b56c3f0 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 17 Feb 2026 21:23:29 +0530 Subject: [PATCH 15/40] Changed subscription namespace --- .../000-efs-csi-driver/templates/02-efs_Subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index 05352390a..64c447538 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -5,7 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "017" name: aws-efs-csi-driver-operator - namespace: "{{ .Values.catalog_source_namespace }}" + namespace: "{{ .Values.subscription_source_namespace }}" labels: operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" {{- if .Values.custom_labels }} From 79a9e7277f53908d4912331c1419b61654af24da Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 12:11:01 +0530 Subject: [PATCH 16/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 6555471a9..5f13fed4a 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -46,4 +46,4 @@ run_sanity_test: false devops: mongo_uri: - build_number: \ No newline at end of file + build_number: From 206c5acb9857dc9b6cf3913b49c1212c578323a9 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 12:34:49 +0530 Subject: [PATCH 17/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5f13fed4a..6555471a9 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -46,4 +46,4 @@ run_sanity_test: false devops: mongo_uri: - build_number: + build_number: \ No newline at end of file From 2b248e2c7eac9237f9d63905fdee81419ddfdff7 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 12:39:10 +0530 Subject: [PATCH 18/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 6555471a9..2a6bf8ddb 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -46,4 +46,5 @@ run_sanity_test: false devops: mongo_uri: - build_number: \ No newline at end of file + build_number: + From 16a1a7c500487f3b40794507f434d7fa1606da75 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 14:37:59 +0530 Subject: [PATCH 19/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 2a6bf8ddb..170084b54 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -48,3 +48,6 @@ devops: mongo_uri: build_number: + + + From 487fef1d736946e0058e6981e08bc51363a2aef8 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 17:07:02 +0530 Subject: [PATCH 20/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 170084b54..5efee3ab0 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -51,3 +51,5 @@ devops: + + From 582fba9b67d74f329af04a01166578658f6a563e Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 17:15:15 +0530 Subject: [PATCH 21/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5efee3ab0..5f13fed4a 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,9 +47,3 @@ run_sanity_test: false devops: mongo_uri: build_number: - - - - - - From afe98d0473101781c35f5ce543a66d6e1eb55e6d Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 17:22:45 +0530 Subject: [PATCH 22/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5f13fed4a..441cb58e6 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,3 +47,6 @@ run_sanity_test: false devops: mongo_uri: build_number: + + + From f0a59a9699293d64ce63a913ee2cbec62bd8c5dd Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 18:38:58 +0530 Subject: [PATCH 23/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 441cb58e6..5f13fed4a 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,6 +47,3 @@ run_sanity_test: false devops: mongo_uri: build_number: - - - From 74b0645626025c23c54538cb13e1122352409f84 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 18:48:34 +0530 Subject: [PATCH 24/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5f13fed4a..441cb58e6 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,3 +47,6 @@ run_sanity_test: false devops: mongo_uri: build_number: + + + From 165998d59a12cd2efe6bff568db9cd43f5b514d0 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 22:46:10 +0530 Subject: [PATCH 25/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 441cb58e6..5f13fed4a 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,6 +47,3 @@ run_sanity_test: false devops: mongo_uri: build_number: - - - From b2db152b3a92909924bfd3d48ba04e52b66de96c Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 18 Feb 2026 23:02:00 +0530 Subject: [PATCH 26/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 894f6644b..3a5a2f8bd 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -37,6 +37,8 @@ data: f"PROTOCOL=TCPIP;" f"UID={username};" f"PWD={password};" + f"SECURITY=SSL;" + f"SSLVersion=TLSv1.2" f"SSLServerCertificate={ssl_cert_path};" ) @@ -48,6 +50,8 @@ data: f"PROTOCOL=TCPIP;" f"UID={username};" f"PWD={password};" + f"SECURITY=SSL;" + f"SSLVersion=TLSv1.2" f"SSLServerCertificate={ssl_cert_path};" ) try: From 6403a3d9cc363eef249895ed8552bb80463effd0 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Thu, 19 Feb 2026 15:20:57 +0530 Subject: [PATCH 27/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 3a5a2f8bd..19956a1ae 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -51,10 +51,11 @@ data: f"UID={username};" f"PWD={password};" f"SECURITY=SSL;" - f"SSLVersion=TLSv1.2" + f"sslProtocol=TLSv1.2;encryptionAlgorithm=2;securityMechanism=7;" f"SSLServerCertificate={ssl_cert_path};" ) try: + print("Connection string:", conn_rds_admin_str) admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From df2f69ea5cbda1910a8d8d90c9a0a6c316e3b6ab Mon Sep 17 00:00:00 2001 From: amitpandey Date: Thu, 19 Feb 2026 15:25:34 +0530 Subject: [PATCH 28/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 19956a1ae..6df4d4312 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -38,7 +38,7 @@ data: f"UID={username};" f"PWD={password};" f"SECURITY=SSL;" - f"SSLVersion=TLSv1.2" + f"SSLVersion=TLSv1.2;" f"SSLServerCertificate={ssl_cert_path};" ) @@ -51,7 +51,7 @@ data: f"UID={username};" f"PWD={password};" f"SECURITY=SSL;" - f"sslProtocol=TLSv1.2;encryptionAlgorithm=2;securityMechanism=7;" + f"SSLVersion=TLSv1.2;" f"SSLServerCertificate={ssl_cert_path};" ) try: From ddecf61ee64e5d063df6c634d0b761bf5d865601 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Thu, 19 Feb 2026 16:35:21 +0530 Subject: [PATCH 29/40] RDS testing --- root-applications/ibm-mas-instance-root/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index 5f13fed4a..441cb58e6 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/root-applications/ibm-mas-instance-root/values.yaml @@ -47,3 +47,6 @@ run_sanity_test: false devops: mongo_uri: build_number: + + + From 13014a8422af671b421f093756a1c613ca686516 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Thu, 19 Feb 2026 16:40:47 +0530 Subject: [PATCH 30/40] RDS testing --- .../120-ibm-dbs-rds-database/templates/00-configmap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml index 6df4d4312..1f22bd910 100644 --- a/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml @@ -55,7 +55,6 @@ data: f"SSLServerCertificate={ssl_cert_path};" ) try: - print("Connection string:", conn_rds_admin_str) admin_conn = db2.connect(conn_rds_admin_str, "", "") print("✅ Connected to Db2 as rdsadmin user") From 12ec2e18aeb099c680b21fd71de217285e49cfa6 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 24 Feb 2026 19:37:16 +0530 Subject: [PATCH 31/40] EFS Changes v1 --- .../templates/01-efs_OperatorGroup.yaml | 11 ++++++----- .../templates/02-efs-iam-role_Secret.yaml | 3 ++- .../templates/02-efs_Subscription.yaml | 5 +++-- .../120-ibm-dbs-rds-database/Chart.yaml | 5 +++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index 6f59d3b5a..596ba38a1 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -2,14 +2,15 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: - name: openshift-cluster-csi-drivers - namespace: "{{ .Values.catalog_source_namespace }}" + name: openshift-operators + namespace: openshift-operators + # namespace: "{{ .Values.catalog_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" {{- if .Values.custom_labels }} labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} -spec: - targetNamespaces: - - "{{ .Values.catalog_source_namespace }}" +spec: {} + # targetNamespaces: + # - "{{ .Values.catalog_source_namespace }}" diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml index 0b36f9c96..64d5ebd31 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml @@ -3,7 +3,8 @@ kind: Secret apiVersion: v1 metadata: name: aws-efs-cloud-credentials - namespace: "{{ .Values.catalog_source_namespace }}" + namespace: openshift-cluster-csi-drivers + # namespace: "{{ .Values.catalog_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "021" cloudcredential.openshift.io/secret-sync: "true" diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index 64c447538..3a092719a 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -5,7 +5,8 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "017" name: aws-efs-csi-driver-operator - namespace: "{{ .Values.subscription_source_namespace }}" + namespace: openshift-operators + # namespace: "{{ .Values.subscription_source_namespace }}" labels: operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" {{- if .Values.custom_labels }} @@ -13,7 +14,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.efs_install_plan }}" + installPlanApproval: "Automatic" name: aws-efs-csi-driver-operator source: "{{ .Values.catalog_source }}" sourceNamespace: "{{ .Values.catalog_source_namespace }}" \ No newline at end of file diff --git a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml b/instance-applications/120-ibm-dbs-rds-database/Chart.yaml index d9fee44d4..b887a2b90 100644 --- a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/Chart.yaml @@ -4,6 +4,11 @@ description: IBM DB2RDS Database type: application version: 1.0.0 +# Related JIRA Issues: +# - https://jsw.ibm.com/browse/MASCORE-11886 +# - https://jsw.ibm.com/browse/MASCORE-11498 +# - https://jsw.ibm.com/browse/MASCORE-11506 + dependencies: - name: junitreporter version: 1.0.0 From 34bee9f4f25c545eff956f438aa373a2fe5277e3 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 24 Feb 2026 19:46:49 +0530 Subject: [PATCH 32/40] Added target namespace to operator group --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index 596ba38a1..1efd075da 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -11,6 +11,6 @@ metadata: labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} -spec: {} - # targetNamespaces: - # - "{{ .Values.catalog_source_namespace }}" +spec: + targetNamespaces: + - "{{ .Values.catalog_source_namespace }}" From 0cfee5477c52d8e44b3eae96d043b6e68cec8290 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 24 Feb 2026 20:00:30 +0530 Subject: [PATCH 33/40] Changed operator group config --- .../templates/01-efs_OperatorGroup.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index 1efd075da..8fb027bcb 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -3,7 +3,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: name: openshift-operators - namespace: openshift-operators + namespace: openshift-cluster-csi-drivers # namespace: "{{ .Values.catalog_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" @@ -11,6 +11,6 @@ metadata: labels: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} -spec: - targetNamespaces: - - "{{ .Values.catalog_source_namespace }}" +spec: {} + # targetNamespaces: + # - "{{ .Values.catalog_source_namespace }}" From 5c7240397f514629f89c9f3a01e489a8aeeba7ee Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Tue, 24 Feb 2026 20:21:51 +0530 Subject: [PATCH 34/40] Changed subscription namespace --- .../000-efs-csi-driver/templates/02-efs_Subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index 3a092719a..582afd07a 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -5,7 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "017" name: aws-efs-csi-driver-operator - namespace: openshift-operators + namespace: openshift-cluster-csi-drivers # namespace: "{{ .Values.subscription_source_namespace }}" labels: operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" From ce1da66811372aae03a70d5637ab0e11b21af990 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Wed, 25 Feb 2026 12:51:32 +0530 Subject: [PATCH 35/40] Confirmed namespaces for EFS Argo apps --- .../000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml | 5 +---- .../000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml | 5 ++--- .../000-efs-csi-driver/templates/02-efs_Subscription.yaml | 3 +-- .../000-efs-csi-driver/templates/04-efs_csi_driver.yaml | 2 ++ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml index 8fb027bcb..e94efb415 100644 --- a/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml @@ -3,8 +3,7 @@ apiVersion: operators.coreos.com/v1 kind: OperatorGroup metadata: name: openshift-operators - namespace: openshift-cluster-csi-drivers - # namespace: "{{ .Values.catalog_source_namespace }}" + namespace: "{{ .Values.subscription_source_namespace }}" annotations: argocd.argoproj.io/sync-wave: "016" {{- if .Values.custom_labels }} @@ -12,5 +11,3 @@ metadata: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} spec: {} - # targetNamespaces: - # - "{{ .Values.catalog_source_namespace }}" diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml index 64d5ebd31..b8ad85e30 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml @@ -3,10 +3,9 @@ kind: Secret apiVersion: v1 metadata: name: aws-efs-cloud-credentials - namespace: openshift-cluster-csi-drivers - # namespace: "{{ .Values.catalog_source_namespace }}" + namespace: "{{ .Values.subscription_source_namespace }}" annotations: - argocd.argoproj.io/sync-wave: "021" + argocd.argoproj.io/sync-wave: "018" cloudcredential.openshift.io/secret-sync: "true" {{- if .Values.custom_labels }} labels: diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index 582afd07a..2614840b2 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -5,8 +5,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "017" name: aws-efs-csi-driver-operator - namespace: openshift-cluster-csi-drivers - # namespace: "{{ .Values.subscription_source_namespace }}" + namespace: "{{ .Values.subscription_source_namespace }}" labels: operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" {{- if .Values.custom_labels }} diff --git a/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml b/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml index 14b62ecd8..d0cbaa328 100644 --- a/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml @@ -3,5 +3,7 @@ apiVersion: operator.openshift.io/v1 kind: ClusterCSIDriver metadata: name: efs.csi.aws.com + annotations: + argocd.argoproj.io/sync-wave: "019" spec: managementState: Managed \ No newline at end of file From 4f7e97cdeec9d4a06e6713b1d398f84509f00a2c Mon Sep 17 00:00:00 2001 From: amitpandey Date: Wed, 25 Feb 2026 17:19:36 +0530 Subject: [PATCH 36/40] EFS static field removal --- .../templates/aws-efs-cloud-credentials.yaml | 13 ------------- .../templates/efs-csi-driver.yml | 6 ------ .../templates/efs-csi-subscription.yml | 14 -------------- .../templates/operator-group.yml | 6 ------ .../000-efs-csi-driver/values.yaml | 6 ++++++ 5 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml delete mode 100644 cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml delete mode 100644 cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml delete mode 100644 cluster-applications/000-efs-csi-driver/templates/operator-group.yml diff --git a/cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml b/cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml deleted file mode 100644 index 2b69c119d..000000000 --- a/cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: aws-efs-cloud-credentials - namespace: openshift-cluster-csi-drivers - annotations: - cloudcredential.openshift.io/secret-sync: "true" -type: Opaque -stringData: - credentials: | - [default] - role_arn = {{ .Values.role_arn }} - web_identity_token_file = /var/run/secrets/openshift/serviceaccount/token diff --git a/cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml b/cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml deleted file mode 100644 index da48423fa..000000000 --- a/cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: operator.openshift.io/v1 -kind: ClusterCSIDriver -metadata: - name: efs.csi.aws.com -spec: - managementState: Managed diff --git a/cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml b/cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml deleted file mode 100644 index e1af25912..000000000 --- a/cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - labels: - operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: "" - name: aws-efs-csi-driver-operator - namespace: openshift-cluster-csi-drivers -spec: - channel: "{{ .Values.channel }}" - installPlanApproval: Automatic - name: aws-efs-csi-driver-operator - source: "{{ .Values.catalog_source }}" - sourceNamespace: "{{ .Values.catalog_source_namespace }}" diff --git a/cluster-applications/000-efs-csi-driver/templates/operator-group.yml b/cluster-applications/000-efs-csi-driver/templates/operator-group.yml deleted file mode 100644 index d042a5088..000000000 --- a/cluster-applications/000-efs-csi-driver/templates/operator-group.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: openshift-cluster-csi-drivers-operator-group - namespace: openshift-cluster-csi-drivers diff --git a/cluster-applications/000-efs-csi-driver/values.yaml b/cluster-applications/000-efs-csi-driver/values.yaml index ed97d539c..d486086b0 100644 --- a/cluster-applications/000-efs-csi-driver/values.yaml +++ b/cluster-applications/000-efs-csi-driver/values.yaml @@ -1 +1,7 @@ --- +efs_csi_driver: + catalog_source: redhat-operators + catalog_source_namespace: openshift-marketplace + channel: stable + subscription_source_namespace: openshift-cluster-csi-drivers + role_arn: "" \ No newline at end of file From 6514daba94685c41c1495f99f31ec36548742485 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Thu, 26 Feb 2026 15:44:34 +0530 Subject: [PATCH 37/40] Review Comments --- instance-applications/120-ibm-dbs-rds-database/Chart.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml b/instance-applications/120-ibm-dbs-rds-database/Chart.yaml index b887a2b90..51eafd0c6 100644 --- a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml +++ b/instance-applications/120-ibm-dbs-rds-database/Chart.yaml @@ -3,12 +3,6 @@ name: ibm-dbs-rds-database description: IBM DB2RDS Database type: application version: 1.0.0 - -# Related JIRA Issues: -# - https://jsw.ibm.com/browse/MASCORE-11886 -# - https://jsw.ibm.com/browse/MASCORE-11498 -# - https://jsw.ibm.com/browse/MASCORE-11506 - dependencies: - name: junitreporter version: 1.0.0 From 88f66cedc87832e9b370d00b8ae84426e5a2f47e Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Mon, 2 Mar 2026 14:47:15 +0530 Subject: [PATCH 38/40] Modified condition for efs_csi_driver Argo App --- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index 06cc833af..7a2aa8841 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -1,5 +1,4 @@ -{{- if and (not (empty .Values.account.hypervisor)) (eq .Values.account.hypervisor "rosa") }} - +{{- if and (not (empty .Values.efs_csi_driver)) (not (empty .Values.efs_csi_driver.role_arn)) }} --- apiVersion: argoproj.io/v1alpha1 kind: Application @@ -42,7 +41,7 @@ spec: channel: {{ .Values.efs_csi_driver.channel }} catalog_source: {{ .Values.efs_csi_driver.catalog_source }} catalog_source_namespace: {{ .Values.efs_csi_driver.catalog_source_namespace }} - role_arn: {{ .Values.efs_csi_driver.role_arn }} + role_arn: {{ required "efs_csi_driver.role_arn is required when efs_csi_driver is defined" .Values.efs_csi_driver.role_arn }} subscription_source_namespace: {{ .Values.efs_csi_driver.subscription_source_namespace }} junitreporter: reporter_name: "efs-csi-driver" From 439772d85718e63642384bad46436c6176ff8922 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Mon, 2 Mar 2026 15:01:29 +0530 Subject: [PATCH 39/40] Changed condition inside cluster-root efs_csi_driver --- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index 7a2aa8841..53379ad49 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -1,4 +1,4 @@ -{{- if and (not (empty .Values.efs_csi_driver)) (not (empty .Values.efs_csi_driver.role_arn)) }} +{{- if not (empty .Values.efs_csi_driver) }} --- apiVersion: argoproj.io/v1alpha1 kind: Application @@ -41,7 +41,7 @@ spec: channel: {{ .Values.efs_csi_driver.channel }} catalog_source: {{ .Values.efs_csi_driver.catalog_source }} catalog_source_namespace: {{ .Values.efs_csi_driver.catalog_source_namespace }} - role_arn: {{ required "efs_csi_driver.role_arn is required when efs_csi_driver is defined" .Values.efs_csi_driver.role_arn }} + role_arn: {{ .Values.efs_csi_driver.role_arn }} subscription_source_namespace: {{ .Values.efs_csi_driver.subscription_source_namespace }} junitreporter: reporter_name: "efs-csi-driver" From 920a153a855be54c4deb7a0674c055ada62eb6f6 Mon Sep 17 00:00:00 2001 From: Darshan Pandya Date: Mon, 2 Mar 2026 15:21:47 +0530 Subject: [PATCH 40/40] Added default for subscription_source_namespace & made channel variable --- .../000-efs-csi-driver/templates/02-efs_Subscription.yaml | 2 +- .../ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index 2614840b2..52a40d6d2 100644 --- a/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml +++ b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{ .Values.custom_labels | toYaml | indent 4 }} {{- end }} spec: - channel: stable + channel: "{{ .Values.channel }}" installPlanApproval: "Automatic" name: aws-efs-csi-driver-operator source: "{{ .Values.catalog_source }}" diff --git a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml index 53379ad49..1e0743290 100644 --- a/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml @@ -42,7 +42,7 @@ spec: catalog_source: {{ .Values.efs_csi_driver.catalog_source }} catalog_source_namespace: {{ .Values.efs_csi_driver.catalog_source_namespace }} role_arn: {{ .Values.efs_csi_driver.role_arn }} - subscription_source_namespace: {{ .Values.efs_csi_driver.subscription_source_namespace }} + subscription_source_namespace: {{ .Values.efs_csi_driver.subscription_source_namespace | default "openshift-cluster-csi-drivers" }} junitreporter: reporter_name: "efs-csi-driver" cluster_id: "{{ .Values.cluster.id }}"