[minor] Make install plan configurable for all subscriptions in gitops

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.redhat_cert_manager_install_plan | default "Automatic" | quote }}
   name: openshift-cert-manager-operator
   source: redhat-operators
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
   name: ibm-metrics-operator
   source: certified-operators
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
   name: ibm-data-reporter-operator
   source: certified-operators
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
   source: redhat-operators
   sourceNamespace: openshift-marketplace
   config:

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 | default "Automatic" | quote }}
   name: nfd
   source: redhat-operators
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
   name: gpu-operator-certified
   source: certified-operators
   sourceNamespace: openshift-marketplace

example-config/dev/cluster1/ibm-dro.yaml

@@ -4,3 +4,5 @@ ibm_dro:
     dro_namespace: ibm-software-central
     ibm_entitlement_key: "<path:arn:aws:secretsmanager:us-east-1:xxxxxxxxxxxx:secret:dev/cluster1/ibm_entitlement#entitlement_key>"
     run_sync_hooks: true
+    imo_install_plan: Automatic
+    dro_install_plan: Automatic

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: <path:arn:aws:secretsmanager:us-east-1:xxxxxxxxxxxx:secret:dev/cluster1/db2_default_channel#db2_default_channel>
 

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

example-config/dev/cluster1/instance1/ibm-sls.yaml

@@ -4,6 +4,7 @@ ibm_sls:
   sls_channel: 3.x
   sls_entitlement_file: <path:arn:aws:secretsmanager:us-east-1:xxxxxxxxxxxx:secret:dev/cluster1/instance1/license#license_file>
   ibm_entitlement_key: <path:arn:aws:secretsmanager:us-east-1:xxxxxxxxxxxx:secret:dev/cluster1/ibm_entitlement#image_pull_secret_b64>
+  sls_install_plan: Automatic
 
   # aws docdb
   mongodb_provider: "aws"

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
+   redhat_cert_manager_install_plan: Automatic

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 | default "Automatic" | quote }}
   name: ibm-sls
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

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 | 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: Automatic
+  installPlanApproval: {{ .Values.cpfs_install_plan | default "Automatic" | quote }}
   name: ibm-common-service-operator
   source: opencloud-operators
   sourceNamespace: "{{ .Values.cpd_operators_namespace }}"

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 | default "Automatic" | quote }}
   name: cpd-platform-operator
   source: cpd-platform
   sourceNamespace: "{{ .Values.cpd_operators_namespace }}"

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 | 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: Automatic
+  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: Automatic
+  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: Automatic
+  installPlanApproval: {{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}
   name: ibm-elasticsearch-operator
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

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 | 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: Automatic
+      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: Automatic
+      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: Automatic
+      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: Automatic
+      installPlanApproval: {{ .Values.elasticsearch_install_plan | default "Automatic" | quote }}
       name: elasticsearch-operator
       namespace: "{{ .Values.cpd_operators_namespace }}"
       packageName: ibm-elasticsearch-operator

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 | default "Automatic" | quote }}
   name: ibm-licensing-operator-app
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
   name: db2u-operator
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}

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 | default "Automatic" | quote }}
 

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 | 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: Automatic
+  installPlanApproval: {{ .Values.canvasbase_install_plan | default "Automatic" | quote }}

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 | default "Automatic" | quote }}

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 | default "Automatic" | quote }}

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 | default "Automatic" | quote }}
   name: ibm-mas
   source: ibm-operator-catalog
   sourceNamespace: openshift-marketplace

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 | default "Automatic" | quote }}
 {{- if eq .Values.mas_app_id "health" }}
   name: ibm-mas-manage
 {{- else }}

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 }}
+            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 }}"

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 }}"
             junitreporter:
               reporter_name: "ibm-dro"
               cluster_id: "{{ .Values.cluster.id }}"

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 }}"
             junitreporter:
               reporter_name: "cis-compliance"
               cluster_id: "{{ .Values.cluster.id }}"

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 }}"
             junitreporter:
               reporter_name: "nfd-operator"
               cluster_id: "{{ .Values.cluster.id }}"

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 }}"
             junitreporter:
               reporter_name: "nvdia-gpu-operator"
               cluster_id: "{{ .Values.cluster.id }}"

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 }}

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 }}

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 }}