Update arguments to K8S package functions

Satisfy new function signatures after K8S package updates.
cyberark · Nov 2, 2021 · 4319b75 · 4319b75
1 parent 48f7caf
commit 4319b75
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/internal/configurationmanagers/kubernetes/crd/crd_injector.go b/internal/configurationmanagers/kubernetes/crd/crd_injector.go
@@ -1,6 +1,7 @@
 package crd
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"strings"
@@ -35,7 +36,7 @@ func createCRD(apiExtClient *apiextensionsclientset.Clientset) error {
 		},
 	}
 
-	res, err := apiExtClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(secretlessCRD)
+	res, err := apiExtClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.TODO(), secretlessCRD, meta_v1.CreateOptions{})
 	if err != nil && !apierrors.IsAlreadyExists(err) {
 		return fmt.Errorf("%s: ERROR: Could not create Secretless CRD: %v - %v", PluginName,
 			err, res)

diff --git a/internal/configurationmanagers/kubernetes/crd/crd_watcher.go b/internal/configurationmanagers/kubernetes/crd/crd_watcher.go
@@ -1,6 +1,7 @@
 package crd
 
 import (
+	"context"
 	"log"
 
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,10 +41,10 @@ func RegisterCRDListener(namespace string, configSpec string, resourceEventHandl
 	// TODO: We might not want to listen in on all namespace changes
 	watchList := &cache.ListWatch{
 		ListFunc: func(listOpts meta_v1.ListOptions) (result runtime.Object, err error) {
-			return clientset.SecretlessV1().Configurations(namespace).List(listOpts)
+			return clientset.SecretlessV1().Configurations(namespace).List(context.TODO(), listOpts)
 		},
 		WatchFunc: func(listOpts meta_v1.ListOptions) (watch.Interface, error) {
-			return clientset.SecretlessV1().Configurations(namespace).Watch(listOpts)
+			return clientset.SecretlessV1().Configurations(namespace).Watch(context.TODO(), listOpts)
 		},
 	}
 

diff --git a/internal/providers/kubernetessecrets/provider.go b/internal/providers/kubernetessecrets/provider.go
@@ -1,6 +1,7 @@
 package kubernetessecrets
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -59,7 +60,7 @@ func (p *Provider) GetValue(id string) ([]byte, error) {
 		return nil, fmt.Errorf("field name missing from Kubernetes secret id '%s'", id)
 	}
 
-	secret, err := p.SecretsClient.Get(secretName, metav1.GetOptions{})
+	secret, err := p.SecretsClient.Get(context.TODO(), secretName, metav1.GetOptions{})
 	if err != nil {
 		if errors.IsNotFound(err) {
 			return nil, fmt.Errorf("could not find Kubernetes secret from '%s'", id)

diff --git a/test/providers/kubernetessecrets/kubernetes_provider_test.go b/test/providers/kubernetessecrets/kubernetes_provider_test.go
@@ -1,11 +1,12 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	. "github.com/smartystreets/goconvey/convey"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	testclient "k8s.io/client-go/kubernetes/fake"
 
@@ -37,12 +38,16 @@ func TestKubernetes_Provider(t *testing.T) {
 	)
 
 	for name, data := range mockSecrets {
-		_, err = testSecretsClient.Create(&v1.Secret{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: name,
+		_, err = testSecretsClient.Create(
+			context.TODO(),
+			&v1.Secret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: name,
+				},
+				Data: data,
 			},
-			Data: data,
-		})
+			metav1.CreateOptions{},
+		)
 		if err != nil {
 			panic(fmt.Errorf("unable to create secret on test client: %s", err))
 		}