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/service/plugin.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/k8splugin/plugins/service/plugin.go') diff --git a/src/k8splugin/plugins/service/plugin.go b/src/k8splugin/plugins/service/plugin.go index 28191767..06f4b1d5 100644 --- a/src/k8splugin/plugins/service/plugin.go +++ b/src/k8splugin/plugins/service/plugin.go @@ -14,6 +14,7 @@ limitations under the License. package main import ( + "context" "log" pkgerrors "github.com/pkg/errors" @@ -61,7 +62,7 @@ func (p servicePlugin) Create(yamlFilePath string, namespace string, client plug labels[config.GetConfiguration().KubernetesLabelName] = client.GetInstanceID() service.SetLabels(labels) - result, err := client.GetStandardClient().CoreV1().Services(namespace).Create(service) + result, err := client.GetStandardClient().CoreV1().Services(namespace).Create(context.TODO(), service, metaV1.CreateOptions{}) if err != nil { return "", pkgerrors.Wrap(err, "Create Service error") } @@ -80,7 +81,7 @@ func (p servicePlugin) List(gvk schema.GroupVersionKind, namespace string, clien Limit: utils.ResourcesListLimit, } - list, err := client.GetStandardClient().CoreV1().Services(namespace).List(opts) + list, err := client.GetStandardClient().CoreV1().Services(namespace).List(context.TODO(), opts) if err != nil { return nil, pkgerrors.Wrap(err, "Get Service list error") } @@ -111,12 +112,12 @@ func (p servicePlugin) Delete(resource helm.KubernetesResource, namespace string } deletePolicy := metaV1.DeletePropagationForeground - opts := &metaV1.DeleteOptions{ + opts := metaV1.DeleteOptions{ PropagationPolicy: &deletePolicy, } log.Println("Deleting service: " + resource.Name) - if err := client.GetStandardClient().CoreV1().Services(namespace).Delete(resource.Name, opts); err != nil { + if err := client.GetStandardClient().CoreV1().Services(namespace).Delete(context.TODO(), resource.Name, opts); err != nil { return pkgerrors.Wrap(err, "Delete service error") } @@ -130,7 +131,7 @@ func (p servicePlugin) Get(resource helm.KubernetesResource, namespace string, c } opts := metaV1.GetOptions{} - service, err := client.GetStandardClient().CoreV1().Services(namespace).Get(resource.Name, opts) + service, err := client.GetStandardClient().CoreV1().Services(namespace).Get(context.TODO(), resource.Name, opts) if err != nil { return "", pkgerrors.Wrap(err, "Get Service error") } -- cgit 1.2.3-korg