From a5ec39352042014204ad1313c7d06fbce6c3d63f Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 23 Sep 2024 12:08:14 +0100 Subject: [PATCH 01/13] [patch] make redhat cert manager installPlanApproval configurable --- .../templates/02-cert-manager_Subscription.yaml | 2 +- example-config/dev/cluster1/redhat-cert-manager.yaml | 1 + .../templates/010-ibm-redhat-cert-manager-app.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 15a22bb8e..8f135039f 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: Automatic + installPlanApproval: {{ .Values.cert_manager_install_plan_approval }} name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/example-config/dev/cluster1/redhat-cert-manager.yaml b/example-config/dev/cluster1/redhat-cert-manager.yaml index cb95bdeef..39d8d92b4 100644 --- a/example-config/dev/cluster1/redhat-cert-manager.yaml +++ b/example-config/dev/cluster1/redhat-cert-manager.yaml @@ -3,3 +3,4 @@ merge-key: "dev/cluster1" redhat_cert_manager: run_sync_hooks: true channel: stable-v1 + cert_manager_install_plan_approval: Automatic diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 57ff8443e..89087efd8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,6 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} + cert_manager_install_plan_approval: {{ .Values.redhat_cert_manager.cert_manager_install_plan_approval | default('Automatic') }} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} From 3104a3257cdff9f0ca3e89b0094f597419b9249e Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 23 Sep 2024 14:17:52 +0100 Subject: [PATCH 02/13] Update 02-cert-manager_Subscription.yaml --- .../templates/02-cert-manager_Subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 8f135039f..0817bbe33 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: {{ .Values.cert_manager_install_plan_approval }} + installPlanApproval: {{ .Values.redhat_cert_manager.cert_manager_install_plan }} name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace From 7302b209ad33bdde9907fd109ea58f159d83701b Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 23 Sep 2024 14:21:11 +0100 Subject: [PATCH 03/13] [patch] fix --- example-config/dev/cluster1/redhat-cert-manager.yaml | 2 +- .../templates/010-ibm-redhat-cert-manager-app.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example-config/dev/cluster1/redhat-cert-manager.yaml b/example-config/dev/cluster1/redhat-cert-manager.yaml index 39d8d92b4..74abbe07b 100644 --- a/example-config/dev/cluster1/redhat-cert-manager.yaml +++ b/example-config/dev/cluster1/redhat-cert-manager.yaml @@ -3,4 +3,4 @@ merge-key: "dev/cluster1" redhat_cert_manager: run_sync_hooks: true channel: stable-v1 - cert_manager_install_plan_approval: Automatic + cert_manager_install_plan: Automatic diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 89087efd8..148bc8bfe 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,7 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - cert_manager_install_plan_approval: {{ .Values.redhat_cert_manager.cert_manager_install_plan_approval | default('Automatic') }} + cert_manager_install_plan: {{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic') }} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} From f306fd4bcd2f7ec95eb17ab09e1a4190709e0295 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 23 Sep 2024 14:29:09 +0100 Subject: [PATCH 04/13] Update 010-ibm-redhat-cert-manager-app.yaml --- .../templates/010-ibm-redhat-cert-manager-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 148bc8bfe..686638adf 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,7 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - cert_manager_install_plan: {{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic') }} + cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic') }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} From 489d408a3cd9d98496a72827fc5576b3f0fa1065 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 23 Sep 2024 15:41:39 +0100 Subject: [PATCH 05/13] Update 02-cert-manager_Subscription.yaml --- .../templates/02-cert-manager_Subscription.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 0817bbe33..3d034330f 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: {{ .Values.redhat_cert_manager.cert_manager_install_plan }} + installPlanApproval: {{ .Values.cert_manager_install_plan }} name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace From 1ce3c3ba4836d97f5c1c78a9377262602d173cac Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Tue, 24 Sep 2024 09:54:28 +0100 Subject: [PATCH 06/13] Update 010-ibm-redhat-cert-manager-app.yaml --- .../templates/010-ibm-redhat-cert-manager-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 686638adf..8199ce808 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,7 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic') }}" + cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic', True) }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} From e9e40c8dfee558e99f4b5470f2a26f9c3248bf6d Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Tue, 24 Sep 2024 14:14:25 +0100 Subject: [PATCH 07/13] [patch] configurable install plan for all subscriptions --- .../020-ibm-dro/templates/03-imo_Subscription.yaml | 2 +- .../020-ibm-dro/templates/04-dro_Subscription.yaml | 2 +- .../templates/03-cis-compliance_Subscription.yaml | 2 +- .../050-nfd-operator/templates/02-nfd_Subcription.yaml | 2 +- .../templates/02-gpu_Subcription.yaml | 2 +- example-config/dev/cluster1/ibm-dro.yaml | 2 ++ example-config/dev/cluster1/instance1/ibm-db2u.yaml | 1 + .../dev/cluster1/instance1/ibm-mas-suite.yaml | 1 + example-config/dev/cluster1/instance1/ibm-sls.yaml | 1 + .../100-ibm-sls/templates/02-ibm-sls_Subscription.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 4 ++-- .../templates/06-ibm-cp4d_Subscription.yaml | 2 +- .../templates/09-ibm-cp4d_services_base.yaml | 8 ++++---- .../templates/09-ibm-cp4d_services_dependencies.yaml | 10 +++++----- .../templates/04-ibm-cs-control_prereqs_ops.yaml | 2 +- .../110-ibm-db2u/templates/03-db2_Subscription.yaml | 2 +- .../templates/00-ibm-aiopenscale_Subscription.yaml | 2 +- .../templates/01-ibm-spark_Subscription.yaml | 2 +- .../templates/00-ibm-spss_Subscription.yaml | 4 ++-- .../120-ibm-wml/templates/01-ibm-wml_Subscription.yaml | 2 +- .../120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml | 2 +- .../templates/02-ibm-mas_Subscription.yaml | 2 +- .../templates/010-ibm-redhat-cert-manager-app.yaml | 2 +- .../templates/020-ibm-dro-app.yaml | 2 ++ .../templates/040-cis-compliance-app.yaml | 1 + .../templates/050-nfd-operator-app.yaml | 1 + .../templates/051-nvidia-gpu-operator-app.yaml | 1 + .../templates/100-ibm-sls-app.yaml | 1 + .../templates/110-ibm-cp4d-app.yaml | 9 +++++++++ .../templates/110-ibm-cp4d-operator-app.yaml | 9 +++++++++ .../templates/110-ibm-cs-control-app.yaml | 8 ++++++++ .../templates/110-ibm-db2u-app.yaml | 1 + .../templates/120-ibm-aiopenscale-app.yaml | 1 + .../templates/120-ibm-spark-app.yaml | 3 ++- .../templates/120-ibm-spss-app.yaml | 2 ++ .../templates/120-ibm-wml-app.yaml | 1 + .../templates/120-ibm-wsl-app.yaml | 1 + .../templates/130-ibm-mas-suite-app.yaml | 1 + 38 files changed, 74 insertions(+), 29 deletions(-) diff --git a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml index 66b3536b7..e819ef4f4 100644 --- a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: Automatic + installPlanApproval: {{ .Values.imo_install_plan }} name: ibm-metrics-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml index d084adfa5..016cacde8 100644 --- a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: Automatic + installPlanApproval: {{ .Values.dro_install_plan }} name: ibm-data-reporter-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml index 0a3bb37ec..778087b2f 100644 --- a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml +++ b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml @@ -14,7 +14,7 @@ metadata: spec: channel: stable name: compliance-operator - installPlanApproval: Automatic + installPlanApproval: {{ .Values.cis_install_plan }} source: redhat-operators sourceNamespace: openshift-marketplace config: diff --git a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml index 83d28e14e..adb061933 100644 --- a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml +++ b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.nfd_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.nfd_install_plan }} name: nfd source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml index 126df9fc4..b8dcbab95 100644 --- a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml +++ b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.gpu_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.gpu_install_plan }} name: gpu-operator-certified source: certified-operators sourceNamespace: openshift-marketplace diff --git a/example-config/dev/cluster1/ibm-dro.yaml b/example-config/dev/cluster1/ibm-dro.yaml index d32093b2d..0f99b5741 100644 --- a/example-config/dev/cluster1/ibm-dro.yaml +++ b/example-config/dev/cluster1/ibm-dro.yaml @@ -4,3 +4,5 @@ ibm_dro: dro_namespace: ibm-software-central ibm_entitlement_key: "" run_sync_hooks: true + imo_install_plan: Automatic + dro_install_plan: Automatic diff --git a/example-config/dev/cluster1/instance1/ibm-db2u.yaml b/example-config/dev/cluster1/instance1/ibm-db2u.yaml index ecb76e345..037eff4b8 100644 --- a/example-config/dev/cluster1/instance1/ibm-db2u.yaml +++ b/example-config/dev/cluster1/instance1/ibm-db2u.yaml @@ -2,6 +2,7 @@ merge-key: "dev/cluster1/instance1" ibm_db2u: db2_namespace: db2u-instance1 + db2_install_plan: Automatic db2_channel: diff --git a/example-config/dev/cluster1/instance1/ibm-mas-suite.yaml b/example-config/dev/cluster1/instance1/ibm-mas-suite.yaml index 38866b808..283b8d6e7 100644 --- a/example-config/dev/cluster1/instance1/ibm-mas-suite.yaml +++ b/example-config/dev/cluster1/instance1/ibm-mas-suite.yaml @@ -10,3 +10,4 @@ ibm_mas_suite: icr_cp_open: "icr.io/cpopen" mas_manual_cert_mgmt: false + mas_install_plan: Automatic diff --git a/example-config/dev/cluster1/instance1/ibm-sls.yaml b/example-config/dev/cluster1/instance1/ibm-sls.yaml index b2cefe8b5..a34b1936c 100644 --- a/example-config/dev/cluster1/instance1/ibm-sls.yaml +++ b/example-config/dev/cluster1/instance1/ibm-sls.yaml @@ -4,6 +4,7 @@ ibm_sls: sls_channel: 3.x sls_entitlement_file: ibm_entitlement_key: + sls_install_plan: Automatic # aws docdb mongodb_provider: "aws" diff --git a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml index e67d47cd5..52e0572e4 100644 --- a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml +++ b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.sls_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.sls_install_plan }} name: ibm-sls source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index 56aa6653d..a9430260b 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.namespace_scope_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.namespace_scope_install_plan }}" name: ibm-namespace-scope-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" @@ -60,7 +60,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpfs_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpfs_install_plan }}" name: ibm-common-service-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml index c38296be4..4ade931fa 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_platform_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_platform_install_plan }}" name: cpd-platform-operator source: cpd-platform sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index 73d06c9f6..bd7c8ffb5 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -102,7 +102,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ccs_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_ccs_install_plan }}" name: ibm-cpd-ccs source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -121,7 +121,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan }}" name: ibm-cpd-datarefinery source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -140,7 +140,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_ws_install_plan }}" name: ibm-cpd-ws-runtimes source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -159,7 +159,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.elasticsearch_install_plan }}" name: ibm-elasticsearch-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml index e43f9539c..b7cc70c4f 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml @@ -17,7 +17,7 @@ metadata: spec: operators: - channel: "{{ .Values.ccs_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_ccs_install_plan }}" name: ibm-cpd-ccs-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ccs @@ -40,7 +40,7 @@ metadata: spec: operators: - channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan }}" name: ibm-cpd-datarefinery-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-datarefinery @@ -63,7 +63,7 @@ metadata: spec: operators: - channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_ws_install_plan }}" name: ibm-cpd-ws-runtimes-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ws-runtimes @@ -86,7 +86,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_rabbitmq_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.rabbitmq_install_plan }}" name: rabbitmq-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-rabbitmq-operator @@ -109,7 +109,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.elasticsearch_install_plan }}" name: elasticsearch-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-elasticsearch-operator diff --git a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml index 697d6cf00..8fb5170e0 100644 --- a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_ibm_licensing_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.cpd_licensing_install_plan }}" name: ibm-licensing-operator-app source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml index 461db199e..c87002dce 100644 --- a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml +++ b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: {{ .Values.db2_channel }} - installPlanApproval: Automatic + installPlanApproval: {{ .Values.db2_install_plan }} name: db2u-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml index 60e43edc1..16cccf3ff 100644 --- a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml +++ b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.aiopenscale_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.aiopenscale_install_plan }} diff --git a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml index e753f67e4..8cbd7ec9b 100644 --- a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml +++ b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml @@ -15,5 +15,5 @@ spec: channel: "{{ .Values.spark_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.spark_install_plan }} diff --git a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml index 7c5b6005e..a971fc828 100644 --- a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml +++ b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml @@ -15,7 +15,7 @@ spec: channel: "{{ .Values.spss_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.spss_install_plan }} --- apiVersion: operators.coreos.com/v1alpha1 @@ -34,4 +34,4 @@ spec: channel: "{{ .Values.canvasbase_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.canvasbase_install_plan }} diff --git a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml index 2f3abb59b..dbbe225bb 100644 --- a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml +++ b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wml_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.wml_install_plan }} diff --git a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml index 98614d725..1ffe6c026 100644 --- a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml +++ b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wsl_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: Automatic + installPlanApproval: {{ .Values.wsl_install_plan }} diff --git a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml index 1f7e5526f..cb781ea9e 100644 --- a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_channel }}" - installPlanApproval: Automatic + installPlanApproval: {{ .Values.mas_install_plan }} name: ibm-mas source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 8199ce808..85356eb1e 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,7 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan | default('Automatic', True) }}" + cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml b/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml index 7bb2a5146..0c147f3cb 100644 --- a/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/020-ibm-dro-app.yaml @@ -48,6 +48,8 @@ spec: dro_namespace: "{{ .Values.ibm_dro.dro_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_dro.ibm_entitlement_key }}" dro_cmm_setup: "{{ .Values.ibm_dro.dro_cmm_setup }}" + dro_install_plan: "{{ .Values.ibm_dro.dro_install_plan }}" + imo_install_plan: "{{ .Values.ibm_dro.imo_install_plan }}" {{- if .Values.ibm_dro.dro_cmm_setup }} dro_cmm: auth_apikey: "{{ .Values.ibm_dro.dro_cmm.auth_apikey }}" diff --git a/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml b/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml index bb58d3698..21c0b76fd 100644 --- a/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/040-cis-compliance-app.yaml @@ -34,6 +34,7 @@ spec: - name: {{ .Values.avp.values_varname }} value: | argo_namespace: "{{ .Values.argo.namespace }}" + cis_install_plan: "{{ .Values.cis_compliance.cis_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml index 130a523dd..2a840d374 100644 --- a/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/050-nfd-operator-app.yaml @@ -36,6 +36,7 @@ spec: argo_namespace: "{{ .Values.argo.namespace }}" nfd_namespace: "{{ .Values.nvidia_gpu_operator.nfd_namespace }}" nfd_channel: "{{ .Values.nvidia_gpu_operator.nfd_channel }}" + nfd_install_plan: "{{ .Values.nvidia_gpu_operator.nfd_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml index 3182069d6..a890a3f31 100644 --- a/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/051-nvidia-gpu-operator-app.yaml @@ -37,6 +37,7 @@ spec: gpu_channel: "{{ .Values.nvidia_gpu_operator.gpu_channel }}" gpu_driver_repository_path: "{{ .Values.nvidia_gpu_operator.gpu_driver_repository_path }}" gpu_driver_version: "{{ .Values.nvidia_gpu_operator.gpu_driver_version }}" + gpu_install_plan: "{{ .Values.nvidia_gpu_operator.gpu_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml index 241961683..7ad8e8bfc 100644 --- a/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml @@ -53,6 +53,7 @@ spec: sls_mongo_password: "{{ .Values.ibm_sls.sls_mongo_password }}" sls_entitlement_file: "{{ .Values.ibm_sls.sls_entitlement_file }}" icr_cp_open: "{{ .Values.ibm_sls.icr_cp_open }}" + sls_install_plan: "{{ .Values.ibm_sls.sls_install_plan }}" mongo_spec: {{ .Values.ibm_sls.mongo_spec | toYaml | nindent 14}} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml index fa60712a0..4f78cf2ae 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml @@ -54,13 +54,17 @@ spec: cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" @@ -79,10 +83,15 @@ spec: {{- end }} {{- if not (empty .Values.ibm_cp4d_services_base) }} ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" + rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" {{- end }} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml index aa0eca87a..8d3b9b958 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml @@ -46,13 +46,17 @@ spec: cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" @@ -71,10 +75,15 @@ spec: {{- end }} {{- if not (empty .Values.ibm_cp4d_services_base) }} ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" + rabbitmq_install_plan: "{{ .Values.ibm_cp4d_services_base.rabbitmq_install_plan }}" opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" {{- end }} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml index 6a91e88f6..fbedd9990 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml @@ -46,13 +46,17 @@ spec: cpd_cs_control_namespace: "{{ .Values.ibm_cp4d.cpd_cs_control_namespace }}" cpd_admin_login_sa: "{{ .Values.ibm_cp4d.cpd_admin_login_sa }}" namespace_scope_channel: "{{ .Values.ibm_cp4d.namespace_scope_channel }}" + namespace_scope_install_plan: "{{ .Values.ibm_cp4d.namespace_scope_install_plan }}" cpd_ibm_licensing_channel: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_channel }}" cpd_ibm_licensing_version: "{{ .Values.ibm_cp4d.cpd_ibm_licensing_version }}" + cpd_licensing_install_plan: "{{ .Values.ibm_cp4d.cpd_licensing_install_plan }}" cpfs_channel: "{{ .Values.ibm_cp4d.cpfs_channel }}" cpfs_size: "{{ .Values.ibm_cp4d.cpfs_size }}" + cpfs_install_plan: "{{ .Values.ibm_cp4d.cpfs_install_plan }}" cpd_scale_config: "{{ .Values.ibm_cp4d.cpd_scale_config }}" cpd_platform_channel: "{{ .Values.ibm_cp4d.cpd_platform_channel }}" cpd_platform_cr_name: "{{ .Values.ibm_cp4d.cpd_platform_cr_name }}" + cpd_platform_install_plan: "{{ .Values.ibm_cp4d.cpd_platform_install_plan }}" cpd_product_version: "{{ .Values.ibm_cp4d.cpd_product_version }}" cpd_iam_integration: "{{ .Values.ibm_cp4d.cpd_iam_integration }}" cpd_primary_storage_class: "{{ .Values.ibm_cp4d.cpd_primary_storage_class }}" @@ -71,10 +75,14 @@ spec: {{- end }} {{- if not (empty .Values.ibm_cp4d_services_base) }} ccs_channel: "{{ .Values.ibm_cp4d_services_base.ccs_channel }}" + cpd_ccs_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ccs_install_plan }}" datarefinery_channel: "{{ .Values.ibm_cp4d_services_base.datarefinery_channel }}" + cpd_datarefinery_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_datarefinery_install_plan }}" ws_runtimes_channel: "{{ .Values.ibm_cp4d_services_base.ws_runtimes_channel }}" + cpd_ws_install_plan: "{{ .Values.ibm_cp4d_services_base.cpd_ws_install_plan }}" opencontent_rabbitmq_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_rabbitmq_channel }}" opencontent_elasticsearch_channel: "{{ .Values.ibm_cp4d_services_base.opencontent_elasticsearch_channel }}" + elasticsearch_install_plan: "{{ .Values.ibm_cp4d_services_base.elasticsearch_install_plan }}" {{- end }} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml index 30fd0ac4b..43748cd45 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml @@ -38,6 +38,7 @@ spec: db2_namespace: "{{ .Values.ibm_db2u.db2_namespace }}" ibm_entitlement_key: "{{ .Values.ibm_db2u.ibm_entitlement_key }}" db2_channel: "{{ .Values.ibm_db2u.db2_channel }}" + db2_install_plan: "{{ .Values.ibm_db2u.db2_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml index 1d2f40cb5..8d91dd41c 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml @@ -41,6 +41,7 @@ spec: cpd_service_scale_config: "{{ .Values.ibm_aiopenscale.cpd_service_scale_config }}" aiopenscale_version: "{{ .Values.ibm_aiopenscale.aiopenscale_version }}" aiopenscale_channel: "{{ .Values.ibm_aiopenscale.aiopenscale_channel }}" + aiopenscale_install_plan: "{{ .Values.ibm_aiopenscale.aiopenscale_install_plan }}" ccs_version: "{{ .Values.ibm_aiopenscale.ccs_version }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} diff --git a/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml index c9eec5518..65137b239 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml @@ -45,7 +45,8 @@ spec: cpd_service_scale_config: "{{ .Values.ibm_spark.cpd_service_scale_config }}" cpd_service_storage_class: "{{ .Values.ibm_spark.cpd_service_storage_class }}" spark_channel: "{{ .Values.ibm_spark.spark_channel }}" - spark_version: "{{ .Values.ibm_spark.spark_version }}" + spark_version: "{{ .Values.ibm_spark.spark_version }}" + spark_install_plan: "{{ .Values.ibm_spark.spark_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml index 80ed2c349..a8c4bbf26 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml @@ -47,8 +47,10 @@ spec: cpd_service_scale_config: "{{ .Values.ibm_spss.cpd_service_scale_config }}" spss_version: "{{ .Values.ibm_spss.spss_version }}" spss_channel: "{{ .Values.ibm_spss.spss_channel }}" + spss_install_plan: "{{ .Values.ibm_spss.spss_install_plan }}" ccs_version: "{{ .Values.ibm_spss.ccs_version }}" canvasbase_channel: "{{ .Values.ibm_spss.canvasbase_channel }}" + canvasbase_install_plan: "{{ .Values.ibm_spss.canvasbase_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml index e48619579..e837193a4 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml @@ -47,6 +47,7 @@ spec: cpd_service_storage_class: "{{ .Values.ibm_wml.cpd_service_storage_class }}" wml_channel: "{{ .Values.ibm_wml.wml_channel }}" wml_version: "{{ .Values.ibm_wml.wml_version }}" + wml_install_plan: "{{ .Values.ibm_wml.wml_install_plan }}" {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml index bd7e4edd0..686d886f7 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml @@ -47,6 +47,7 @@ spec: cpd_service_scale_config: "{{ .Values.ibm_wsl.cpd_service_scale_config }}" wsl_version: "{{ .Values.ibm_wsl.wsl_version }}" wsl_channel: "{{ .Values.ibm_wsl.wsl_channel }}" + wsl_install_plan: "{{ .Values.ibm_wsl.wsl_install_plan }}" ccs_version: "{{ .Values.ibm_wsl.ccs_version }}" datarefinery_version: "{{ .Values.ibm_wsl.datarefinery_version }}" ws_runtimes_version: "{{ .Values.ibm_wsl.ws_runtimes_version }}" diff --git a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml index 8bf579d39..30ecb6a6f 100644 --- a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml @@ -49,6 +49,7 @@ spec: mas_domain: "{{ .Values.ibm_mas_suite.mas_domain }}" mas_config_dir: "{{ .Values.ibm_mas_suite.mas_config_dir }}" mas_channel: "{{ .Values.ibm_mas_suite.mas_channel }}" + mas_install_plan: "{{ .Values.ibm_mas_suite.mas_install_plan }}" ibm_entitlement_key: "{{ .Values.ibm_mas_suite.ibm_entitlement_key }}" domain: "{{ .Values.ibm_mas_suite.domain }}" cert_manager_namespace: "{{ .Values.ibm_mas_suite.cert_manager_namespace }}" From b4ae77657885b661cc3582ccfa0eb4d7b7d241ed Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Fri, 27 Sep 2024 22:15:09 +0100 Subject: [PATCH 08/13] [patch] configurable install plan for apps --- .../templates/04-ibm-mas_Subscription.yaml | 2 +- .../templates/500-ibm-mas-masapp-manage-install.yaml | 1 + .../templates/510-ibm-mas-masapp-assist-install.yaml | 1 + .../templates/510-ibm-mas-masapp-iot-install.yaml | 1 + .../templates/510-ibm-mas-masapp-visualinspection-install.yaml | 1 + .../templates/520-ibm-mas-masapp-health-install.yaml | 1 + .../templates/520-ibm-mas-masapp-monitor-install.yaml | 1 + .../templates/520-ibm-mas-masapp-optimizer-install.yaml | 1 + .../templates/540-ibm-mas-masapp-predict-install.yaml | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml index 8b09b5900..b2694b4dc 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: Automatic + installPlanApproval: "{{ .Values.mas_app_install_plan }}" {{- if eq .Values.mas_app_id "health" }} name: ibm-mas-manage {{- else }} diff --git a/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml b/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml index 80cc4cfde..2d4c00d17 100644 --- a/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_manage_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_manage_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_manage_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_manage_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_manage_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_manage_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_manage_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml index c1921a167..75cdb498c 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_assist_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_assist_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_assist_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_assist_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_assist_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_assist_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_assist_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml index 73405a5c6..d330e152b 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_iot_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_iot_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_iot_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_iot_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_iot_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_iot_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_iot_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml index c690b84fe..c511938dd 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_visualinspection_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_visualinspection_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_visualinspection_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_visualinspection_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml index d1b7e7658..1bf6e2c15 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_health_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_health_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_health_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_health_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_health_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_health_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_health_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml index 0f2a11bd5..0fcdc6306 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_monitor_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_monitor_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_monitor_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_monitor_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_monitor_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_monitor_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_monitor_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml index 4d4e06c13..dad68ae09 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_optimizer_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_optimizer_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_optimizer_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_optimizer_install.mas_manual_cert_mgmt }} diff --git a/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml index ed7188a99..5f527aad5 100644 --- a/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml @@ -43,6 +43,7 @@ spec: mas_app_id: "{{ .Values.ibm_suite_app_predict_install.mas_app_id }}" mas_app_catalog_source: "{{ .Values.ibm_suite_app_predict_install.mas_app_catalog_source }}" mas_app_channel: "{{ .Values.ibm_suite_app_predict_install.mas_app_channel }}" + mas_app_install_plan: "{{ .Values.ibm_suite_app_predict_install.mas_app_install_plan }}" mas_edition: "{{ .Values.ibm_suite_app_predict_install.mas_edition }}" run_sync_hooks: {{ .Values.ibm_suite_app_predict_install.run_sync_hooks }} mas_manual_cert_mgmt: {{ .Values.ibm_suite_app_predict_install.mas_manual_cert_mgmt }} From a4dd1f07d39f830ddc15029c2142240ac1d1d18f Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 30 Sep 2024 11:46:57 +0100 Subject: [PATCH 09/13] [patch] added default install plan --- .../templates/02-cert-manager_Subscription.yaml | 2 +- .../020-ibm-dro/templates/03-imo_Subscription.yaml | 2 +- .../020-ibm-dro/templates/04-dro_Subscription.yaml | 2 +- .../templates/03-cis-compliance_Subscription.yaml | 2 +- .../050-nfd-operator/templates/02-nfd_Subcription.yaml | 2 +- .../templates/02-gpu_Subcription.yaml | 2 +- .../100-ibm-sls/templates/02-ibm-sls_Subscription.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 4 ++-- .../templates/06-ibm-cp4d_Subscription.yaml | 2 +- .../templates/09-ibm-cp4d_services_base.yaml | 8 ++++---- .../templates/09-ibm-cp4d_services_dependencies.yaml | 10 +++++----- .../templates/04-ibm-cs-control_prereqs_ops.yaml | 2 +- .../110-ibm-db2u/templates/03-db2_Subscription.yaml | 2 +- .../templates/00-ibm-aiopenscale_Subscription.yaml | 2 +- .../templates/01-ibm-spark_Subscription.yaml | 2 +- .../templates/00-ibm-spss_Subscription.yaml | 4 ++-- .../120-ibm-wml/templates/01-ibm-wml_Subscription.yaml | 2 +- .../120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml | 2 +- .../templates/02-ibm-mas_Subscription.yaml | 2 +- .../templates/04-ibm-mas_Subscription.yaml | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 3d034330f..0b6c1f248 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: {{ .Values.cert_manager_install_plan }} + installPlanApproval: "{{ .Values.cert_manager_install_plan | default('Automatic') }}" name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml index e819ef4f4..ef9f5135b 100644 --- a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: {{ .Values.imo_install_plan }} + installPlanApproval: "{{ .Values.imo_install_plan | default('Automatic') }}" name: ibm-metrics-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml index 016cacde8..19518dd56 100644 --- a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: {{ .Values.dro_install_plan }} + installPlanApproval: "{{ .Values.dro_install_plan | default('Automatic') }}" name: ibm-data-reporter-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml index 778087b2f..561a90c41 100644 --- a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml +++ b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml @@ -14,7 +14,7 @@ metadata: spec: channel: stable name: compliance-operator - installPlanApproval: {{ .Values.cis_install_plan }} + installPlanApproval: "{{ .Values.cis_install_plan | default('Automatic') }}" source: redhat-operators sourceNamespace: openshift-marketplace config: diff --git a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml index adb061933..3bf701980 100644 --- a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml +++ b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.nfd_channel }}" - installPlanApproval: {{ .Values.nfd_install_plan }} + installPlanApproval: "{{ .Values.nfd_install_plan | default('Automatic') }}" name: nfd source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml index b8dcbab95..c7e783f84 100644 --- a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml +++ b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.gpu_channel }}" - installPlanApproval: {{ .Values.gpu_install_plan }} + installPlanApproval: "{{ .Values.gpu_install_plan | default('Automatic') }}" name: gpu-operator-certified source: certified-operators sourceNamespace: openshift-marketplace diff --git a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml index 52e0572e4..f3a6553c3 100644 --- a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml +++ b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.sls_channel }}" - installPlanApproval: {{ .Values.sls_install_plan }} + installPlanApproval: "{{ .Values.sls_install_plan | default('Automatic') }}" name: ibm-sls source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index a9430260b..e22b6211d 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.namespace_scope_channel }}" - installPlanApproval: "{{ .Values.namespace_scope_install_plan }}" + installPlanApproval: "{{ .Values.namespace_scope_install_plan | default('Automatic') }}" name: ibm-namespace-scope-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" @@ -60,7 +60,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpfs_channel }}" - installPlanApproval: "{{ .Values.cpfs_install_plan }}" + installPlanApproval: "{{ .Values.cpfs_install_plan | default('Automatic') }}" name: ibm-common-service-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml index 4ade931fa..bc825bb9e 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_platform_channel }}" - installPlanApproval: "{{ .Values.cpd_platform_install_plan }}" + installPlanApproval: "{{ .Values.cpd_platform_install_plan | default('Automatic') }}" name: cpd-platform-operator source: cpd-platform sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index bd7c8ffb5..c8e7c96a2 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -102,7 +102,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic') }}" name: ibm-cpd-ccs source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -121,7 +121,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic') }}" name: ibm-cpd-datarefinery source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -140,7 +140,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic') }}" name: ibm-cpd-ws-runtimes source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -159,7 +159,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic') }}" name: ibm-elasticsearch-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml index b7cc70c4f..1c5ad7eee 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml @@ -17,7 +17,7 @@ metadata: spec: operators: - channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic') }}" name: ibm-cpd-ccs-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ccs @@ -40,7 +40,7 @@ metadata: spec: operators: - channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic') }}" name: ibm-cpd-datarefinery-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-datarefinery @@ -63,7 +63,7 @@ metadata: spec: operators: - channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic') }}" name: ibm-cpd-ws-runtimes-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ws-runtimes @@ -86,7 +86,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_rabbitmq_channel }}" - installPlanApproval: "{{ .Values.rabbitmq_install_plan }}" + installPlanApproval: "{{ .Values.rabbitmq_install_plan | default('Automatic') }}" name: rabbitmq-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-rabbitmq-operator @@ -109,7 +109,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic') }}" name: elasticsearch-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-elasticsearch-operator diff --git a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml index 8fb5170e0..b43227e7a 100644 --- a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_ibm_licensing_channel }}" - installPlanApproval: "{{ .Values.cpd_licensing_install_plan }}" + installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default('Automatic') }}" name: ibm-licensing-operator-app source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml index c87002dce..ddd1e3343 100644 --- a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml +++ b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: {{ .Values.db2_channel }} - installPlanApproval: {{ .Values.db2_install_plan }} + installPlanApproval: "{{ .Values.db2_install_plan | default('Automatic') }}" name: db2u-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml index 16cccf3ff..f91b4236b 100644 --- a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml +++ b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.aiopenscale_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.aiopenscale_install_plan }} + installPlanApproval: "{{ .Values.aiopenscale_install_plan | default('Automatic') }}" diff --git a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml index 8cbd7ec9b..740a7f8f6 100644 --- a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml +++ b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml @@ -15,5 +15,5 @@ spec: channel: "{{ .Values.spark_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.spark_install_plan }} + installPlanApproval: "{{ .Values.spark_install_plan | default('Automatic') }}" diff --git a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml index a971fc828..a26bd77cd 100644 --- a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml +++ b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml @@ -15,7 +15,7 @@ spec: channel: "{{ .Values.spss_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.spss_install_plan }} + installPlanApproval: "{{ .Values.spss_install_plan | default('Automatic') }}" --- apiVersion: operators.coreos.com/v1alpha1 @@ -34,4 +34,4 @@ spec: channel: "{{ .Values.canvasbase_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.canvasbase_install_plan }} + installPlanApproval: "{{ .Values.canvasbase_install_plan | default('Automatic') }}" diff --git a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml index dbbe225bb..97d7e03ad 100644 --- a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml +++ b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wml_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.wml_install_plan }} + installPlanApproval: "{{ .Values.wml_install_plan | default('Automatic') }}" diff --git a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml index 1ffe6c026..920da40ab 100644 --- a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml +++ b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wsl_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: {{ .Values.wsl_install_plan }} + installPlanApproval: "{{ .Values.wsl_install_plan | default('Automatic') }}" diff --git a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml index cb781ea9e..282da0424 100644 --- a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_channel }}" - installPlanApproval: {{ .Values.mas_install_plan }} + installPlanApproval: "{{ .Values.mas_install_plan | default('Automatic') }}" name: ibm-mas source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml index b2694b4dc..e2838551b 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: "{{ .Values.mas_app_install_plan }}" + installPlanApproval: "{{ .Values.mas_app_install_plan | default('Automatic') }}" {{- if eq .Values.mas_app_id "health" }} name: ibm-mas-manage {{- else }} From feb5ef8f6115deb04dc89a633af0cc94c15e534f Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 30 Sep 2024 14:14:50 +0100 Subject: [PATCH 10/13] [patch] fix default --- .../templates/02-cert-manager_Subscription.yaml | 2 +- .../020-ibm-dro/templates/03-imo_Subscription.yaml | 2 +- .../020-ibm-dro/templates/04-dro_Subscription.yaml | 2 +- .../templates/03-cis-compliance_Subscription.yaml | 2 +- .../050-nfd-operator/templates/02-nfd_Subcription.yaml | 2 +- .../templates/02-gpu_Subcription.yaml | 2 +- .../100-ibm-sls/templates/02-ibm-sls_Subscription.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 4 ++-- .../templates/06-ibm-cp4d_Subscription.yaml | 2 +- .../templates/09-ibm-cp4d_services_base.yaml | 8 ++++---- .../templates/09-ibm-cp4d_services_dependencies.yaml | 10 +++++----- .../templates/04-ibm-cs-control_prereqs_ops.yaml | 2 +- .../110-ibm-db2u/templates/03-db2_Subscription.yaml | 2 +- .../templates/00-ibm-aiopenscale_Subscription.yaml | 2 +- .../templates/01-ibm-spark_Subscription.yaml | 2 +- .../templates/00-ibm-spss_Subscription.yaml | 4 ++-- .../120-ibm-wml/templates/01-ibm-wml_Subscription.yaml | 2 +- .../120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml | 2 +- .../templates/02-ibm-mas_Subscription.yaml | 2 +- .../templates/04-ibm-mas_Subscription.yaml | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 0b6c1f248..82c943647 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: "{{ .Values.cert_manager_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cert_manager_install_plan | default('Automatic', True) }}" name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml index ef9f5135b..9c8552fa3 100644 --- a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.imo_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.imo_install_plan | default('Automatic', True) }}" name: ibm-metrics-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml index 19518dd56..476ea78bb 100644 --- a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.dro_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.dro_install_plan | default('Automatic', True) }}" name: ibm-data-reporter-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml index 561a90c41..8049ea6f4 100644 --- a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml +++ b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml @@ -14,7 +14,7 @@ metadata: spec: channel: stable name: compliance-operator - installPlanApproval: "{{ .Values.cis_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cis_install_plan | default('Automatic', True) }}" source: redhat-operators sourceNamespace: openshift-marketplace config: diff --git a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml index 3bf701980..d5ce5a53f 100644 --- a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml +++ b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.nfd_channel }}" - installPlanApproval: "{{ .Values.nfd_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.nfd_install_plan | default('Automatic', True) }}" name: nfd source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml index c7e783f84..23320c080 100644 --- a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml +++ b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.gpu_channel }}" - installPlanApproval: "{{ .Values.gpu_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.gpu_install_plan | default('Automatic', True) }}" name: gpu-operator-certified source: certified-operators sourceNamespace: openshift-marketplace diff --git a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml index f3a6553c3..ea49e47e4 100644 --- a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml +++ b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.sls_channel }}" - installPlanApproval: "{{ .Values.sls_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.sls_install_plan | default('Automatic', True) }}" name: ibm-sls source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index e22b6211d..02b92ebd9 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.namespace_scope_channel }}" - installPlanApproval: "{{ .Values.namespace_scope_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.namespace_scope_install_plan | default('Automatic', True) }}" name: ibm-namespace-scope-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" @@ -60,7 +60,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpfs_channel }}" - installPlanApproval: "{{ .Values.cpfs_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpfs_install_plan | default('Automatic', True) }}" name: ibm-common-service-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml index bc825bb9e..617b01de2 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_platform_channel }}" - installPlanApproval: "{{ .Values.cpd_platform_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_platform_install_plan | default('Automatic', True) }}" name: cpd-platform-operator source: cpd-platform sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index c8e7c96a2..570ff6b57 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -102,7 +102,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic', True) }}" name: ibm-cpd-ccs source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -121,7 +121,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic', True) }}" name: ibm-cpd-datarefinery source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -140,7 +140,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic', True) }}" name: ibm-cpd-ws-runtimes source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -159,7 +159,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic', True) }}" name: ibm-elasticsearch-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml index 1c5ad7eee..1988953f5 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml @@ -17,7 +17,7 @@ metadata: spec: operators: - channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic', True) }}" name: ibm-cpd-ccs-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ccs @@ -40,7 +40,7 @@ metadata: spec: operators: - channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic', True) }}" name: ibm-cpd-datarefinery-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-datarefinery @@ -63,7 +63,7 @@ metadata: spec: operators: - channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic', True) }}" name: ibm-cpd-ws-runtimes-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ws-runtimes @@ -86,7 +86,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_rabbitmq_channel }}" - installPlanApproval: "{{ .Values.rabbitmq_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.rabbitmq_install_plan | default('Automatic', True) }}" name: rabbitmq-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-rabbitmq-operator @@ -109,7 +109,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic', True) }}" name: elasticsearch-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-elasticsearch-operator diff --git a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml index b43227e7a..85b4c1472 100644 --- a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_ibm_licensing_channel }}" - installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default('Automatic', True) }}" name: ibm-licensing-operator-app source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml index ddd1e3343..5aad7e160 100644 --- a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml +++ b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: {{ .Values.db2_channel }} - installPlanApproval: "{{ .Values.db2_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.db2_install_plan | default('Automatic', True) }}" name: db2u-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml index f91b4236b..ce89c8718 100644 --- a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml +++ b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.aiopenscale_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.aiopenscale_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.aiopenscale_install_plan | default('Automatic', True) }}" diff --git a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml index 740a7f8f6..950b78f02 100644 --- a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml +++ b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml @@ -15,5 +15,5 @@ spec: channel: "{{ .Values.spark_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spark_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.spark_install_plan | default('Automatic', True) }}" diff --git a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml index a26bd77cd..7f087a96f 100644 --- a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml +++ b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml @@ -15,7 +15,7 @@ spec: channel: "{{ .Values.spss_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spss_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.spss_install_plan | default('Automatic', True) }}" --- apiVersion: operators.coreos.com/v1alpha1 @@ -34,4 +34,4 @@ spec: channel: "{{ .Values.canvasbase_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.canvasbase_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.canvasbase_install_plan | default('Automatic', True) }}" diff --git a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml index 97d7e03ad..714cd5264 100644 --- a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml +++ b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wml_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wml_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.wml_install_plan | default('Automatic', True) }}" diff --git a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml index 920da40ab..102300488 100644 --- a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml +++ b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wsl_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wsl_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.wsl_install_plan | default('Automatic', True) }}" diff --git a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml index 282da0424..b7edb7ba5 100644 --- a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_channel }}" - installPlanApproval: "{{ .Values.mas_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.mas_install_plan | default('Automatic', True) }}" name: ibm-mas source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml index e2838551b..83bbdf9de 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: "{{ .Values.mas_app_install_plan | default('Automatic') }}" + installPlanApproval: "{{ .Values.mas_app_install_plan | default('Automatic', True) }}" {{- if eq .Values.mas_app_id "health" }} name: ibm-mas-manage {{- else }} From eb39249268772d2c52978ff4b0c65f8481120522 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 30 Sep 2024 14:29:41 +0100 Subject: [PATCH 11/13] [patch] fix --- .../templates/02-cert-manager_Subscription.yaml | 2 +- .../020-ibm-dro/templates/03-imo_Subscription.yaml | 2 +- .../020-ibm-dro/templates/04-dro_Subscription.yaml | 2 +- .../templates/03-cis-compliance_Subscription.yaml | 2 +- .../050-nfd-operator/templates/02-nfd_Subcription.yaml | 2 +- .../templates/02-gpu_Subcription.yaml | 2 +- .../100-ibm-sls/templates/02-ibm-sls_Subscription.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 4 ++-- .../templates/06-ibm-cp4d_Subscription.yaml | 2 +- .../templates/09-ibm-cp4d_services_base.yaml | 8 ++++---- .../templates/09-ibm-cp4d_services_dependencies.yaml | 10 +++++----- .../templates/04-ibm-cs-control_prereqs_ops.yaml | 2 +- .../110-ibm-db2u/templates/03-db2_Subscription.yaml | 2 +- .../templates/00-ibm-aiopenscale_Subscription.yaml | 2 +- .../templates/01-ibm-spark_Subscription.yaml | 2 +- .../templates/00-ibm-spss_Subscription.yaml | 4 ++-- .../120-ibm-wml/templates/01-ibm-wml_Subscription.yaml | 2 +- .../120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml | 2 +- .../templates/02-ibm-mas_Subscription.yaml | 2 +- .../templates/04-ibm-mas_Subscription.yaml | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 82c943647..583e65667 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: "{{ .Values.cert_manager_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cert_manager_install_plan | default "Automatic" | quote }}" name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml index 9c8552fa3..8d4b59af3 100644 --- a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.imo_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.imo_install_plan | default "Automatic" | quote }}" name: ibm-metrics-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml index 476ea78bb..924885081 100644 --- a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.dro_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.dro_install_plan | default "Automatic" | quote }}" name: ibm-data-reporter-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml index 8049ea6f4..2bd9ba25b 100644 --- a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml +++ b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml @@ -14,7 +14,7 @@ metadata: spec: channel: stable name: compliance-operator - installPlanApproval: "{{ .Values.cis_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cis_install_plan | default "Automatic" | quote }}" source: redhat-operators sourceNamespace: openshift-marketplace config: diff --git a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml index d5ce5a53f..5e24baf57 100644 --- a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml +++ b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.nfd_channel }}" - installPlanApproval: "{{ .Values.nfd_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.nfd_install_plan | default "Automatic" | quote }}" name: nfd source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml index 23320c080..a288177e9 100644 --- a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml +++ b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.gpu_channel }}" - installPlanApproval: "{{ .Values.gpu_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.gpu_install_plan | default "Automatic" | quote }}" name: gpu-operator-certified source: certified-operators sourceNamespace: openshift-marketplace diff --git a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml index ea49e47e4..191da3ae3 100644 --- a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml +++ b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.sls_channel }}" - installPlanApproval: "{{ .Values.sls_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.sls_install_plan | default "Automatic" | quote }}" name: ibm-sls source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index 02b92ebd9..8a760de18 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.namespace_scope_channel }}" - installPlanApproval: "{{ .Values.namespace_scope_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.namespace_scope_install_plan | default "Automatic" | quote }}" name: ibm-namespace-scope-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" @@ -60,7 +60,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpfs_channel }}" - installPlanApproval: "{{ .Values.cpfs_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpfs_install_plan | default "Automatic" | quote }}" name: ibm-common-service-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml index 617b01de2..7c81aed27 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_platform_channel }}" - installPlanApproval: "{{ .Values.cpd_platform_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_platform_install_plan | default "Automatic" | quote }}" name: cpd-platform-operator source: cpd-platform sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index 570ff6b57..db60f9ee4 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -102,7 +102,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }}" name: ibm-cpd-ccs source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -121,7 +121,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }}" name: ibm-cpd-datarefinery source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -140,7 +140,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default "Automatic" | quote }}" name: ibm-cpd-ws-runtimes source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -159,7 +159,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}" name: ibm-elasticsearch-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml index 1988953f5..827a0737a 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml @@ -17,7 +17,7 @@ metadata: spec: operators: - channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }}" name: ibm-cpd-ccs-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ccs @@ -40,7 +40,7 @@ metadata: spec: operators: - channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }}" name: ibm-cpd-datarefinery-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-datarefinery @@ -63,7 +63,7 @@ metadata: spec: operators: - channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_ws_install_plan | default "Automatic" | quote }}" name: ibm-cpd-ws-runtimes-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ws-runtimes @@ -86,7 +86,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_rabbitmq_channel }}" - installPlanApproval: "{{ .Values.rabbitmq_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.rabbitmq_install_plan | default "Automatic" | quote }}" name: rabbitmq-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-rabbitmq-operator @@ -109,7 +109,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}" name: elasticsearch-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-elasticsearch-operator diff --git a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml index 85b4c1472..babd4406b 100644 --- a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_ibm_licensing_channel }}" - installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default "Automatic" | quote }}" name: ibm-licensing-operator-app source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml index 5aad7e160..c651977e5 100644 --- a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml +++ b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: {{ .Values.db2_channel }} - installPlanApproval: "{{ .Values.db2_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.db2_install_plan | default "Automatic" | quote }}" name: db2u-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml index ce89c8718..50df791c4 100644 --- a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml +++ b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.aiopenscale_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.aiopenscale_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.aiopenscale_install_plan | default "Automatic" | quote }}" diff --git a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml index 950b78f02..830ee7ecc 100644 --- a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml +++ b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml @@ -15,5 +15,5 @@ spec: channel: "{{ .Values.spark_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spark_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.spark_install_plan | default "Automatic" | quote }}" diff --git a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml index 7f087a96f..b282cb32c 100644 --- a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml +++ b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml @@ -15,7 +15,7 @@ spec: channel: "{{ .Values.spss_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spss_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.spss_install_plan | default "Automatic" | quote }}" --- apiVersion: operators.coreos.com/v1alpha1 @@ -34,4 +34,4 @@ spec: channel: "{{ .Values.canvasbase_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.canvasbase_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.canvasbase_install_plan | default "Automatic" | quote }}" diff --git a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml index 714cd5264..c94bda5f2 100644 --- a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml +++ b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wml_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wml_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.wml_install_plan | default "Automatic" | quote }}" diff --git a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml index 102300488..1b75da663 100644 --- a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml +++ b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wsl_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wsl_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.wsl_install_plan | default "Automatic" | quote }}" diff --git a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml index b7edb7ba5..ca4e8f28b 100644 --- a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_channel }}" - installPlanApproval: "{{ .Values.mas_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.mas_install_plan | default "Automatic" | quote }}" name: ibm-mas source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml index 83bbdf9de..0a48dbfcf 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: "{{ .Values.mas_app_install_plan | default('Automatic', True) }}" + installPlanApproval: "{{ .Values.mas_app_install_plan | default "Automatic" | quote }}" {{- if eq .Values.mas_app_id "health" }} name: ibm-mas-manage {{- else }} From a4c91ab472340cc1a9c5f5b76eae209476a3a745 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Mon, 30 Sep 2024 14:33:33 +0100 Subject: [PATCH 12/13] [patch] --- .../templates/02-cert-manager_Subscription.yaml | 2 +- .../020-ibm-dro/templates/03-imo_Subscription.yaml | 2 +- .../020-ibm-dro/templates/04-dro_Subscription.yaml | 2 +- .../templates/03-cis-compliance_Subscription.yaml | 2 +- .../050-nfd-operator/templates/02-nfd_Subcription.yaml | 2 +- .../templates/02-gpu_Subcription.yaml | 2 +- .../100-ibm-sls/templates/02-ibm-sls_Subscription.yaml | 2 +- .../templates/04-ibm-cp4d_prereqs_ops.yaml | 4 ++-- .../templates/06-ibm-cp4d_Subscription.yaml | 2 +- .../templates/09-ibm-cp4d_services_base.yaml | 8 ++++---- .../templates/09-ibm-cp4d_services_dependencies.yaml | 10 +++++----- .../templates/04-ibm-cs-control_prereqs_ops.yaml | 2 +- .../110-ibm-db2u/templates/03-db2_Subscription.yaml | 2 +- .../templates/00-ibm-aiopenscale_Subscription.yaml | 2 +- .../templates/01-ibm-spark_Subscription.yaml | 2 +- .../templates/00-ibm-spss_Subscription.yaml | 4 ++-- .../120-ibm-wml/templates/01-ibm-wml_Subscription.yaml | 2 +- .../120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml | 2 +- .../templates/02-ibm-mas_Subscription.yaml | 2 +- .../templates/04-ibm-mas_Subscription.yaml | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 583e65667..6d72823f0 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: "{{ .Values.cert_manager_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cert_manager_install_plan | default "Automatic" | quote }} name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml index 8d4b59af3..02930c513 100644 --- a/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/03-imo_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.imo_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.imo_install_plan | default "Automatic" | quote }} name: ibm-metrics-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml index 924885081..fea6b95d3 100644 --- a/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml +++ b/cluster-applications/020-ibm-dro/templates/04-dro_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: stable - installPlanApproval: "{{ .Values.dro_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.dro_install_plan | default "Automatic" | quote }} name: ibm-data-reporter-operator source: certified-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml index 2bd9ba25b..eb52a6be2 100644 --- a/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml +++ b/cluster-applications/040-cis-compliance/templates/03-cis-compliance_Subscription.yaml @@ -14,7 +14,7 @@ metadata: spec: channel: stable name: compliance-operator - installPlanApproval: "{{ .Values.cis_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cis_install_plan | default "Automatic" | quote }} source: redhat-operators sourceNamespace: openshift-marketplace config: diff --git a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml index 5e24baf57..2d49abe74 100644 --- a/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml +++ b/cluster-applications/050-nfd-operator/templates/02-nfd_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.nfd_channel }}" - installPlanApproval: "{{ .Values.nfd_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.nfd_install_plan | default "Automatic" | quote }} name: nfd source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml index a288177e9..b59023402 100644 --- a/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml +++ b/cluster-applications/051-nvidia-gpu-operator/templates/02-gpu_Subcription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.gpu_channel }}" - installPlanApproval: "{{ .Values.gpu_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.gpu_install_plan | default "Automatic" | quote }} name: gpu-operator-certified source: certified-operators sourceNamespace: openshift-marketplace diff --git a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml index 191da3ae3..329576ce6 100644 --- a/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml +++ b/instance-applications/100-ibm-sls/templates/02-ibm-sls_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.sls_channel }}" - installPlanApproval: "{{ .Values.sls_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.sls_install_plan | default "Automatic" | quote }} name: ibm-sls source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml index 8a760de18..fa5255933 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_prereqs_ops.yaml @@ -14,7 +14,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.namespace_scope_channel }}" - installPlanApproval: "{{ .Values.namespace_scope_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.namespace_scope_install_plan | default "Automatic" | quote }} name: ibm-namespace-scope-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" @@ -60,7 +60,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpfs_channel }}" - installPlanApproval: "{{ .Values.cpfs_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpfs_install_plan | default "Automatic" | quote }} name: ibm-common-service-operator source: opencloud-operators sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml index 7c81aed27..7d74c862f 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/06-ibm-cp4d_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_platform_channel }}" - installPlanApproval: "{{ .Values.cpd_platform_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_platform_install_plan | default "Automatic" | quote }} name: cpd-platform-operator source: cpd-platform sourceNamespace: "{{ .Values.cpd_operators_namespace }}" diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml index db60f9ee4..8f4f34fdd 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_base.yaml @@ -102,7 +102,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }} name: ibm-cpd-ccs source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -121,7 +121,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }} name: ibm-cpd-datarefinery source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -140,7 +140,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_ws_install_plan | default "Automatic" | quote }} name: ibm-cpd-ws-runtimes source: ibm-operator-catalog sourceNamespace: openshift-marketplace @@ -159,7 +159,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.elasticsearch_install_plan | default "Automatic" | quote }} name: ibm-elasticsearch-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml index 827a0737a..d3e44c311 100644 --- a/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml +++ b/instance-applications/110-ibm-cp4d/templates/09-ibm-cp4d_services_dependencies.yaml @@ -17,7 +17,7 @@ metadata: spec: operators: - channel: "{{ .Values.ccs_channel }}" - installPlanApproval: "{{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_ccs_install_plan | default "Automatic" | quote }} name: ibm-cpd-ccs-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ccs @@ -40,7 +40,7 @@ metadata: spec: operators: - channel: "{{ .Values.datarefinery_channel }}" - installPlanApproval: "{{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_datarefinery_install_plan | default "Automatic" | quote }} name: ibm-cpd-datarefinery-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-datarefinery @@ -63,7 +63,7 @@ metadata: spec: operators: - channel: "{{ .Values.ws_runtimes_channel }}" - installPlanApproval: "{{ .Values.cpd_ws_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_ws_install_plan | default "Automatic" | quote }} name: ibm-cpd-ws-runtimes-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-cpd-ws-runtimes @@ -86,7 +86,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_rabbitmq_channel }}" - installPlanApproval: "{{ .Values.rabbitmq_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.rabbitmq_install_plan | default "Automatic" | quote }} name: rabbitmq-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-rabbitmq-operator @@ -109,7 +109,7 @@ metadata: spec: operators: - channel: "{{ .Values.opencontent_elasticsearch_channel }}" - installPlanApproval: "{{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.elasticsearch_install_plan | default "Automatic" | quote }} name: elasticsearch-operator namespace: "{{ .Values.cpd_operators_namespace }}" packageName: ibm-elasticsearch-operator diff --git a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml index babd4406b..5e173e80d 100644 --- a/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml +++ b/instance-applications/110-ibm-cs-control/templates/04-ibm-cs-control_prereqs_ops.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.cpd_ibm_licensing_channel }}" - installPlanApproval: "{{ .Values.cpd_licensing_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.cpd_licensing_install_plan | default "Automatic" | quote }} name: ibm-licensing-operator-app source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml index c651977e5..37db49f7c 100644 --- a/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml +++ b/instance-applications/110-ibm-db2u/templates/03-db2_Subscription.yaml @@ -12,7 +12,7 @@ metadata: {{- end }} spec: channel: {{ .Values.db2_channel }} - installPlanApproval: "{{ .Values.db2_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.db2_install_plan | default "Automatic" | quote }} name: db2u-operator source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml index 50df791c4..5e7137e30 100644 --- a/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml +++ b/instance-applications/120-ibm-aiopenscale/templates/00-ibm-aiopenscale_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.aiopenscale_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.aiopenscale_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.aiopenscale_install_plan | default "Automatic" | quote }} diff --git a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml index 830ee7ecc..c6c1b8086 100644 --- a/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml +++ b/instance-applications/120-ibm-spark/templates/01-ibm-spark_Subscription.yaml @@ -15,5 +15,5 @@ spec: channel: "{{ .Values.spark_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spark_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.spark_install_plan | default "Automatic" | quote }} diff --git a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml index b282cb32c..dcb608e85 100644 --- a/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml +++ b/instance-applications/120-ibm-spss/templates/00-ibm-spss_Subscription.yaml @@ -15,7 +15,7 @@ spec: channel: "{{ .Values.spss_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.spss_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.spss_install_plan | default "Automatic" | quote }} --- apiVersion: operators.coreos.com/v1alpha1 @@ -34,4 +34,4 @@ spec: channel: "{{ .Values.canvasbase_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.canvasbase_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.canvasbase_install_plan | default "Automatic" | quote }} diff --git a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml index c94bda5f2..53f91dea9 100644 --- a/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml +++ b/instance-applications/120-ibm-wml/templates/01-ibm-wml_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wml_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wml_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.wml_install_plan | default "Automatic" | quote }} diff --git a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml index 1b75da663..7155d51b0 100644 --- a/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml +++ b/instance-applications/120-ibm-wsl/templates/00-ibm-wsl_Subscription.yaml @@ -15,4 +15,4 @@ spec: channel: "{{ .Values.wsl_channel }}" source: ibm-operator-catalog sourceNamespace: openshift-marketplace - installPlanApproval: "{{ .Values.wsl_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.wsl_install_plan | default "Automatic" | quote }} diff --git a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml index ca4e8f28b..f4ec01755 100644 --- a/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/02-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_channel }}" - installPlanApproval: "{{ .Values.mas_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.mas_install_plan | default "Automatic" | quote }} name: ibm-mas source: ibm-operator-catalog sourceNamespace: openshift-marketplace diff --git a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml index 0a48dbfcf..ab0e801fb 100644 --- a/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml +++ b/instance-applications/500-540-ibm-mas-suite-app-install/templates/04-ibm-mas_Subscription.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: channel: "{{ .Values.mas_app_channel }}" - installPlanApproval: "{{ .Values.mas_app_install_plan | default "Automatic" | quote }}" + installPlanApproval: {{ .Values.mas_app_install_plan | default "Automatic" | quote }} {{- if eq .Values.mas_app_id "health" }} name: ibm-mas-manage {{- else }} From f368a04453c5da963ecbd9aa58efa493da8d4fd3 Mon Sep 17 00:00:00 2001 From: Sanjay Prabhakar Date: Thu, 3 Oct 2024 17:44:10 +0100 Subject: [PATCH 13/13] [patch] fix --- .../templates/02-cert-manager_Subscription.yaml | 2 +- example-config/dev/cluster1/redhat-cert-manager.yaml | 2 +- .../templates/010-ibm-redhat-cert-manager-app.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml index 6d72823f0..61275498b 100644 --- a/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml +++ b/cluster-applications/010-redhat-cert-manager/templates/02-cert-manager_Subscription.yaml @@ -14,7 +14,7 @@ metadata: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true spec: channel: {{ .Values.channel }} - installPlanApproval: {{ .Values.cert_manager_install_plan | default "Automatic" | quote }} + installPlanApproval: {{ .Values.redhat_cert_manager_install_plan | default "Automatic" | quote }} name: openshift-cert-manager-operator source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/example-config/dev/cluster1/redhat-cert-manager.yaml b/example-config/dev/cluster1/redhat-cert-manager.yaml index 74abbe07b..12ece2efa 100644 --- a/example-config/dev/cluster1/redhat-cert-manager.yaml +++ b/example-config/dev/cluster1/redhat-cert-manager.yaml @@ -3,4 +3,4 @@ merge-key: "dev/cluster1" redhat_cert_manager: run_sync_hooks: true channel: stable-v1 - cert_manager_install_plan: Automatic + redhat_cert_manager_install_plan: Automatic diff --git a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml index 5be592bd6..dc405e7e7 100644 --- a/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/010-ibm-redhat-cert-manager-app.yaml @@ -41,7 +41,7 @@ spec: sm_aws_secret_access_key: "{{ .Values.sm.aws_secret_access_key }}" channel: "{{ .Values.redhat_cert_manager.channel }}" run_sync_hooks: {{ .Values.redhat_cert_manager.run_sync_hooks }} - cert_manager_install_plan: "{{ .Values.redhat_cert_manager.cert_manager_install_plan }}" + redhat_cert_manager_install_plan: "{{ .Values.redhat_cert_manager.redhat_cert_manager_install_plan }}" junitreporter: reporter_name: "redhat-cert-manager" cluster_id: "{{ .Values.cluster.id }}"