diff options
| author |   Ritu Sood <ritu.sood@intel.com> | 2021-02-23 20:18:26 -0800 |
|---|---|---|
| committer |   Lukasz Rajewski <lukasz.rajewski@orange.com> | 2021-05-06 13:39:08 +0000 |
| commit | 97bd8a16fda3b7d0f176aa1b04d7fba5f1f56354 (patch) | |
| tree | 9e583b52767264af616c697964b0e1cf7d3ff0b2 /src/k8splugin/internal/app/instance.go | |
| parent | 483f3324d67fb59e8e9e53ece22d1c3b2a32f7dd (diff) | |
Migrate to use Helm v3 libraries
Moving to Helm v3. Updated unit tests.
Reworked Healthcheck Execution to align
with v3 design.
Helm v3 requires newer version for K8s
libraries. Moved to use version 0.19.4.
Issue-ID: MULTICLOUD-1295
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I091b75d69841dde56ad2c294cca2d5a0291ffa8f
(cherry picked from commit 1f60346da61383f18b7277037439711aef38a0fe)
Diffstat (limited to 'src/k8splugin/internal/app/instance.go')
| -rw-r--r-- | src/k8splugin/internal/app/instance.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/k8splugin/internal/app/instance.go b/src/k8splugin/internal/app/instance.go index c3d3d207..c1ec35b6 100644 --- a/src/k8splugin/internal/app/instance.go +++ b/src/k8splugin/internal/app/instance.go @@ -19,16 +19,13 @@ package app import ( "encoding/json" - "log" - "strings" - - "k8s.io/apimachinery/pkg/runtime/schema" - protorelease "k8s.io/helm/pkg/proto/hapi/release" - "github.com/onap/multicloud-k8s/src/k8splugin/internal/db" "github.com/onap/multicloud-k8s/src/k8splugin/internal/helm" "github.com/onap/multicloud-k8s/src/k8splugin/internal/namegenerator" "github.com/onap/multicloud-k8s/src/k8splugin/internal/rb" + "k8s.io/apimachinery/pkg/runtime/schema" + "log" + "strings" pkgerrors "github.com/pkg/errors" ) @@ -52,7 +49,7 @@ type InstanceResponse struct { Namespace string `json:"namespace"` ReleaseName string `json:"release-name"` Resources []helm.KubernetesResource `json:"resources"` - Hooks []*protorelease.Hook `json:"-"` + Hooks []*helm.Hook `json:"-"` } // InstanceMiniResponse contains the response from instantiation @@ -264,7 +261,7 @@ func (v *InstanceClient) Query(id, apiVersion, kind, name, labels string) (Insta Name: name, GVK: schema.FromAPIVersionAndKind(apiVersion, kind), } - res, err := k8sClient.getResourceStatus(resIdentifier, resResp.Namespace) + res, err := k8sClient.GetResourceStatus(resIdentifier, resResp.Namespace) if err != nil { return InstanceStatus{}, pkgerrors.Wrap(err, "Querying Resource") } @@ -323,7 +320,7 @@ Main: continue Main //Don't double check pods if someone decided to define pod explicitly in helm chart } } - status, err := k8sClient.getResourceStatus(resource, resResp.Namespace) + status, err := k8sClient.GetResourceStatus(resource, resResp.Namespace) if err != nil { cumulatedErrorMsg = append(cumulatedErrorMsg, err.Error()) } else { |