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..e94efb415 --- /dev/null +++ b/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: {} diff --git a/cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml b/cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml similarity index 60% rename from cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml rename to cluster-applications/000-efs-csi-driver/templates/02-efs-iam-role_Secret.yaml index 2b69c119d..b8ad85e30 100644 --- a/cluster-applications/000-efs-csi-driver/templates/aws-efs-cloud-credentials.yaml +++ b/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: | diff --git a/cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml b/cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml similarity index 52% rename from cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml rename to cluster-applications/000-efs-csi-driver/templates/02-efs_Subscription.yaml index e1af25912..52a40d6d2 100644 --- a/cluster-applications/000-efs-csi-driver/templates/efs-csi-subscription.yml +++ b/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 }}" \ No newline at end of file diff --git a/cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml b/cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml similarity index 52% rename from cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml rename to cluster-applications/000-efs-csi-driver/templates/04-efs_csi_driver.yaml index da48423fa..d0cbaa328 100644 --- a/cluster-applications/000-efs-csi-driver/templates/efs-csi-driver.yml +++ b/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 \ No newline at end of file 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 diff --git a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml b/instance-applications/120-ibm-dbs-rds-database/Chart.yaml index d9fee44d4..51eafd0c6 100644 --- a/instance-applications/120-ibm-dbs-rds-database/Chart.yaml +++ b/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 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..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 @@ -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") 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: 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 5b77f51b5..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 @@ -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 }}" diff --git a/root-applications/ibm-mas-cluster-root/values.yaml b/root-applications/ibm-mas-cluster-root/values.yaml index 31e327fa3..5f840dd01 100644 --- a/root-applications/ibm-mas-cluster-root/values.yaml +++ b/root-applications/ibm-mas-cluster-root/values.yaml @@ -48,4 +48,5 @@ devops: custom_sa: custom_sa_namespace: - custom_sa_details: \ No newline at end of file + custom_sa_details: + diff --git a/root-applications/ibm-mas-instance-root/values.yaml b/root-applications/ibm-mas-instance-root/values.yaml index a2e627285..d3a1a342e 100644 --- a/root-applications/ibm-mas-instance-root/values.yaml +++ b/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