diff --git a/instance-applications/110-ibm-cp4d-operators/templates/02-ibm-cp4d_rbac.yaml b/instance-applications/110-ibm-cp4d-operators/templates/02-ibm-cp4d_rbac.yaml index 71a88054e..7b4545ff0 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/02-ibm-cp4d_rbac.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/02-ibm-cp4d_rbac.yaml @@ -232,6 +232,7 @@ rules: - get - list - patch + - watch - create - delete apiGroups: diff --git a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml index ae024faa3..a7b19199c 100644 --- a/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml +++ b/instance-applications/110-ibm-cp4d-operators/templates/04-ibm-cp4d_upg_cleanup.yaml @@ -228,7 +228,7 @@ spec: if [[ $COMP_ZEN != 0 ]]; then echo "Updating Zen operator subscription channel from ${CURRENT_ZEN_SUB_CHANNEL} to ${EXPECTED_ZEN_SUB_CHANNEL}" - oc patch Subscription ibm-zen-operator -n ${CPD_OPERATORS_NAMESPACE} -p '{"spec":{ "channel":"$EXPECTED_ZEN_SUB_CHANNEL"}}' + oc patch --type='merge' Subscription ibm-zen-operator -n ${CPD_OPERATORS_NAMESPACE} -p '{"spec":{ "channel":"'"$EXPECTED_ZEN_SUB_CHANNEL"'"}}' fi else echo "Zen Operator is not installed. Nothing to do here. Proceeding..." diff --git a/instance-applications/110-ibm-cs-control/templates/03-ibm-cs-control_OperatorGroup.yaml b/instance-applications/110-ibm-cs-control/templates/03-ibm-cs-control_OperatorGroup.yaml index bf33606f3..a261998ef 100644 --- a/instance-applications/110-ibm-cs-control/templates/03-ibm-cs-control_OperatorGroup.yaml +++ b/instance-applications/110-ibm-cs-control/templates/03-ibm-cs-control_OperatorGroup.yaml @@ -13,5 +13,4 @@ metadata: spec: targetNamespaces: - "{{ .Values.cpd_cs_control_namespace }}" - - "{{ .Values.cpd_instance_namespace }}" upgradeStrategy: Default 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 551429335..7b5f93e58 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 @@ -25,6 +25,10 @@ spec: kind: IBMLicensing jsonPointers: - /spec/version + - group: 'operators.coreos.com' + kind: OperatorGroup + jsonPointers: + - /spec/targetNamespaces project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }}