Merge pull request #3515 from kingdonb/update-kubernetes-go-client

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,54 +8,49 @@ 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 (
 	github.com/docker/docker => github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
-	github.com/fluxcd/helm-operator => github.com/fluxcd/helm-operator v1.2.0
+	github.com/fluxcd/helm-operator => github.com/fluxcd/helm-operator v1.4.0
 	github.com/fluxcd/helm-operator/pkg/install => github.com/fluxcd/helm-operator/pkg/install v0.0.0-20200213151218-f7e487142b46
 )
 
-// Pin kubernetes dependencies to 1.17.17
+// Pin kubernetes dependencies to 1.21.3
 replace (
-	k8s.io/api => k8s.io/api v0.17.17
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.17
-	k8s.io/apimachinery => k8s.io/apimachinery v0.17.17
-	k8s.io/client-go => k8s.io/client-go v0.17.17
-	k8s.io/code-generator => k8s.io/code-generator v0.17.17
+	k8s.io/api => k8s.io/api v0.21.3
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.3
+	k8s.io/client-go => k8s.io/client-go v0.21.3
+	k8s.io/code-generator => k8s.io/code-generator v0.21.3
 )
 
 // github.com/fluxcd/flux/pkg/install lives in this very repository, so use that
 replace github.com/fluxcd/flux/pkg/install => ./pkg/install
 
 require (
 	github.com/Azure/azure-sdk-for-go v38.0.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.9.3 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
 	github.com/Jeffail/gabs v1.4.0
-	github.com/Masterminds/semver/v3 v3.0.3
-	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1
 	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
 	github.com/fluxcd/flux/pkg/install v0.0.0-00010101000000-000000000000
 	github.com/fluxcd/helm-operator v1.2.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-kit/kit v0.9.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
 	github.com/gorilla/websocket v1.4.2
-	github.com/imdario/mergo v0.3.8
+	github.com/imdario/mergo v0.3.11
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/magefile/mage v1.11.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0
@@ -68,22 +63,20 @@ require (
 	github.com/sirupsen/logrus v1.8.0 // indirect
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.7.0
 	github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa
-	github.com/xeipuuv/gojsonschema v1.1.0
+	github.com/xeipuuv/gojsonschema v1.2.0
 	go.mozilla.org/sops/v3 v3.6.1
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
-	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1
+	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.19.8
-	k8s.io/apiextensions-apiserver v0.17.4
-	k8s.io/apimachinery v0.19.8
+	k8s.io/api v0.21.3
+	k8s.io/apiextensions-apiserver v0.20.4
+	k8s.io/apimachinery v0.21.3
 	k8s.io/client-go v11.0.0+incompatible
 	k8s.io/klog v1.0.0
 )