Merge pull request #355 from openinfradev/policy-serving

policy: bugfix to find policy namespace
openinfradev · Apr 17, 2024 · d8c4ab8 · d8c4ab8
2 parents 1ee619c + d6d7864
commit d8c4ab8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/tks-cluster/create-usercluster-wftpl.yaml b/tks-cluster/create-usercluster-wftpl.yaml
@@ -447,10 +447,15 @@ spec:
 
             ####### add tks info. on namespace ########
             kubectl label ns ${CLUSTER_ID} tks.io/organization=${CONTRACT_ID}
-            if [ $(kubectl get ns -l tks.io/organization=${CONTRACT_ID} -l tks.io/policy --ignore-not-found=true | grep -v NAME | awk '{print $1}' | wc -l ) -eq 0 ]; then
+            if [ $(kubectl get ns -l tks.io/organization=${CONTRACT_ID} --ignore-not-found=true | grep -v NAME | awk '{print $1}' | wc -l ) -le 1 ]; then
               kubectl label ns ${CLUSTER_ID} tks.io/policy=${CLUSTER_ID}
             else
-              kubectl label ns ${CLUSTER_ID} tks.io/policy=$(kubectl get ns $(kubectl get ns -l tks.io/organization=${CONTRACT_ID} -l tks.io/policy --ignore-not-found=true | grep -v NAME | awk '{print $1}' | head -n 1 )  --ignore-not-found=true -o jsonpath='{.metadata.labels.tks\.io\/policy}' )
+              POLICY_NS=$(kubectl get ns $(kubectl get ns -l tks.io/organization=${CONTRACT_ID} --ignore-not-found=true | grep -v NAME | awk '{print $1}' | head -n 1 )  --ignore-not-found=true -o jsonpath='{.metadata.labels.tks\.io\/policy}' )
+              if [ -z "$POLICY_NS" ]"; then
+                kubectl label ns ${CLUSTER_ID} tks.io/policy=${CLUSTER_ID}
+              else
+                kubectl label ns ${CLUSTER_ID} tks.io/policy=${POLICY_NS}
+              fi
             fi
             ###########################################