From dab69f85c993f20103f0f41c45b57955c9adef58 Mon Sep 17 00:00:00 2001 From: Robert Choi Date: Sun, 6 Mar 2022 16:38:57 +0900 Subject: [PATCH] fix kubeconfig and ns --- tks-cluster/remove-usercluster-wftpl.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tks-cluster/remove-usercluster-wftpl.yaml b/tks-cluster/remove-usercluster-wftpl.yaml index 30b33e34..05a08f88 100644 --- a/tks-cluster/remove-usercluster-wftpl.yaml +++ b/tks-cluster/remove-usercluster-wftpl.yaml @@ -38,7 +38,7 @@ spec: arguments: parameters: - name: target_namespace - value: "{{workflow.parameters.cluster_id}}" + value: "kube-system" - - name: deleteAddonsApp templateRef: @@ -128,9 +128,15 @@ spec: - /bin/bash - '-c' - | - kubectl get deployment -n ${TARGET_NAMESPACE} | grep calico-kube-controller + kube_secret=$(kubectl get secret -n {{workflow.parameters.cluster_id}} {{workflow.parameters.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" + + kubectl $kube_params get deployment -n ${TARGET_NAMESPACE} | grep calico-kube-controller if [[ $? =~ 0 ]]; then - kubectl delete deployment calico-kube-controllers -n ${TARGET_NAMESPACE} + kubectl $kube_params delete deployment calico-kube-controllers -n ${TARGET_NAMESPACE} else echo "Error: deployment 'calico-kube-controllers' was NOT found."