chore(deps): bump to kube 1.18

cmd/configmap-server/main.go

@@ -99,7 +99,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 	logger := logrus.WithFields(logrus.Fields{"configMapName": configMapName, "configMapNamespace": configMapNamespace, "port": port})
 
 	client := NewClientFromConfig(kubeconfig, logger.Logger)
-	configMap, err := client.CoreV1().ConfigMaps(configMapNamespace).Get(configMapName, metav1.GetOptions{})
+	configMap, err := client.CoreV1().ConfigMaps(configMapNamespace).Get(context.TODO(), configMapName, metav1.GetOptions{})
 	if err != nil {
 		logger.Fatalf("error getting configmap: %s", err)
 	}

go.mod

@@ -16,7 +16,6 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang-migrate/migrate/v4 v4.6.2
 	github.com/golang/mock v1.3.1
 	github.com/golang/protobuf v1.3.2
@@ -40,20 +39,18 @@ require (
 	github.com/spf13/cobra v0.0.6
 	github.com/stretchr/testify v1.5.1
 	go.etcd.io/bbolt v1.3.4
-	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
 	golang.org/x/mod v0.2.0
 	golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	google.golang.org/grpc v1.24.0
+	google.golang.org/grpc v1.26.0
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.17.3
-	k8s.io/apiextensions-apiserver v0.17.3
-	k8s.io/apimachinery v0.17.3
-	k8s.io/client-go v0.17.3
+	k8s.io/api v0.18.0
+	k8s.io/apiextensions-apiserver v0.18.0
+	k8s.io/apimachinery v0.18.0
+	k8s.io/client-go v0.18.0
 	k8s.io/klog v1.0.0
-	k8s.io/kubectl v0.17.3
+	k8s.io/kubectl v0.18.0
 )
 
 replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

pkg/appregistry/downloader.go

@@ -1,6 +1,7 @@
 package appregistry
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -251,7 +252,7 @@ func (s *secretRegistryOptionsGetter) GetRegistryOptions(source *Source) (*apprc
 
 	token := ""
 	if source.IsSecretSpecified() {
-		secret, err := s.kubeClient.CoreV1().Secrets(source.Secret.Namespace).Get(source.Secret.Name, metav1.GetOptions{})
+		secret, err := s.kubeClient.CoreV1().Secrets(source.Secret.Namespace).Get(context.TODO(), source.Secret.Name, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}

pkg/configmap/configmap_writer.go

@@ -1,6 +1,7 @@
 package configmap
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -94,7 +95,7 @@ func validateConfigmapAnnotations(annotations map[string]string) error {
 func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 	subDirs := []string{"manifests/", "metadata/"}
 
-	configMapPopulate, err := c.clientset.CoreV1().ConfigMaps(c.namespace).Get(c.configMapName, metav1.GetOptions{})
+	configMapPopulate, err := c.clientset.CoreV1().ConfigMaps(c.namespace).Get(context.TODO(), c.configMapName, metav1.GetOptions{})
 	if err != nil {
 		return err
 	}
@@ -158,7 +159,7 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 		annotations[ConfigMapImageAnnotationKey] = sourceImage
 	}
 
-	_, err = c.clientset.CoreV1().ConfigMaps(c.namespace).Update(configMapPopulate)
+	_, err = c.clientset.CoreV1().ConfigMaps(c.namespace).Update(context.TODO(), configMapPopulate, metav1.UpdateOptions{})
 	if err != nil {
 		return err
 	}
@@ -172,11 +173,11 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 // for locality.
 func LaunchBundleImage(kubeclient kubernetes.Interface, bundleImage, initImage, namespace string) (*corev1.ConfigMap, *batchv1.Job, error) {
 	// create configmap for bundle image data to write to (will be returned)
-	newConfigMap, err := kubeclient.CoreV1().ConfigMaps(namespace).Create(&corev1.ConfigMap{
+	newConfigMap, err := kubeclient.CoreV1().ConfigMaps(namespace).Create(context.TODO(), &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: "bundle-image-",
 		},
-	})
+	}, metav1.CreateOptions{})
 	if err != nil {
 		return nil, nil, err
 	}
@@ -237,9 +238,9 @@ func LaunchBundleImage(kubeclient kubernetes.Interface, bundleImage, initImage,
 			},
 		},
 	}
