From 2a4099785bcc1dda74d5192f93f69b33533585b3 Mon Sep 17 00:00:00 2001 From: rangajal Date: Tue, 3 Nov 2020 12:03:40 +0300 Subject: [PATCH] appmgr namespace changes Change-Id: Id0f723ddec0d541ab2ae1d8ccd4136460727ee1d Signed-off-by: rangajal --- pkg/helm/helm.go | 2 +- scripts/appmgrcli | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index 157a117..ed00b9e 100755 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -217,7 +217,7 @@ func (h *Helm) GetAddress(out string) (ip, port string) { func (h *Helm) GetEndpointInfo(name string) (svc string, port int) { port = 4560 // Default ns := h.cm.GetNamespace("") - args := fmt.Sprintf(" get service -n ricxapp service-%s-%s-rmr -o json", ns, name) + args := fmt.Sprintf(" get service -n %s service-%s-%s-rmr -o json", ns, ns, name) out, err := util.KubectlExec(args) if err != nil { return fmt.Sprintf("service-%s-%s-rmr.%s", ns, name, ns), 4560 diff --git a/scripts/appmgrcli b/scripts/appmgrcli index 4b9637d..4ea9c3f 100755 --- a/scripts/appmgrcli +++ b/scripts/appmgrcli @@ -113,6 +113,10 @@ if (exists $ENV{"APPMGR_PORT"}) { my $configName = ""; my $namespace = "ricxapp"; +# Check for environment override +if (exists $ENV{"XAPP_NAMESPACE"}) { + $namespace=$ENV{"XAPP_NAMESPACE"}; +} my $releaseName = ""; my $helmVersion = "0.0.1"; my $overrideFile = ""; -- 2.16.6