Merge pull request #246 from openinfradev/lma

bugfix: fix a volume name, namespace and so on.
openinfradev · Aug 16, 2023 · 1f5a6de · 1f5a6de
2 parents afdc228 + 72b5bc1
commit 1f5a6de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/deploy_apps/tks-primary-cluster.yaml b/deploy_apps/tks-primary-cluster.yaml
@@ -911,11 +911,13 @@ spec:
         kubectl --kubeconfig /kube/value get secret -n ${cluster_id} ${cluster_id}-tks-kubeconfig -o jsonpath="{.data.value}" | base64 -d > ~/kubeconfig
         export KUBECONFIG=~/kubeconfig
 
+        kubectl delete job -n lma empty-buckets-before-delete-them --ignore-not-found=true
         cat <<EOF | kubectl apply -f -
         apiVersion: batch/v1
         kind: Job
         metadata:
           name: empty-buckets-before-delete-them
+          namespace: lma
           annotations:
             "helm.sh/hook": pre-delete
             "helm.sh/hook-delete-policy": hook-succeeded
@@ -939,12 +941,12 @@ spec:
           backoffLimit: 4
         EOF
 
-        while [ $(kubectl get job empty-buckets-before-delete-them -o jsonpath='{.status.conditions[0].type}'|wc -c) -eq 0 ]; do
+        while [ $(kubectl get -n lma job empty-buckets-before-delete-them -o jsonpath='{.status.conditions[0].type}'|wc -c) -eq 0 ]; do
           echo "A job is not completed. wait 10 seconds...."
           sleep 10
         done
 
-        if [ $(kubectl get job empty-buckets-before-delete-them -o jsonpath='{.status.conditions[0].type}') = "Complete" ]; then
+        if [ $(kubectl get -n lma job empty-buckets-before-delete-them -o jsonpath='{.status.conditions[0].type}') = "Complete" ]; then
           exit 0
         else
           exit -1
@@ -957,7 +959,7 @@ spec:
       - name: cluster_id
         value: "{{workflow.parameters.cluster_id}}"
       volumeMounts:
-      - name: config
+      - name: kubeconfig-adm
         mountPath: "/kube"
 
     activeDeadlineSeconds: 120

diff --git a/deploy_apps/tks-remove-lma-federation-wftpl.yaml b/deploy_apps/tks-remove-lma-federation-wftpl.yaml
@@ -70,6 +70,8 @@ spec:
           - name: app_name
             value: "{{workflow.parameters.cluster_id}}-loki"
         when: "{{steps.get-clusters-in-contract.outputs.parameters.primary_cluster}} == {{workflow.parameters.cluster_id}}"
+        continueOn:
+          failed: true
 
     - - name: remove-objects-in-buckets
         templateRef: