From 188e453f8ae1992e65fca05904d8c83a03505ff5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 19:17:56 +0800
Subject: [PATCH] Fix: Use systemDefinitionNamespace core Helm Chart (#3165)

Use value in Addon Registry CM and the Test Application

Signed-off-by: Oliver Otte <otte@gonicus.de>
(cherry picked from commit 8498c52aeed34104e193201b4264523462f48017)

Co-authored-by: Oliver Otte <otte@gonicus.de>
---
 charts/vela-core/templates/addon_registry.yaml        |  4 ++--
 charts/vela-core/templates/test/test-application.yaml | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/charts/vela-core/templates/addon_registry.yaml b/charts/vela-core/templates/addon_registry.yaml
index e1c080e64..317224ee9 100644
--- a/charts/vela-core/templates/addon_registry.yaml
+++ b/charts/vela-core/templates/addon_registry.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: vela-addon-registry
-  namespace: vela-system
+  namespace: {{.Values.systemDefinitionNamespace}}
 data:
   registries: '{
   "KubeVela":{
@@ -13,4 +13,4 @@ data:
       "path": ""
     }
   }
-}'
\ No newline at end of file
+}'
diff --git a/charts/vela-core/templates/test/test-application.yaml b/charts/vela-core/templates/test/test-application.yaml
index cb4ee05f7..3b63f3124 100644
--- a/charts/vela-core/templates/test/test-application.yaml
+++ b/charts/vela-core/templates/test/test-application.yaml
@@ -5,6 +5,7 @@ metadata:
     helm.sh/hook: test-success
     helm.sh/hook-delete-policy: hook-succeeded
   name: helm-test-vela-app
+  namespace: {{.Values.systemDefinitionNamespace}}
 spec:
   components:
     - name: helm-test-express-server
@@ -23,6 +24,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ .Release.Name }}-application-test"
+  namespace: {{.Values.systemDefinitionNamespace}}
   annotations:
     "helm.sh/hook": test
     helm.sh/hook-delete-policy: hook-succeeded
@@ -42,16 +44,16 @@ spec:
           echo "Waiting application is ready..."
 
           echo "waiting for application being Ready"
-          kubectl -n vela-system wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
+          kubectl -n {{.Values.systemDefinitionNamespace}} wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
           echo "application is Ready"
 
           # wait for deploy being created
           echo "waiting for deployment being available"
-          kubectl -n vela-system wait --for=condition=available deployments helm-test-express-server --timeout 3m
+          kubectl -n {{.Values.systemDefinitionNamespace}} wait --for=condition=available deployments helm-test-express-server --timeout 3m
           echo "deployment being available"
 
           # wait for ingress being created
-          while ! [ `kubectl -n vela-system get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
+          while ! [ `kubectl -n {{.Values.systemDefinitionNamespace}} get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
             echo "waiting for ingress being created"
             sleep 1
           done
@@ -59,4 +61,4 @@ spec:
 
 
           echo "Application and its components are created"
-  restartPolicy: Never
\ No newline at end of file
+  restartPolicy: Never