diff --git a/templates/decapod-apps/remove-lma-uniformed-wftpl.yaml b/templates/decapod-apps/remove-lma-uniformed-wftpl.yaml index 352620d..068d880 100644 --- a/templates/decapod-apps/remove-lma-uniformed-wftpl.yaml +++ b/templates/decapod-apps/remove-lma-uniformed-wftpl.yaml @@ -97,7 +97,7 @@ spec: kube_params="" if [[ -n "{{workflow.parameters.cluster_id}}" ]]; then - kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d) echo -e "kube_secret:\n$kube_secret" | head -n 5 cat <<< "$kube_secret" > /etc/kubeconfig @@ -124,7 +124,7 @@ spec: kube_params="" if [[ -n "{{workflow.parameters.cluster_id}}" ]]; then - kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d) echo -e "kube_secret:\n$kube_secret" | head -n 5 cat <<< "$kube_secret" > /etc/kubeconfig @@ -152,7 +152,7 @@ spec: CLUSTER_ID={{workflow.parameters.cluster_id}} kube_params="" if [[ -n "{{workflow.parameters.cluster_id}}" ]]; then - kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n ${CLUSTER_ID} ${CLUSTER_ID}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d) cat <<< "$kube_secret" > /etc/kubeconfig kube_params+="--kubeconfig=/etc/kubeconfig" diff --git a/templates/decapod-apps/remove-servicemesh-all-es-wftpl.yaml b/templates/decapod-apps/remove-servicemesh-all-es-wftpl.yaml index 539e664..c013bb9 100644 --- a/templates/decapod-apps/remove-servicemesh-all-es-wftpl.yaml +++ b/templates/decapod-apps/remove-servicemesh-all-es-wftpl.yaml @@ -90,7 +90,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d) echo -e "kube_secret:\n$kube_secret" | head -n 5 cat <<< "$kube_secret" > /etc/kubeconfig @@ -158,7 +158,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" @@ -196,7 +196,7 @@ spec: - | 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" @@ -292,7 +292,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" diff --git a/templates/decapod-apps/remove-servicemesh-all-wftpl.yaml b/templates/decapod-apps/remove-servicemesh-all-wftpl.yaml index 059605d..4129f68 100644 --- a/templates/decapod-apps/remove-servicemesh-all-wftpl.yaml +++ b/templates/decapod-apps/remove-servicemesh-all-wftpl.yaml @@ -81,7 +81,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d) echo -e "kube_secret:\n$kube_secret" | head -n 5 cat <<< "$kube_secret" > /etc/kubeconfig @@ -149,7 +149,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" @@ -187,7 +187,7 @@ spec: - | 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" @@ -283,7 +283,7 @@ spec: 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) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" diff --git a/templates/decapod-apps/service-mesh-es-wf.yaml b/templates/decapod-apps/service-mesh-es-wf.yaml index 46e69b7..d9df74b 100644 --- a/templates/decapod-apps/service-mesh-es-wf.yaml +++ b/templates/decapod-apps/service-mesh-es-wf.yaml @@ -209,7 +209,7 @@ spec: CLUSTER_ID={{workflow.parameters.cluster_id}} kube_params="" if [[ -n "${CLUSTER_ID}" ]]; then - kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" @@ -269,7 +269,7 @@ spec: CLUSTER_ID={{workflow.parameters.cluster_id}} kube_params="" if [[ -n "${CLUSTER_ID}" ]]; then - kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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" diff --git a/templates/decapod-apps/service-mesh-wf.yaml b/templates/decapod-apps/service-mesh-wf.yaml index 6dcad87..d28b01a 100644 --- a/templates/decapod-apps/service-mesh-wf.yaml +++ b/templates/decapod-apps/service-mesh-wf.yaml @@ -205,7 +205,7 @@ spec: CLUSTER_ID={{workflow.parameters.cluster_id}} kube_params="" if [[ -n "${CLUSTER_ID}" ]]; then - kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-kubeconfig -o jsonpath="{.data.value}" | base64 -d) + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.cluster_id}}-tks-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"