Merge pull request #94 from seungkyua/20220707_reduce_cluster_id

[WIP] reduce cluster_id length
openinfradev · Jul 7, 2022 · 255bc82 · 255bc82
2 parents bf2ecc1 + b614e6a
commit 255bc82
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/templates/decapod-apps/service-mesh-wf.yaml b/templates/decapod-apps/service-mesh-wf.yaml
@@ -193,9 +193,11 @@ spec:
             echo "[$date] $level     $msg"
           }
 
+          CLUSTER_ID={{workflow.parameters.cluster_id}}
           kube_params=""
-          if [[ -n "{{workflow.parameters.cluster_id}}" ]]; then
-            kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-kubeconfig -o jsonpath="{.data.value}" | base64 -d)
+          if [[ -n "${CLUSTER_ID}" ]]; then
+            CLUSTER_ID=$(echo "${CLUSTER_ID:0:8}")
+            kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-kubeconfig -o jsonpath="{.data.value}" | base64 -d)
             echo -e "kube_secret:\n$kube_secret" | head -n 5
             cat <<< "$kube_secret" > /etc/kubeconfig
             kube_params+="--kubeconfig=/etc/kubeconfig"
@@ -252,9 +254,11 @@ spec:
             echo "[$date] $level     $msg"
           }
 
+          CLUSTER_ID={{workflow.parameters.cluster_id}}
           kube_params=""
-          if [[ -n "{{workflow.parameters.cluster_id}}" ]]; then
-            kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-kubeconfig -o jsonpath="{.data.value}" | base64 -d)
+          if [[ -n "${CLUSTER_ID}" ]]; then
+            CLUSTER_ID=$(echo "${CLUSTER_ID:0:8}")
+            kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-kubeconfig -o jsonpath="{.data.value}" | base64 -d)
             echo -e "kube_secret:\n$kube_secret" | head -n 5
             cat <<< "$kube_secret" > /etc/kubeconfig
             kube_params+="--kubeconfig=/etc/kubeconfig"