X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fappmgr%2Fdesc.go;fp=cmd%2Fappmgr%2Fdesc.go;h=d4493be60600b523e19ffdd022c36fae97dea2d9;hb=d732b871ab1dccaf9ef5311dede522879193b45e;hp=ac1d0c832c65d7af976d93072b1181735285cc52;hpb=8492ba318dfe939c74a22a6303144b66c7ab4923;p=ric-plt%2Fappmgr.git

diff --git a/cmd/appmgr/desc.go b/cmd/appmgr/desc.go
index ac1d0c8..d4493be 100755
--- a/cmd/appmgr/desc.go
+++ b/cmd/appmgr/desc.go
@@ -65,13 +65,14 @@ type CMError struct {
 }
 
 func (cm *ConfigMap) UploadConfig() (cfg []XAppConfig) {
+	ns := cm.GetNamespace("")
 	for _, name := range cm.GetNamesFromHelmRepo() {
 		if name == "appmgr" {
 			continue
 		}
 
 		c := XAppConfig{
-			Metadata: ConfigMetadata{Name: name, Namespace: "ricxapp", ConfigName: name + "-appconfig"},
+			Metadata: ConfigMetadata{Name: name, Namespace: ns, ConfigName: name + "-appconfig"},
 		}
 
 		err := cm.ReadSchema(name, &c)
@@ -79,7 +80,7 @@ func (cm *ConfigMap) UploadConfig() (cfg []XAppConfig) {
 			continue
 		}
 
-		err = cm.ReadConfigMap(c.Metadata.ConfigName, "ricxapp", &c.Configuration)
+		err = cm.ReadConfigMap(c.Metadata.ConfigName, ns, &c.Configuration)
 		if err != nil {
 			log.Println("No active configMap found, using default!")
 		}
@@ -291,7 +292,8 @@ func (cm *ConfigMap) FetchChart(name string) (err error) {
 func (cm *ConfigMap) GetMessages(name string) (msgs MessageTypes) {
 	log.Println("Fetching tx/rx messages for: ", name)
 
-	args := fmt.Sprintf("get configmap -o jsonpath='{.data.config-file\\.json}' -n ricxapp %s-appconfig", name)
+	ns := cm.GetNamespace("")
+	args := fmt.Sprintf("get configmap -o jsonpath='{.data.config-file\\.json}' -n %s %s-appconfig", ns, name)
 	out, err := KubectlExec(args)
 	if err != nil {
 		return
@@ -313,3 +315,16 @@ func (cm *ConfigMap) GetMessages(name string) (msgs MessageTypes) {
 
 	return
 }
+
+func (cm *ConfigMap) GetNamespace(ns string) string {
+	if ns != "" {
+		return ns
+	}
+
+	ns = viper.GetString("xapp.namespace")
+	if ns == "" {
+		ns = "ricxapp"
+	}
+	return ns
+}
+