Resolving compilation errors for k8s 1.21.x client

* remove "replace" statement for go-autorest

With SOPS upgraded, "go mod tidy" now fails until this is removed.

* Resolve client-go issue from upgrade to 1.20

kubernetes/client-go#914 (comment)

* register deployments type

Signed-off-by: Kingdon Barrett <kingdon@weave.works>

cmd/fluxctl/portforward.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -14,11 +15,11 @@ import (
 
 // Attempt to create PortForwards to fluxes that match the label selectors until a Flux
 // is found or an error is returned.
-func tryPortforwards(context string, ns string, selectors ...metav1.LabelSelector) (p *portforward.PortForward, err error) {
+func tryPortforwards(kubeConfigContext string, ns string, selectors ...metav1.LabelSelector) (p *portforward.PortForward, err error) {
 	message := fmt.Sprintf("No pod found in namespace %q using the following selectors:", ns)
 
 	for _, selector := range selectors {
-		p, err = tryPortforward(context, ns, selector)
+		p, err = tryPortforward(context.TODO(), kubeConfigContext, ns, selector)
 		if err == nil {
 			return
 		}
@@ -39,7 +40,7 @@ func tryPortforwards(context string, ns string, selectors ...metav1.LabelSelecto
 }
 
 // Attempt to create a portforward in the namespace for the provided LabelSelector
-func tryPortforward(kubeConfigContext string, ns string, selector metav1.LabelSelector) (*portforward.PortForward, error) {
+func tryPortforward(ctx context.Context, kubeConfigContext string, ns string, selector metav1.LabelSelector) (*portforward.PortForward, error) {
 	portforwarder := &portforward.PortForward{
 		Namespace:       ns,
 		Labels:          selector,
@@ -66,7 +67,7 @@ func tryPortforward(kubeConfigContext string, ns string, selector metav1.LabelSe
 		return portforwarder, errors.Wrap(err, "Could not create kubernetes client")
 	}
 
-	err = portforwarder.Start()
+	err = portforwarder.Start(context.TODO())
 	if err != nil {
 		return portforwarder, err
 	}

go.mod

@@ -8,7 +8,7 @@ replace github.com/docker/distribution => github.com/fluxcd/distribution v0.0.0-
 
 // fix go-autorest ambiguous import caused by sops
 // sops needs to update their deps ref: https://github.com/kubernetes/client-go/issues/628
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible
+// replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible
 
 // transitive requirement from Helm Operator
 replace (
@@ -33,13 +33,11 @@ require (
 	github.com/Azure/azure-sdk-for-go v38.0.0+incompatible // indirect
 	github.com/Jeffail/gabs v1.4.0
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/aws/aws-sdk-go v1.33.18
 	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
 	github.com/cheggaaa/pb/v3 v3.0.2
 	github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
-	github.com/docker/cli v20.10.3+incompatible // indirect
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v20.10.3+incompatible // indirect
 	github.com/evanphx/json-patch v4.9.0+incompatible
@@ -48,7 +46,6 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-kit/kit v0.10.0
 	github.com/golang/gddo v0.0.0-20190312205958-5a2505f3dbf0
-	github.com/google/go-cmp v0.5.4 // indirect
 	github.com/google/go-containerregistry v0.4.0
 	github.com/google/go-github/v28 v28.1.1
 	github.com/gorilla/mux v1.7.3
@@ -77,7 +74,6 @@ require (
 	golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	gopkg.in/yaml.v2 v2.4.0
-	gotest.tools/v3 v3.0.3 // indirect
 	k8s.io/api v0.21.3
 	k8s.io/apiextensions-apiserver v0.20.4
 	k8s.io/apimachinery v0.21.3

pkg/cluster/kubernetes/cached_disco.go

@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"context"
 	"fmt"
 	"sync"
 	"time"
@@ -67,10 +68,10 @@ func MakeCachedDiscovery(d discovery.DiscoveryInterface, c crd.Interface, shutdo
 	crdClient := c.ApiextensionsV1().CustomResourceDefinitions()
 	lw := &toolscache.ListWatch{
 		ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
-			return crdClient.List(options)
+			return crdClient.List(context.TODO(), options)
 		},
 		WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
-			return crdClient.Watch(options)
+			return crdClient.Watch(context.TODO(), options)
 		},
 	}
 	handle := toolscache.ResourceEventHandlerFuncs{

pkg/cluster/kubernetes/cached_disco_test.go

@@ -1,6 +1,7 @@
 package kubernetes
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -69,7 +70,7 @@ func TestCachedDiscovery(t *testing.T) {
 	coreClient.Fake.Resources = append(apiResources, updatedAPI)
 
 	// Provoke the cached discovery client into invalidating
-	_, err = crdClient.ApiextensionsV1().CustomResourceDefinitions().Update(myCRD)
+	_, err = crdClient.ApiextensionsV1().CustomResourceDefinitions().Update(context.TODO(), myCRD, metav1.UpdateOptions{})
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/cluster/kubernetes/images.go

@@ -55,7 +55,7 @@ func mergeCredentials(log func(...interface{}) error,
 		saName = "default"
 	}
 
-	sa, err := client.CoreV1().ServiceAccounts(namespace).Get(saName, meta_v1.GetOptions{})
+	sa, err := client.CoreV1().ServiceAccounts(namespace).Get(context.TODO(), saName, meta_v1.GetOptions{})
 	if err == nil {
 		for _, ips := range sa.ImagePullSecrets {
 			imagePullSecrets = append(imagePullSecrets, ips.Name)
@@ -73,7 +73,7 @@ func mergeCredentials(log func(...interface{}) error,
 			continue
 		}
 
-		secret, err := client.CoreV1().Secrets(namespace).Get(name, meta_v1.GetOptions{})
+		secret, err := client.CoreV1().Secrets(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
 		if err != nil {
 			log("err", errors.Wrapf(err, "getting secret %q from namespace %q", name, namespace))
 			imagePullSecretCache[namespacedSecretName] = registry.NoCredentials()

pkg/cluster/kubernetes/kubernetes.go

@@ -248,7 +248,7 @@ func (c *Cluster) Export(ctx context.Context) ([]byte, error) {
 	defer encoder.Close()
 
 	for _, ns := range namespaces {
-		namespace, err := c.client.CoreV1().Namespaces().Get(ns, meta_v1.GetOptions{})
+		namespace, err := c.client.CoreV1().Namespaces().Get(ctx, ns, meta_v1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
@@ -311,7 +311,7 @@ func (c *Cluster) getAllowedAndExistingNamespaces(ctx context.Context) ([]string
 			if err := ctx.Err(); err != nil {
 				return nil, err
 			}
-			ns, err := c.client.CoreV1().Namespaces().Get(name, meta_v1.GetOptions{})
+			ns, err := c.client.CoreV1().Namespaces().Get(ctx, name, meta_v1.GetOptions{})
 			switch {
 			case err == nil:
 				c.updateLoggedAllowedNS(name, false) // reset, so if the namespace goes away we'll log it again

pkg/cluster/kubernetes/resourcekinds.go

@@ -116,7 +116,7 @@ func (dk *deploymentKind) getWorkload(ctx context.Context, c *Cluster, namespace
 	if err := ctx.Err(); err != nil {
 		return workload{}, err
 	}
-	deployment, err := c.client.AppsV1().Deployments(namespace).Get(name, meta_v1.GetOptions{})
+	deployment, err := c.client.AppsV1().Deployments(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
 	if err != nil {
 		return workload{}, err
 	}
@@ -128,7 +128,7 @@ func (dk *deploymentKind) getWorkloads(ctx context.Context, c *Cluster, namespac
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
-	deployments, err := c.client.AppsV1().Deployments(namespace).List(meta_v1.ListOptions{})
+	deployments, err := c.client.AppsV1().Deployments(namespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -199,7 +199,7 @@ func (dk *daemonSetKind) getWorkload(ctx context.Context, c *Cluster, namespace,
 	if err := ctx.Err(); err != nil {
 		return workload{}, err
 	}
-	daemonSet, err := c.client.AppsV1().DaemonSets(namespace).Get(name, meta_v1.GetOptions{})
+	daemonSet, err := c.client.AppsV1().DaemonSets(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
 	if err != nil {
 		return workload{}, err
 	}
@@ -211,7 +211,7 @@ func (dk *daemonSetKind) getWorkloads(ctx context.Context, c *Cluster, namespace
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
-	daemonSets, err := c.client.AppsV1().DaemonSets(namespace).List(meta_v1.ListOptions{})
+	daemonSets, err := c.client.AppsV1().DaemonSets(namespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -266,7 +266,7 @@ func (dk *statefulSetKind) getWorkload(ctx context.Context, c *Cluster, namespac
 	if err := ctx.Err(); err != nil {
 		return workload{}, err
 	}
-	statefulSet, err := c.client.AppsV1().StatefulSets(namespace).Get(name, meta_v1.GetOptions{})
+	statefulSet, err := c.client.AppsV1().StatefulSets(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
 	if err != nil {
 		return workload{}, err
 	}
@@ -278,7 +278,7 @@ func (dk *statefulSetKind) getWorkloads(ctx context.Context, c *Cluster, namespa
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
-	statefulSets, err := c.client.AppsV1().StatefulSets(namespace).List(meta_v1.ListOptions{})
+	statefulSets, err := c.client.AppsV1().StatefulSets(namespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -365,7 +365,7 @@ func (dk *cronJobKind) getWorkload(ctx context.Context, c *Cluster, namespace, n
 	if err := ctx.Err(); err != nil {
 		return workload{}, err
 	}
-	cronJob, err := c.client.BatchV1beta1().CronJobs(namespace).Get(name, meta_v1.GetOptions{})
+	cronJob, err := c.client.BatchV1beta1().CronJobs(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
 	if err != nil {
 		return workload{}, err
 	}
@@ -377,7 +377,7 @@ func (dk *cronJobKind) getWorkloads(ctx context.Context, c *Cluster, namespace s
 	if err := ctx.Err(); err != nil {
 		return nil, err
 	}
-	cronJobs, err := c.client.BatchV1beta1().CronJobs(namespace).List(meta_v1.ListOptions{})
+	cronJobs, err := c.client.BatchV1beta1().CronJobs(namespace).List(context.TODO(), meta_v1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +437,7 @@ func (hr *helmReleaseKind) getWorkloads(ctx context.Context, c *Cluster, namespa
 }
 
 func makeHelmReleaseStableWorkload(helmRelease *hr_v1.HelmRelease) workload {
-	containers := createK8sHRContainers(helmRelease.ObjectMeta.Annotations, helmRelease.Spec.Values.Data)
+	containers := createK8sHRContainers(helmRelease.ObjectMeta.Annotations, helmRelease.GetValues())
 
 	podTemplate := apiv1.PodTemplateSpec{
 		ObjectMeta: helmRelease.ObjectMeta,

pkg/cluster/kubernetes/sshkeyring.go

@@ -1,15 +1,17 @@
 package kubernetes
 
 import (
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"os"
 	"path/filepath"
 	"sync"
 
 	"github.com/pkg/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/kubernetes/typed/core/v1"
+	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
 	"github.com/fluxcd/flux/pkg/ssh"
 )
@@ -129,7 +131,7 @@ func (skr *sshKeyRing) Regenerate() error {
 		return err
 	}
 
-	_, err = skr.SecretAPI.Patch(skr.SecretName, types.StrategicMergePatchType, jsonPatch)
+	_, err = skr.SecretAPI.Patch(context.TODO(), skr.SecretName, types.StrategicMergePatchType, jsonPatch, metav1.PatchOptions{})
 	if err != nil {
 		return err
 	}

pkg/cluster/kubernetes/sync.go

@@ -8,13 +8,14 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
-	"github.com/ryanuber/go-glob"
 	"io"
 	"os/exec"
 	"sort"
 	"strings"
 	"time"
 
+	"github.com/ryanuber/go-glob"
+
 	"github.com/go-kit/kit/log"
 	"github.com/imdario/mergo"
 	"github.com/pkg/errors"
@@ -336,7 +337,7 @@ func (c *Cluster) listAllowedResources(
 	if !namespaced {
 		// The resource is not namespaced, everything is allowed
 		resourceClient := c.client.dynamicClient.Resource(gvr)
-		data, err := resourceClient.List(options)
+		data, err := resourceClient.List(context.TODO(), options)
 		if err != nil {
 			return nil, err
 		}
@@ -350,7 +351,7 @@ func (c *Cluster) listAllowedResources(
 	}
 	var result []unstructured.Unstructured
 	for _, ns := range namespaces {
-		data, err := c.client.dynamicClient.Resource(gvr).Namespace(ns).List(options)
+		data, err := c.client.dynamicClient.Resource(gvr).Namespace(ns).List(context.TODO(), options)
 		if err != nil {
 			return result, err
 		}