From 97bd8a16fda3b7d0f176aa1b04d7fba5f1f56354 Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Tue, 23 Feb 2021 20:18:26 -0800 Subject: Migrate to use Helm v3 libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Konrad Bańka Change-Id: I091b75d69841dde56ad2c294cca2d5a0291ffa8f (cherry picked from commit 1f60346da61383f18b7277037439711aef38a0fe) --- src/k8splugin/plugins/namespace/plugin.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/k8splugin/plugins/namespace') diff --git a/src/k8splugin/plugins/namespace/plugin.go b/src/k8splugin/plugins/namespace/plugin.go index cfc395bb..59defa36 100644 --- a/src/k8splugin/plugins/namespace/plugin.go +++ b/src/k8splugin/plugins/namespace/plugin.go @@ -14,6 +14,7 @@ limitations under the License. package main import ( + "context" "log" pkgerrors "github.com/pkg/errors" @@ -42,7 +43,7 @@ func (p namespacePlugin) Create(yamlFilePath string, namespace string, client pl Name: namespace, }, } - _, err := client.GetStandardClient().CoreV1().Namespaces().Create(namespaceObj) + _, err := client.GetStandardClient().CoreV1().Namespaces().Create(context.TODO(), namespaceObj, metaV1.CreateOptions{}) if err != nil { return "", pkgerrors.Wrap(err, "Create Namespace error") } @@ -54,7 +55,7 @@ func (p namespacePlugin) Create(yamlFilePath string, namespace string, client pl // Get an existing namespace hosted in a specific Kubernetes cluster func (p namespacePlugin) Get(resource helm.KubernetesResource, namespace string, client plugin.KubernetesConnector) (string, error) { opts := metaV1.GetOptions{} - ns, err := client.GetStandardClient().CoreV1().Namespaces().Get(resource.Name, opts) + ns, err := client.GetStandardClient().CoreV1().Namespaces().Get(context.TODO(), resource.Name, opts) if err != nil { return "", pkgerrors.Wrap(err, "Get Namespace error") } @@ -65,12 +66,12 @@ func (p namespacePlugin) Get(resource helm.KubernetesResource, namespace string, // Delete an existing namespace hosted in a specific Kubernetes cluster func (p namespacePlugin) Delete(resource helm.KubernetesResource, namespace string, client plugin.KubernetesConnector) error { deletePolicy := metaV1.DeletePropagationForeground - opts := &metaV1.DeleteOptions{ + opts := metaV1.DeleteOptions{ PropagationPolicy: &deletePolicy, } log.Println("Deleting namespace: " + resource.Name) - if err := client.GetStandardClient().CoreV1().Namespaces().Delete(resource.Name, opts); err != nil { + if err := client.GetStandardClient().CoreV1().Namespaces().Delete(context.TODO(), resource.Name, opts); err != nil { return pkgerrors.Wrap(err, "Delete namespace error") } @@ -84,7 +85,7 @@ func (p namespacePlugin) List(gvk schema.GroupVersionKind, namespace string, cli Limit: utils.ResourcesListLimit, } - list, err := client.GetStandardClient().CoreV1().Namespaces().List(opts) + list, err := client.GetStandardClient().CoreV1().Namespaces().List(context.TODO(), opts) if err != nil { return nil, pkgerrors.Wrap(err, "Get Namespace list error") } -- cgit 1.2.3-korg