Merge pull request #47 from jimmidyson/k8s-0.21-deps

Upgrade to Kubernetes 1.21 dependencies

Author: k8s-ci-robot

.golangci.yml

@@ -18,23 +18,22 @@ linters:
     - dogsled
     - dupl
     - errcheck
+    - exportloopref
     # - funlen # the kubernetes custom storage func signatures will always violate this rule.
     # - gochecknoinits
     - goconst
     - gocritic
     - gocyclo
     - gofmt
     - goimports
-    - golint
     - gosec
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - lll
     - misspell
     - nakedret
-    - scopelint
+    - revive
     - staticcheck
     - structcheck
     - stylecheck

doc.go

@@ -21,5 +21,4 @@ limitations under the License.
 // Note that this package is experimental and a work in progress.  Do not rely on this project for production
 // without first contacting the maintainers at [email protected].
 //
-// nolint:stylecheck,golint
-package apiserver_runtime
+package apiserver_runtime // nolint:stylecheck,revive

go.mod

@@ -5,20 +5,20 @@ module sigs.k8s.io/apiserver-runtime
 go 1.15
 
 require (
-	github.com/go-openapi/spec v0.19.3
-	github.com/golangci/golangci-lint v1.31.0
+	github.com/go-openapi/spec v0.19.5
+	github.com/golangci/golangci-lint v1.41.1
 	github.com/google/gofuzz v1.1.0
 	github.com/rancher/kine v0.4.0
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.6.1
-	k8s.io/api v0.20.5
-	k8s.io/apimachinery v0.20.5
-	k8s.io/apiserver v0.20.5
-	k8s.io/client-go v0.20.5
-	k8s.io/code-generator v0.20.5
-	k8s.io/component-base v0.20.5
+	github.com/stretchr/testify v1.7.0
+	k8s.io/api v0.21.2
+	k8s.io/apimachinery v0.21.2
+	k8s.io/apiserver v0.21.2
+	k8s.io/client-go v0.21.2
+	k8s.io/code-generator v0.21.2
+	k8s.io/component-base v0.21.2
 	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.4.0
-	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
+	k8s.io/klog/v2 v2.8.0
+	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 )

go.sum

@@ -43,11 +43,6 @@ type Connecter = rest.Connecter
 // Go prevents embedded interfaces that implement the same method.
 type CreaterUpdater = rest.CreaterUpdater
 
-// Exporter is an object that knows how to strip a RESTful resource for export. A store should implement this interface
-// if export is generally supported for that type. Errors can still be returned during the actual Export when certain
-// instances of the type are not exportable.
-type Exporter = rest.Exporter
-
 // Getter if implemented will expose GET endpoints for the resource and publish them in the Kubernetes
 // discovery service and OpenAPI.
 //

pkg/builder/resource/resourcerest/interface.go

@@ -8,7 +8,7 @@ import (
 
 type parentStorageContextKeyType string
 
-var parentStorageContextKey parentStorageContextKeyType = ""
+var parentStorageContextKey parentStorageContextKeyType
 
 // WithParentStorage creates a new child context w/ parent storage plumbed
 func WithParentStorage(ctx context.Context, storage rest.StandardStorage) context.Context {

pkg/util/context/context.go

@@ -216,10 +216,7 @@ func run(cmd *exec.Cmd) error {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Stdin = os.Stdin
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
+	return cmd.Run()
 }
 
 func getCmd(cmd string, args ...string) *exec.Cmd {