Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump k8s to 1.23.1 #145

Merged
merged 2 commits into from
Jan 12, 2022
+312 −132
Merged

bump k8s to 1.23.1 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eee09b9
bump k8s to 1.23.1
joelanford Dec 22, 2021
0f77688
use client.Object in controllerutil.SupportsOwnerReference
joelanford Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
26 changes: 13 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
330 changes: 256 additions & 74 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions pkg/sdk/controllerutil/controllerutil.go → ...rnal/sdk/controllerutil/controllerutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
0 ...ntrollerutil/controllerutil_suite_test.go → ...ntrollerutil/controllerutil_suite_test.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...sdk/controllerutil/controllerutil_test.go → ...sdk/controllerutil/controllerutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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"}
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/actionclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/client/actionclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
})
})
Expand All @@ -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())
Expand All @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/actionconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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...))
}
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/client/actionconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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())
})
})

Expand All @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/client_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
Expand Down Expand Up @@ -53,7 +53,7 @@ var _ = BeforeSuite(func(done Done) {
Expect(err).NotTo(HaveOccurred())

crd := testutil.BuildTestCRD(gvk)
_, err = envtest.InstallCRDs(cfg, envtest.CRDInstallOptions{CRDs: []client.Object{&crd}})
_, err = envtest.InstallCRDs(cfg, envtest.CRDInstallOptions{CRDs: []*apiextv1.CustomResourceDefinition{&crd}})
Expect(err).To(BeNil())

close(done)
Expand Down
4 changes: 2 additions & 2 deletions pkg/hook/hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var _ = Describe("Hook", func() {
called = true
return nil
})
Expect(h.Exec(nil, nil, nil)).To(Succeed())
Expect(h.Exec(nil, nil, logr.Discard())).To(Succeed())
Expect(called).To(BeTrue())
})
})
Expand All @@ -46,7 +46,7 @@ var _ = Describe("Hook", func() {
called = true
return nil
})
Expect(h.Exec(nil, release.Release{}, nil)).To(Succeed())
Expect(h.Exec(nil, release.Release{}, logr.Discard())).To(Succeed())
Expect(called).To(BeTrue())
})
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/internal/fake/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ func (c *Controller) Reconcile(_ context.Context, r reconcile.Request) (reconcil
}

func (c Controller) GetLogger() logr.Logger {
return nil
return logr.Discard()
}
2 changes: 1 addition & 1 deletion pkg/manager/namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
var _ = Describe("ConfigureWatchNamespaces", func() {
var (
opts manager.Options
log logr.Logger = &logr.DiscardLogger{}
log = logr.Discard()
)

BeforeEach(func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/internal/hook/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/source"
"sigs.k8s.io/yaml"

"github.com/operator-framework/helm-operator-plugins/internal/sdk/controllerutil"
"github.com/operator-framework/helm-operator-plugins/pkg/hook"
"github.com/operator-framework/helm-operator-plugins/pkg/internal/predicate"
"github.com/operator-framework/helm-operator-plugins/pkg/manifestutil"
"github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
)

func NewDependentResourceWatcher(c controller.Controller, rm meta.RESTMapper) hook.PostHook {
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/internal/hook/hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package hook_test
import (
"strings"

"github.com/go-logr/logr/testing"
"github.com/go-logr/logr"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
sdkhandler "github.com/operator-framework/operator-lib/handler"
Expand All @@ -42,13 +42,13 @@ var _ = Describe("Hook", func() {
rm *meta.DefaultRESTMapper
owner *unstructured.Unstructured
rel *release.Release
log *testing.TestLogger
log logr.Logger
)

BeforeEach(func() {
rm = meta.NewDefaultRESTMapper([]schema.GroupVersion{})
c = &fake.Controller{}
log = &testing.TestLogger{}
log = logr.Discard()
})

Context("with unknown APIs", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/internal/updater/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/operator-framework/helm-operator-plugins/internal/sdk/controllerutil"
"github.com/operator-framework/helm-operator-plugins/pkg/internal/status"
"github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
)

func New(client client.Client) Updater {
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ import (
ctrlpredicate "sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/operator-framework/helm-operator-plugins/internal/sdk/controllerutil"
"github.com/operator-framework/helm-operator-plugins/pkg/annotation"
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
"github.com/operator-framework/helm-operator-plugins/pkg/hook"
"github.com/operator-framework/helm-operator-plugins/pkg/reconciler/internal/conditions"
internalhook "github.com/operator-framework/helm-operator-plugins/pkg/reconciler/internal/hook"
"github.com/operator-framework/helm-operator-plugins/pkg/reconciler/internal/updater"
internalvalues "github.com/operator-framework/helm-operator-plugins/pkg/reconciler/internal/values"
"github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
"github.com/operator-framework/helm-operator-plugins/pkg/values"
)

Expand Down Expand Up @@ -792,7 +792,7 @@ func (r *Reconciler) addDefaults(mgr ctrl.Manager, controllerName string) {
if r.client == nil {
r.client = mgr.GetClient()
}
if r.log == nil {
if r.log.GetSink() == nil {
r.log = ctrl.Log.WithName("controllers").WithName("Helm")
}
if r.actionClientGetter == nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/reconciler_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
Expand Down Expand Up @@ -53,7 +53,7 @@ var _ = BeforeSuite(func(done Done) {
Expect(err).NotTo(HaveOccurred())

crd := testutil.BuildTestCRD(gvk)
_, err = envtest.InstallCRDs(cfg, envtest.CRDInstallOptions{CRDs: []client.Object{&crd}})
_, err = envtest.InstallCRDs(cfg, envtest.CRDInstallOptions{CRDs: []*apiextv1.CustomResourceDefinition{&crd}})
Expect(err).To(BeNil())

close(done)
Expand Down