[patch] updates for custom labels

ibm-mas · May 13, 2024 · 66d189d · 66d189d
1 parent 6c40d7b
commit 66d189d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2 b/...cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-mas-instance-base.yaml.j2
@@ -19,5 +19,5 @@ sm:
 
 {%- if CUSTOM_LABELS is defined and CUSTOM_LABELS !='' %}
 custom_labels:
-{{ CUSTOM_LABELS | indent(2) }}
+  {{ CUSTOM_LABELS | indent(2) }}
 {%- endif %}
diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2
@@ -9,14 +9,15 @@ region:
 cluster:
   id: {{ CLUSTER_ID }}
   url: {{ CLUSTER_URL }}
-{%- if CUSTOM_LABELS is defined and CUSTOM_LABELS !='' %}
-custom_labels:
-{{ CUSTOM_LABELS | indent(2) }}
-{%- endif %}
 
 sm:
   aws_access_key_id: "<path:{{ SECRETS_PATH }}:{{ACCOUNT_ID}}/{{CLUSTER_ID}}/aws#sm_aws_access_key_id>"
   aws_secret_access_key: "<path:{{ SECRETS_PATH }}:{{ACCOUNT_ID}}/{{CLUSTER_ID}}/aws#sm_aws_secret_access_key>"
 
 notifications:
   slack_channel_id: {{ SLACK_CHANNEL_ID }}
+
+{%- if CUSTOM_LABELS is defined and CUSTOM_LABELS !='' %}
+custom_labels:
+  {{ CUSTOM_LABELS | indent(2) }}
+{%- endif %}