bump k8s to 1.23.1 (#145)

* bump k8s to 1.23.1

Signed-off-by: Joe Lanford <[email protected]>

* use client.Object in controllerutil.SupportsOwnerReference

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

Makefile

@@ -45,15 +45,13 @@ all: test lint build
 # kubernetes release notes for the minor version you're building tools for.
 ENVTEST_VERSION = $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')
 TESTPKG ?= ./...
-# TODO: Modify this to use setup-envtest binary
 test: build
 	go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 	eval $$(setup-envtest use -p env $(ENVTEST_VERSION)) && go test -race -covermode atomic -coverprofile cover.out $(TESTPKG)
 
 .PHONY: test-sanity
-test-sanity: generate fix ## Test repo formatting, linting, etc.
+test-sanity: generate fix lint ## Test repo formatting, linting, etc.
 	go vet ./...
-	$(SCRIPTS_DIR)/fetch golangci-lint 1.31.0 && $(TOOLS_BIN_DIR)/golangci-lint run
 	git diff --exit-code # diff again to ensure other checks don't change repo
 
 # Build manager binary
@@ -71,7 +69,7 @@ fix:
 # Run various checks against code
 .PHONY: lint
 lint:
-	fetch golangci-lint 1.35.2 && golangci-lint run
+	fetch golangci-lint 1.43.0 && golangci-lint run
 
 .PHONY: release
 release: GORELEASER_ARGS ?= --snapshot --rm-dist --skip-sign

go.mod

@@ -4,30 +4,30 @@ go 1.16
 
 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/go-logr/logr v0.4.0
+	github.com/go-logr/logr v1.2.0
 	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
 	github.com/iancoleman/strcase v0.1.2
 	github.com/kr/text v0.2.0
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.14.0
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.17.0
 	github.com/operator-framework/operator-lib v0.3.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.2.2
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/afero v1.6.0
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	gomodules.xyz/jsonpatch/v2 v2.2.0
 	helm.sh/helm/v3 v3.6.2
-	k8s.io/api v0.22.1
-	k8s.io/apiextensions-apiserver v0.22.1
-	k8s.io/apimachinery v0.22.1
-	k8s.io/cli-runtime v0.22.1
-	k8s.io/client-go v0.22.1
-	k8s.io/kubectl v0.22.1
-	sigs.k8s.io/controller-runtime v0.9.6
+	k8s.io/api v0.23.1
+	k8s.io/apiextensions-apiserver v0.23.1
+	k8s.io/apimachinery v0.23.1
+	k8s.io/cli-runtime v0.23.1
+	k8s.io/client-go v0.23.1
+	k8s.io/kubectl v0.23.1
+	sigs.k8s.io/controller-runtime v0.11.0
 	sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210716121009-fde793f20067
-	sigs.k8s.io/yaml v1.2.0
+	sigs.k8s.io/yaml v1.3.0
 )
 
 replace (

go.sum

@@ -23,7 +23,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -57,7 +56,7 @@ func WaitForDeletion(ctx context.Context, cl client.Reader, o client.Object) err
 	}, ctx.Done())
 }
 
