Update regexp for helm command

[ric-plt/appmgr.git] / cmd / appmgr / helm.go

diff --git a/cmd/appmgr/helm.go b/cmd/appmgr/helm.go
index a3785c8..5a5c28a 100755 (executable)
--- a/cmd/appmgr/helm.go
+++ b/cmd/appmgr/helm.go
@@ -208,6 +208,10 @@ func (h *Helm) List() (names []string, err error) {
        return h.GetNames(string(out))
 }
 
+func (h *Helm) SearchAll() (names []string) {
+       return h.cm.GetNamesFromHelmRepo()
+}
+
 func (h *Helm) Delete(name string) (xapp Xapp, err error) {
        xapp, err = h.Status(name)
        if err != nil {
@@ -289,7 +293,7 @@ func (h *Helm) FillInstanceData(name string, out string, xapp *Xapp, msgs Messag
        ip, port := h.GetAddress(out)
 
        var tmp string
-       r := regexp.MustCompile(`(?s)\/Pod.*?\/Service`)
+       r := regexp.MustCompile(`.*(?s)(Running|Pending|Succeeded|Failed|Unknown).*?\r?\n\r?\n`)
        result := r.FindStringSubmatch(string(out))
        if result == nil {
                return