[minor] Added changes for creating EFS CSI Driver Operator through Gitops

cluster-applications/000-efs-csi-driver/templates/01-efs_OperatorGroup.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: openshift-operators
+  namespace: "{{ .Values.subscription_source_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "016"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec: {}

cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml → cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml

@@ -1,10 +1,16 @@
-apiVersion: v1
+---
 kind: Secret
+apiVersion: v1
 metadata:
   name: aws-efs-cloud-credentials
-  namespace: openshift-cluster-csi-drivers
+  namespace: "{{ .Values.subscription_source_namespace }}"
   annotations:
+    argocd.argoproj.io/sync-wave: "018"
     cloudcredential.openshift.io/secret-sync: "true"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
 type: Opaque
 stringData:
   credentials: |

cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml → cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml

@@ -2,13 +2,18 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "017"
+  name: aws-efs-csi-driver-operator
+  namespace: "{{ .Values.subscription_source_namespace }}"
   labels:
     operators.coreos.com/aws-efs-csi-driver-operator.openshift-cluster-csi-drivers: ""
-  name: aws-efs-csi-driver-operator
-  namespace: openshift-cluster-csi-drivers
+{{- if .Values.custom_labels }}
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
 spec:
   channel: "{{ .Values.channel }}"
-  installPlanApproval: Automatic
+  installPlanApproval: "Automatic"
   name: aws-efs-csi-driver-operator
   source: "{{ .Values.catalog_source }}"
-  sourceNamespace: "{{ .Values.catalog_source_namespace }}"
+  sourceNamespace: "{{ .Values.catalog_source_namespace }}"

cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml → cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml

@@ -1,6 +1,9 @@
+---
 apiVersion: operator.openshift.io/v1
 kind: ClusterCSIDriver
 metadata:
     name: efs.csi.aws.com
+    annotations:
+        argocd.argoproj.io/sync-wave: "019"
 spec:
-  managementState: Managed
+  managementState: Managed

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: ""

instance-applications/120-ibm-dbs-rds-database/Chart.yaml

@@ -3,7 +3,6 @@ name: ibm-dbs-rds-database
 description: IBM DB2RDS Database
 type: application
 version: 1.0.0
-
 dependencies:
   - name: junitreporter
     version: 1.0.0

instance-applications/120-ibm-dbs-rds-database/templates/00-configmap.yaml

@@ -38,6 +38,7 @@ data:
         f"UID={username};"
         f"PWD={password};"
         f"SECURITY=SSL;"
+        f"SSLVersion=TLSv1.2;"
         f"SSLServerCertificate={ssl_cert_path};"
     )
 
@@ -50,9 +51,9 @@ data:
         f"UID={username};"
         f"PWD={password};"
         f"SECURITY=SSL;"
+        f"SSLVersion=TLSv1.2;"
         f"SSLServerCertificate={ssl_cert_path};"
     )
-
     try:
         admin_conn = db2.connect(conn_rds_admin_str, "", "")
         print("✅ Connected to Db2 as rdsadmin user")

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:
+mas_application_id:

root-applications/ibm-mas-cluster-root/templates/000-efs-csi-driver.yaml

@@ -1,5 +1,4 @@
 {{- if not (empty .Values.efs_csi_driver) }}
-
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
@@ -43,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 | default "openshift-cluster-csi-drivers" }}
             junitreporter:
               reporter_name: "efs-csi-driver"
               cluster_id: "{{ .Values.cluster.id }}"

root-applications/ibm-mas-cluster-root/values.yaml

@@ -48,4 +48,5 @@ devops:
 
 custom_sa:
   custom_sa_namespace:
-  custom_sa_details:
+  custom_sa_details:
+

root-applications/ibm-mas-instance-root/values.yaml

@@ -47,7 +47,7 @@ run_sanity_test: false
 devops:
   mongo_uri:
   build_number:
-  
+
 # Flags to opt out of adoption metric reporting. Defaults to true (reporting enabled)
 mas_feature_usage: true
 mas_deployment_progression: true