-func SupportsOwnerReference(restMapper meta.RESTMapper, owner, dependent *unstructured.Unstructured) (bool, error) {
+func SupportsOwnerReference(restMapper meta.RESTMapper, owner, dependent client.Object) (bool, error) {
 	ownerGVK := owner.GetObjectKind().GroupVersionKind()
 	ownerMapping, err := restMapper.RESTMapping(ownerGVK.GroupKind(), ownerGVK.Version)
 	if err != nil {

pkg/sdk/controllerutil/controllerutil.go renamed to internal/sdk/controllerutil/controllerutil.go

@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	. "github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
+	. "github.com/operator-framework/helm-operator-plugins/internal/sdk/controllerutil"
 )
 
 var _ = Describe("Controllerutil", func() {
@@ -74,8 +74,8 @@ var _ = Describe("Controllerutil", func() {
 	Describe("SupportsOwnerReference", func() {
 		var (
 			rm              *meta.DefaultRESTMapper
-			owner           *unstructured.Unstructured
-			dependent       *unstructured.Unstructured
+			owner           client.Object
+			dependent       client.Object
 			clusterScoped   = schema.GroupVersionKind{Group: "example.com", Version: "v1", Kind: "ClusterScoped"}
 			namespaceScoped = schema.GroupVersionKind{Group: "example.com", Version: "v1", Kind: "NamespaceScoped"}
 		)

pkg/sdk/controllerutil/controllerutil_suite_test.go renamed to internal/sdk/controllerutil/controllerutil_suite_test.go

@@ -44,8 +44,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
+	"github.com/operator-framework/helm-operator-plugins/internal/sdk/controllerutil"
 	"github.com/operator-framework/helm-operator-plugins/pkg/manifestutil"
-	"github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
 )
 
 type ActionClientGetter interface {
@@ -331,7 +331,7 @@ func (pr *ownerPostRenderer) Run(in *bytes.Buffer) (*bytes.Buffer, error) {
 			return err
 		}
 		u := &unstructured.Unstructured{Object: objMap}
-		useOwnerRef, err := controllerutil.SupportsOwnerReference(pr.rm, pr.owner.(*unstructured.Unstructured), u)
+		useOwnerRef, err := controllerutil.SupportsOwnerReference(pr.rm, pr.owner, u)
 		if err != nil {
 			return err
 		}

pkg/sdk/controllerutil/controllerutil_test.go renamed to internal/sdk/controllerutil/controllerutil_test.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"strconv"
 
+	"github.com/go-logr/logr"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"helm.sh/helm/v3/pkg/action"
@@ -59,7 +60,7 @@ var _ = Describe("ActionClient", func() {
 	})
 	var _ = Describe("NewActionClientGetter", func() {
 		It("should return a valid ActionConfigGetter", func() {
-			actionConfigGetter := NewActionConfigGetter(cfg, rm, nil)
+			actionConfigGetter := NewActionConfigGetter(cfg, rm, logr.Discard())
 			Expect(NewActionClientGetter(actionConfigGetter)).NotTo(BeNil())
 		})
 	})
@@ -85,7 +86,7 @@ var _ = Describe("ActionClient", func() {
 			obj = testutil.BuildTestCR(gvk)
 		})
 		It("should return a valid ActionClient", func() {
-			acg := NewActionClientGetter(NewActionConfigGetter(cfg, rm, nil))
+			acg := NewActionClientGetter(NewActionConfigGetter(cfg, rm, logr.Discard()))
 			ac, err := acg.ActionClientFor(obj)
 			Expect(err).To(BeNil())
 			Expect(ac).NotTo(BeNil())
@@ -103,7 +104,7 @@ var _ = Describe("ActionClient", func() {
 			obj = testutil.BuildTestCR(gvk)
 
 			var err error
-			actionConfigGetter := NewActionConfigGetter(cfg, rm, nil)
+			actionConfigGetter := NewActionConfigGetter(cfg, rm, logr.Discard())
 			acg := NewActionClientGetter(actionConfigGetter)
 			ac, err = acg.ActionClientFor(obj)
 			Expect(err).To(BeNil())

pkg/client/actionclient.go

@@ -60,7 +60,7 @@ func (acg *actionConfigGetter) ActionConfigFor(obj client.Object) (*action.Confi
 
 	// Setup the debug log function that Helm will use
 	debugLog := func(format string, v ...interface{}) {
-		if acg.log != nil {
+		if acg.log.GetSink() != nil {
 			acg.log.V(1).Info(fmt.Sprintf(format, v...))
 		}
 	}

pkg/client/actionclient_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package client
 
 import (
+	"github.com/go-logr/logr"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -28,7 +29,7 @@ import (
 var _ = Describe("ActionConfig", func() {
 	var _ = Describe("NewActionConfigGetter", func() {
 		It("should return a valid ActionConfigGetter", func() {
-			Expect(NewActionConfigGetter(nil, nil, nil)).NotTo(BeNil())
+			Expect(NewActionConfigGetter(nil, nil, logr.Discard())).NotTo(BeNil())
 		})
 	})
 
@@ -41,7 +42,7 @@ var _ = Describe("ActionConfig", func() {
 			rm, err := apiutil.NewDiscoveryRESTMapper(cfg)
 			Expect(err).To(BeNil())
 
-			acg := NewActionConfigGetter(cfg, rm, nil)
+			acg := NewActionConfigGetter(cfg, rm, logr.Discard())
 			ac, err := acg.ActionConfigFor(obj)
 			Expect(err).To(BeNil())
 			Expect(ac).NotTo(BeNil())