Update dependencies to Kubernetes v1.21.1

.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

Makefile

@@ -27,22 +27,22 @@ fmt:
 	go fmt ./...
 
 generate:
-	(which $(GOPATH)/bin/stringer || go get golang.org/x/tools/cmd/stringer)
+	(which $(GOPATH)/bin/stringer || go install golang.org/x/tools/cmd/stringer@a3eb095d6aeed806877423d9ef571b9a50ca8a2a) # latest as of 2021-05-27
 	go generate ./...
 
 license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
+	(which $(GOPATH)/bin/addlicense || go install github.com/google/addlicense@6d92264d717064f28b32464f0f9693a5b4ef0239) # latest as of 2021-05-27
 	$(GOPATH)/bin/addlicense  -y 2020 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .
 
 verify-license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
+	(which $(GOPATH)/bin/addlicense || go install github.com/google/addlicense@6d92264d717064f28b32464f0f9693a5b4ef0239) # latest as of 2021-05-27
 	$(GOPATH)/bin/addlicense  -check .
 
 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 install 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 install github.com/onsi/ginkgo/ginkgo@v1.16.2
 
 $(MYGOBIN)/mdrip:
 	go install github.com/monopole/mdrip@v1.0.2
@@ -84,7 +84,7 @@ test-examples-e2e-kapply: $(MYGOBIN)/mdrip $(MYGOBIN)/kind
 	)
 
 $(MYGOBIN)/kind:
-	go get sigs.k8s.io/kind@v0.9.0
+	go install sigs.k8s.io/kind@v0.11.0
 
 .PHONY: nuke
 nuke: clean

cmd/diff/cmddiff.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/resource"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/cmd/diff"
 	"k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"

cmd/printers/table/collector.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"sync"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/cli-utils/pkg/apply/event"
 	pe "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/status"

examples/alphaTestExamples/inventoryNamespace.md

@@ -99,7 +99,7 @@ expectedOutputLine "1"
 invName=$(kubectl get cm -n test-namespace --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | awk '{print $1}')
 
 # There should be one config map that is not the inventory object
-kubectl get cm -n test-namespace --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm -n test-namespace --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "1"
 
 # ConfigMap cm-a had been created in the cluster

examples/alphaTestExamples/pruneBasic.md

@@ -106,7 +106,7 @@ expectedOutputLine "1"
 # Capture the inventory object name for later testing
 invName=$(kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | awk '{print $1}')
 # There should be three config maps
-kubectl get cm --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "3"
 # ConfigMap cm-a had been created in the cluster
 kubectl get configmap/cm-a --no-headers | wc -l > $OUTPUT/status
@@ -161,7 +161,7 @@ expectedOutputLine "1"
 kubectl get configmap/${invName} --no-headers > $OUTPUT/status
 expectedOutputLine "${invName}"
 # There should be three config maps
-kubectl get cm --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "3"
 # ConfigMap cm-b had been created in the cluster
 kubectl get configmap/cm-b --no-headers | wc -l > $OUTPUT/status

examples/alphaTestExamples/pruneNamespace.md

@@ -124,9 +124,9 @@ invName=$(kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-he
 # There should be four config maps: one inventory in default, two in test-namespace, one in default namespace
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "1"
-kubectl get cm -n test-namespace --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm -n test-namespace --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "2"
-kubectl get cm --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "1"
 # ConfigMap cm-a had been created in the cluster
 kubectl get configmap/cm-a -n test-namespace --no-headers | wc -l > $OUTPUT/status

examples/alphaTestExamples/serverSideApply.md

@@ -93,8 +93,8 @@ expectedOutputLine "2 serverside applied"
 # There should be only one inventory object
 kubectl get cm --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "1"
-# Capture the inventory object name for later testing
-kubectl get cm --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+# There should be two config maps that are not the inventory object
+kubectl get cm --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status
 expectedOutputLine "2"
 # ConfigMap cm-a had been created in the cluster
 kubectl get configmap/cm-a --no-headers | wc -l > $OUTPUT/status

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/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/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/v2 v2.9.0
+	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
 )