diff --git a/example-config/dev/cluster1/instance1/ibm-mas-instance-base.yaml b/example-config/dev/cluster1/instance1/ibm-mas-instance-base.yaml index 86d09dd2a..90fd59c27 100644 --- a/example-config/dev/cluster1/instance1/ibm-mas-instance-base.yaml +++ b/example-config/dev/cluster1/instance1/ibm-mas-instance-base.yaml @@ -16,3 +16,13 @@ instance: sm: aws_access_key_id: "" aws_secret_access_key: "" + +# Additional Resources Configuration Example +additional_resources: + instances: + - name: instance-name-1 + cost: 100 + reasonCode: 101 + - name: instance-name-2 + cost: 250 + reasonCode: 102 diff --git a/instance-applications/130-ibm-mas-suite/templates/01-postdelete-crs-resources.yaml b/instance-applications/130-ibm-mas-suite/templates/01-postdelete-crs-resources.yaml index d9c738747..2b58bb336 100644 --- a/instance-applications/130-ibm-mas-suite/templates/01-postdelete-crs-resources.yaml +++ b/instance-applications/130-ibm-mas-suite/templates/01-postdelete-crs-resources.yaml @@ -63,6 +63,15 @@ rules: - "config.mas.ibm.com" resources: - "*" + - verbs: + - delete + - get + - list + - watch + apiGroups: + - addons.mas.ibm.com + resources: + - genericaddons --- kind: ServiceAccount diff --git a/instance-applications/550-ibm-mas-addons-config/templates/08-additional-resources-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/08-additional-resources-cr.yaml new file mode 100644 index 000000000..846febca9 --- /dev/null +++ b/instance-applications/550-ibm-mas-addons-config/templates/08-additional-resources-cr.yaml @@ -0,0 +1,31 @@ +{{- if .Values.additional_resources }} +--- +apiVersion: addons.mas.ibm.com/v1 +kind: GenericAddon +metadata: + name: "{{ .Values.instance_id }}-addons-additional-resources" + namespace: mas-{{ .Values.instance_id }}-core + annotations: + argocd.argoproj.io/sync-wave: "559" + labels: + mas.ibm.com/configScope: system + mas.ibm.com/instanceId: {{ .Values.instance_id }} +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + displayName: "{{ .Values.instance_id }}-AdditionalResources" + addonType: additional-resources + config: + addonIdentifier: {{ .Values.instance_id }} + instances: +{{- if .Values.additional_resources.instances }} +{{- range .Values.additional_resources.instances }} + - name: {{ .name }} + cost: {{ .cost }} + reasonCode: {{ .reasonCode }} +{{- end }} +{{- else }} + [] +{{- end }} +{{- end }} diff --git a/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml new file mode 100644 index 000000000..fa4f74ddd --- /dev/null +++ b/instance-applications/550-ibm-mas-addons-config/templates/postdelete-delete-cr.yaml @@ -0,0 +1,110 @@ +{{- if .Values.use_postdelete_hooks }} + +{{- /* +Use the build/bin/set-cli-image-digest.sh script to update this value across all charts. +*/}} +{{- $_cli_image_digest := "sha256:55b5d6dd185503f14c112836a9a4899347d28e7b6545e0b9cf21d87f9526fb40" }} + +{{- $_addon_type := "additional-resources" }} +{{- $_addon_cr_name := printf "%s-addons-%s" .Values.instance_id $_addon_type }} + +{{ $job_name := printf "postdelete-delete-cr-job-%s" $_addon_cr_name }} + +# NOTE: depends on resources created in ibm-mas-suite chart (01-postdelete-crs-resources) +# The values below must align with the values in that file +{{ $role_name := "postdelete-delete-cr-r" }} +{{ $sa_name := "postdelete-delete-cr-sa" }} +{{ $rb_name := "postdelete-delete-cr-rb" }} +{{ $np_name := "postdelete-delete-cr-np" }} +{{ $job_label := "postdelete-delete-cr-job" }} +{{ $ns := printf "mas-%s-core" .Values.instance_id }} + +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ $job_name }} + namespace: {{ $ns }} + annotations: + argocd.argoproj.io/hook: PostDelete + argocd.argoproj.io/hook-delete-policy: BeforeHookCreation +{{- if .Values.custom_labels }} + labels: +{{ .Values.custom_labels | toYaml | indent 4 }} +{{- end }} +spec: + ttlSecondsAfterFinished: 300 + template: + metadata: + labels: + app: {{ $job_label }} +{{- if .Values.custom_labels }} +{{ .Values.custom_labels | toYaml | indent 8 }} +{{- end }} + spec: + containers: + - name: run + image: {{ .Values.cli_image_repo | default "quay.io/ibmmas/cli" }}@{{ $_cli_image_digest }} + imagePullPolicy: IfNotPresent + resources: + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 10m + memory: 64Mi + env: + - name: CR_NAMESPACE + value: {{ $ns }} + - name: CR_NAME + value: {{ $_addon_cr_name }} + - name: CR_API_VERSION + value: addons.mas.ibm.com/v1 + - name: CR_KIND + value: GenericAddon + command: + - /bin/sh + - -c + - | + set -e + function delete_oc_resource(){ + RESOURCE=$1 + NAMESPACE=$2 + echo + echo "------------------------------------------------------------------" + echo "Check if resource $RESOURCE is present in namespace $NAMESPACE " + # don't want a non-zero rc from oc delete to cause the job to fail + # so, temporarily set +e + set +e + RESOURCE_NAME=$(oc get $RESOURCE -n $NAMESPACE -o=jsonpath="{.metadata.name}") + set -e + if [[ -z "${RESOURCE_NAME}" ]]; then + echo "$RESOURCE not found, skipping" + return 0 + fi + echo "oc delete resource $RESOURCE in namespace $NAMESPACE " + # don't want a non-zero rc from oc delete to cause the job to fail (since we then want to try patching out the finalizers) + # so, temporarily set +e + set +e + oc delete $RESOURCE -n $NAMESPACE --timeout=300s --wait=true + return_code=$? + set -e + echo "Verify that resource $RESOURCE is now absent in namespace $NAMESPACE " + # don't want a non-zero rc from oc delete to cause the job to fail + # so, temporarily set +e + set +e + RESOURCE_NAME=$(oc get $RESOURCE -n $NAMESPACE -o=jsonpath="{.metadata.name}") + set -e + if [[ -n "${RESOURCE_NAME}" ]]; then + echo "$RESOURCE still present, failing job" + exit 1 + fi + echo "... verified" + return 0 + + } + delete_oc_resource "${CR_KIND} ${CR_NAME}" "${CR_NAMESPACE}" + restartPolicy: Never + serviceAccountName: {{ $sa_name }} + backoffLimit: 4 +{{- end }} diff --git a/root-applications/ibm-aiservice-instance-root/templates/030-ibm-odh-app.yaml b/root-applications/ibm-aiservice-instance-root/templates/030-ibm-odh-app.yaml index 43274385b..53dc597b1 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/030-ibm-odh-app.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/030-ibm-odh-app.yaml @@ -107,9 +107,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml index d58f78ab0..3ca3d05d3 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml @@ -114,9 +114,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml index d58d9dc4d..a7c440c3a 100644 --- a/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml +++ b/root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml @@ -106,6 +106,7 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + - ServerSideApply=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml index d91304cac..32e061f39 100644 --- a/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml +++ b/root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml @@ -117,9 +117,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml index a15a55fe7..6e97e8d6f 100644 --- a/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml +++ b/root-applications/ibm-mas-account-root/templates/000-cluster-appset.yaml @@ -177,3 +177,4 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + - ServerSideApply=true 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 7a227d2e7..3d50a38c5 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 @@ -70,9 +70,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 fefce35dc..18410b928 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 @@ -84,9 +84,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 2fc399724..77f3fff5a 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 @@ -63,9 +63,9 @@ spec: - CreateNamespace=true - RespectIgnoreDifferences=true - Validate=false +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 a955b3422..099144fbb 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 @@ -64,9 +64,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 6dfd75dce..f4e2215f9 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 @@ -64,9 +64,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml index 370dcff1d..d9cc0a274 100644 --- a/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/052-group-sync-operator-app.yaml @@ -63,9 +63,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/053-falcon-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/053-falcon-operator-app.yaml index 28c9161c3..8c8eae771 100644 --- a/root-applications/ibm-mas-cluster-root/templates/053-falcon-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/053-falcon-operator-app.yaml @@ -62,9 +62,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml index 657f2586a..1bded0b82 100644 --- a/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/054-cluster-logging-operator-app.yaml @@ -70,9 +70,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml b/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml index 04f83318f..bde627f8e 100644 --- a/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/055-instana-agent-operator-app.yaml @@ -75,9 +75,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml b/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml index dbceb2e1c..dffac4133 100644 --- a/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/060-selenium-grid.yaml @@ -43,9 +43,9 @@ spec: syncOptions: - CreateNamespace=true - ServerSideApply=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml index 8fd78c143..55abbc006 100644 --- a/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/065-sls-appset.yaml @@ -97,6 +97,7 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + - ServerSideApply=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml index bc0bea47a..34832b9d8 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-aiservice-instance-appset.yaml @@ -111,6 +111,7 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + - ServerSideApply=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml index 5f985a8b5..1eb300c85 100644 --- a/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/099-instance-appset.yaml @@ -225,6 +225,7 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true + - ServerSideApply=true retry: limit: -1 ignoreDifferences: diff --git a/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml b/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml index e3183cb4e..aa09fc72c 100644 --- a/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/200-cluster-promotion-app.yaml @@ -79,9 +79,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file diff --git a/root-applications/ibm-mas-cluster-root/templates/300-mas-provisioner-app.yaml b/root-applications/ibm-mas-cluster-root/templates/300-mas-provisioner-app.yaml index d752a90b0..5260c66b4 100644 --- a/root-applications/ibm-mas-cluster-root/templates/300-mas-provisioner-app.yaml +++ b/root-applications/ibm-mas-cluster-root/templates/300-mas-provisioner-app.yaml @@ -92,9 +92,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml b/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml index 84633466c..386785d48 100644 --- a/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml +++ b/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml @@ -113,9 +113,8 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true - - ServerSideApply=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- 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 1289c22ea..0b4f14552 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 @@ -95,9 +95,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 859d41fac..998526688 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 @@ -118,9 +118,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 18332b2b1..63d1576ec 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 @@ -111,9 +111,9 @@ spec: syncOptions: - CreateNamespace=false - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 7263f2949..551429335 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 @@ -114,9 +114,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 4c956bded..358211833 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 @@ -67,9 +67,9 @@ spec: limit: 20 syncOptions: - CreateNamespace=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} \ No newline at end of file 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 0a8a94369..bdbca4eb4 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 @@ -20,7 +20,6 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - ignoreDifferences: project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} 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 f5efba1ff..d39a48ddf 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 @@ -20,7 +20,6 @@ metadata: finalizers: - resources-finalizer.argocd.argoproj.io spec: - ignoreDifferences: project: "{{ .Values.argo.projects.apps }}" destination: server: {{ .Values.cluster.url }} 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 27be6e5d2..ed9c71b97 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 @@ -157,9 +157,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} ignoreDifferences: 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 0c7838f16..4b485050a 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 @@ -89,9 +89,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 7fb549799..5fdea022d 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-facilities-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-facilities-install.yaml index 732fdea03..12f13f636 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-facilities-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-facilities-install.yaml @@ -89,9 +89,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 251ff511d..6bbd856b1 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 d31379d8d..d89c31b21 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 @@ -90,9 +90,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 daa898506..2405dab38 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 3cbff518c..b5c7b5ed4 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 40e26f035..5d64b7331 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} 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 73679e2c1..01cf93e87 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 @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }} diff --git a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml index c971cbc6c..c54b96646 100644 --- a/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml +++ b/root-applications/ibm-mas-instance-root/templates/550-ibm-mas-addons-config.yaml @@ -1,4 +1,4 @@ -{{ if or (not (empty .Values.allow_list)) (.Values.enhanced_dr) (.Values.extensions) (.Values.additional_vpn) (.Values.application_configuration) (not (empty .Values.ibm_db2u_databases)) (.Values.cluster_nonshared) }} +{{ if or (not (empty .Values.allow_list)) (.Values.enhanced_dr) (.Values.extensions) (.Values.additional_vpn) (.Values.application_configuration) (not (empty .Values.ibm_db2u_databases)) (.Values.cluster_nonshared) (.Values.additional_resources) }} --- # IBM Maximo Operator Catalog apiVersion: argoproj.io/v1alpha1 @@ -20,6 +20,8 @@ metadata: argocd.argoproj.io/sync-options: PruneLast=true finalizers: - resources-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io + - post-delete-finalizer.argocd.argoproj.io/cleanup spec: project: "{{ .Values.argo.projects.apps }}" destination: @@ -44,6 +46,10 @@ spec: additional_vpn: {{ .Values.additional_vpn }} cluster_nonshared: {{ .Values.cluster_nonshared }} application_configuration: {{ .Values.application_configuration }} + use_postdelete_hooks: {{ .Values.use_postdelete_hooks | default true }} + {{- if .Values.additional_resources }} + additional_resources: {{ .Values.additional_resources | toYaml | nindent 14 }} + {{- end }} databases: {{- range $val := .Values.ibm_db2u_databases }} {{- if and (contains "sdb" $val.db2_instance_name) ($val.replica_db) }} @@ -80,4 +86,4 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true -{{ end }} \ No newline at end of file +{{ end }} diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml index 39e36fef7..0d84ab00f 100644 --- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml +++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml @@ -86,9 +86,9 @@ spec: syncOptions: - CreateNamespace=true - RespectIgnoreDifferences=true +{{- if .Values.custom_labels }} managedNamespaceMetadata: labels: -{{- if .Values.custom_labels }} {{ .Values.custom_labels | toYaml | indent 8 }} {{- end }} {{- end }}