Update dependencies to Kubernetes v1.21.1

kubernetes-sigs · May 27, 2021 · 1828bbe · 1828bbe
1 parent a4a8232
commit 1828bbe
Show file tree

Hide file tree

Showing 8 changed files with 295 additions and 187 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.16.4
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ tidy:
 	go mod tidy
 
 lint:
-	(which $(GOPATH)/bin/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0)
+	(which $(GOPATH)/bin/golangci-lint || go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1)
 	$(GOPATH)/bin/golangci-lint run ./...
 
 test:
@@ -67,7 +67,7 @@ build-with-race-detector:
 verify-kapply-e2e: test-examples-e2e-kapply
 
 $(MYGOBIN)/ginkgo:
-	go get github.com/onsi/ginkgo/ginkgo@v1.14.2
+	go get github.com/onsi/ginkgo/ginkgo@v1.16.2
 
 $(MYGOBIN)/mdrip:
 	go install github.com/monopole/[email protected]

diff --git a/go.mod b/go.mod
@@ -3,28 +3,25 @@ module sigs.k8s.io/cli-utils
 go 1.16
 
 require (
-	github.com/go-errors/errors v1.0.1
-	github.com/go-logr/logr v0.3.0 // indirect
-	github.com/google/uuid v1.1.2
-	github.com/kr/text v0.2.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/onsi/ginkgo v1.14.2
-	github.com/onsi/gomega v1.10.1
+	github.com/go-errors/errors v1.4.0
+	github.com/google/uuid v1.2.0
+	github.com/onsi/ginkgo v1.16.2
+	github.com/onsi/gomega v1.12.0
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.6.1
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+	github.com/spf13/cobra v1.1.3
+	github.com/stretchr/testify v1.7.0
+	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 	gotest.tools v2.2.0+incompatible
-	k8s.io/api v0.20.4
-	k8s.io/apiextensions-apiserver v0.18.10
-	k8s.io/apimachinery v0.20.4
-	k8s.io/cli-runtime v0.20.4
-	k8s.io/client-go v0.20.4
+	k8s.io/api v0.21.1
+	k8s.io/apiextensions-apiserver v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/cli-runtime v0.21.1
+	k8s.io/client-go v0.21.1
 	k8s.io/klog v1.0.0
-	k8s.io/kubectl v0.20.4
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
-	sigs.k8s.io/controller-runtime v0.6.0
-	sigs.k8s.io/kustomize/kyaml v0.10.16
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
+	k8s.io/kubectl v0.21.1
+	k8s.io/utils v0.0.0-20210517184530-5a248b5acedc
+	sigs.k8s.io/controller-runtime v0.9.0-beta.5.0.20210524185538-7181f1162e79
+	sigs.k8s.io/kustomize/kyaml v0.10.17
 	sigs.k8s.io/yaml v1.2.0
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/apply/prune/prune.go b/pkg/apply/prune/prune.go
@@ -196,7 +196,7 @@ func (po *PruneOptions) Prune(localInv inventory.InventoryInfo,
 	}
 	// Final inventory equals applied objects and prune failures.
 	appliedResources := taskContext.AppliedResources()
-	finalInventory := append(appliedResources, pruneFailures...)
+	finalInventory := append(appliedResources, pruneFailures...) //nolint:gocritic
 	return po.InvClient.Replace(localInv, finalInventory)
 }
 

diff --git a/pkg/common/path_test.go b/pkg/common/path_test.go
@@ -79,8 +79,8 @@ metadata:
     name: test-pod-label
 spec:
   containers:
-  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    - name: kubernetes-pause
+      image: k8s.gcr.io/pause:2.0
 `)
 
 var podB = []byte(`
@@ -93,8 +93,8 @@ metadata:
     name: test-pod-label
 spec:
   containers:
-  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    - name: kubernetes-pause
+      image: k8s.gcr.io/pause:2.0
 `)
 
 func buildMultiResourceConfig(configs ...[]byte) []byte {

diff --git a/pkg/kstatus/polling/clusterreader/caching_reader_test.go b/pkg/kstatus/polling/clusterreader/caching_reader_test.go
@@ -15,7 +15,6 @@ import (
 	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/cli-utils/pkg/object"
 	"sigs.k8s.io/cli-utils/pkg/testutil"
@@ -202,12 +201,12 @@ type fakeReader struct {
 	err                 error
 }
 
-func (f *fakeReader) Get(_ context.Context, _ client.ObjectKey, _ runtime.Object) error {
+func (f *fakeReader) Get(_ context.Context, _ client.ObjectKey, _ client.Object) error {
 	return nil
 }
 
 //nolint:gocritic
-func (f *fakeReader) List(_ context.Context, list runtime.Object, opts ...client.ListOption) error {
+func (f *fakeReader) List(_ context.Context, list client.ObjectList, opts ...client.ListOption) error {
 	var namespace string
 	for _, opt := range opts {
 		switch opt := opt.(type) {

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -271,7 +271,7 @@ func newFactory() util.Factory {
 }
 
 func customInvSizeVerifyFunc(c client.Client, name, namespace, _ string, count int) {
-	var u unstructured.UnstructuredList
+	var u unstructured.Unstructured
 	u.SetGroupVersionKind(customprovider.InventoryGVK)
 	err := c.Get(context.TODO(), types.NamespacedName{
 		Name:      name,