-	launchedJob, err := kubeclient.BatchV1().Jobs(namespace).Create(&launchJob)
+	launchedJob, err := kubeclient.BatchV1().Jobs(namespace).Create(context.TODO(), &launchJob, metav1.CreateOptions{})
 	if err != nil {
-		err := kubeclient.CoreV1().ConfigMaps(namespace).Delete(newConfigMap.GetName(), &metav1.DeleteOptions{})
+		err := kubeclient.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), newConfigMap.GetName(), metav1.DeleteOptions{})
 		if err != nil {
 			// already in an error, so just report it
 			logrus.Errorf("failed to remove configmap: %v", err)

test/e2e/bundle_image_test.go

@@ -1,6 +1,7 @@
 package e2e_test
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -676,8 +677,8 @@ spec:
 	}
 }
 
-func buildContainer(tag, dockerfilePath, context string) {
-	cmd := exec.Command(builderCmd, "build", "-t", tag, "-f", dockerfilePath, context)
+func buildContainer(tag, dockerfilePath, dockerContext string) {
+	cmd := exec.Command(builderCmd, "build", "-t", tag, "-f", dockerfilePath, dockerContext)
 	err := cmd.Run()
 	Expect(err).NotTo(HaveOccurred())
 }
@@ -710,7 +711,7 @@ var _ = Describe("Launch bundle", func() {
 			kubeclient, err := client.NewKubeClient("", logrus.StandardLogger())
 			Expect(err).NotTo(HaveOccurred())
 
-			_, err = kubeclient.RbacV1().Roles(namespace).Create(&rbacv1.Role{
+			_, err = kubeclient.RbacV1().Roles(namespace).Create(context.TODO(), &rbacv1.Role{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "olm-dev-configmap-access",
 					Namespace: namespace,
@@ -722,10 +723,10 @@ var _ = Describe("Launch bundle", func() {
 						Verbs:     []string{"create", "get", "update"},
 					},
 				},
-			})
+			}, metav1.CreateOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
-			_, err = kubeclient.RbacV1().RoleBindings(namespace).Create(&rbacv1.RoleBinding{
+			_, err = kubeclient.RbacV1().RoleBindings(namespace).Create(context.TODO(), &rbacv1.RoleBinding{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "olm-dev-configmap-access-binding",
 					Namespace: namespace,
@@ -743,7 +744,7 @@ var _ = Describe("Launch bundle", func() {
 					Kind:     "Role",
 					Name:     "olm-dev-configmap-access",
 				},
-			})
+			}, metav1.CreateOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
 			By("building required images")
@@ -755,7 +756,7 @@ var _ = Describe("Launch bundle", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			// wait for job to complete
-			jobWatcher, err := kubeclient.BatchV1().Jobs(namespace).Watch(metav1.ListOptions{})
+			jobWatcher, err := kubeclient.BatchV1().Jobs(namespace).Watch(context.TODO(), metav1.ListOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
 			done := make(chan struct{})
@@ -792,22 +793,22 @@ var _ = Describe("Launch bundle", func() {
 			<-done
 			Logf("Job complete")
 
-			bundleDataConfigMap, err = kubeclient.CoreV1().ConfigMaps(namespace).Get(bundleDataConfigMap.GetName(), metav1.GetOptions{})
+			bundleDataConfigMap, err = kubeclient.CoreV1().ConfigMaps(namespace).Get(context.TODO(), bundleDataConfigMap.GetName(), metav1.GetOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			assert.EqualValues(GinkgoT(), correctConfigMap.Annotations, bundleDataConfigMap.Annotations)
 			assert.EqualValues(GinkgoT(), correctConfigMap.Data, bundleDataConfigMap.Data)
 
 			// clean up, perhaps better handled elsewhere
-			err = kubeclient.CoreV1().ConfigMaps(namespace).Delete(bundleDataConfigMap.GetName(), &metav1.DeleteOptions{})
+			err = kubeclient.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), bundleDataConfigMap.GetName(), metav1.DeleteOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
 			// job deletion does not clean up underlying pods (but using kubectl will do the clean up)
-			pods, err := kubeclient.CoreV1().Pods(namespace).List(metav1.ListOptions{LabelSelector: fmt.Sprintf("job-name=%s", job.GetName())})
+			pods, err := kubeclient.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: fmt.Sprintf("job-name=%s", job.GetName())})
 			Expect(err).NotTo(HaveOccurred())
-			err = kubeclient.CoreV1().Pods(namespace).Delete(pods.Items[0].GetName(), &metav1.DeleteOptions{})
+			err = kubeclient.CoreV1().Pods(namespace).Delete(context.TODO(), pods.Items[0].GetName(), metav1.DeleteOptions{})
 			Expect(err).NotTo(HaveOccurred())
 
-			err = kubeclient.BatchV1().Jobs(namespace).Delete(job.GetName(), &metav1.DeleteOptions{})
+			err = kubeclient.BatchV1().Jobs(namespace).Delete(context.TODO(), job.GetName(), metav1.DeleteOptions{})
 			Expect(err).NotTo(HaveOccurred())
 		})
 	})