Merge pull request #75 from ecordell/bumpkube

bump kube to 1.33.1 and update informer interfaces

Author: ecordell

.github/workflows/build-test.yaml

@@ -8,7 +8,7 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - "*"
 env:
-  GO_VERSION: "~1.20.7"
+  GO_VERSION: "~1.24"
 jobs:
   unit:
     name: "Unit"

.github/workflows/lint.yaml

@@ -8,7 +8,7 @@ on:  # yamllint disable-line rule:truthy
   pull_request:
     branches: ["*"]
 env:
-  GO_VERSION: "~1.20.7"
+  GO_VERSION: "~1.24"
 jobs:
   go-lint:
     name: "Lint Go"

.golangci.yaml

@@ -1,20 +1,17 @@
 ---
+version: "2"
 run:
-  timeout: "5m"
-output:
-  sort-results: true
+  allow-parallel-runners: true
 linters:
   enable:
     - "bidichk"
     - "bodyclose"
     - "errcheck"
     - "errname"
     - "errorlint"
-    - "gofumpt"
-    - "goimports"
+    - "gocritic"
     - "goprintffuncname"
     - "gosec"
-    - "gosimple"
     - "govet"
     - "importas"
     - "ineffassign"
@@ -24,11 +21,45 @@ linters:
     - "promlinter"
     - "revive"
     - "rowserrcheck"
+    - "spancheck"
     - "staticcheck"
-    - "stylecheck"
-    - "tenv"
-    - "typecheck"
+    - "tagalign"
+    - "testifylint"
+    - "tparallel"
     - "unconvert"
-    - "unused"
+    - "usetesting"
     - "wastedassign"
     - "whitespace"
+    - "unused"
+  settings:
+    staticcheck:
+      checks:
+        - "all"
+  exclusions:
+    generated: "lax"
+    presets:
+      - "comments"
+      - "common-false-positives"
+      - "legacy"
+      - "std-error-handling"
+formatters:
+  enable:
+    - "gci"
+    - "gofumpt"
+    - "goimports"
+  settings:
+    gci:
+      sections:
+        - "standard"
+        - "default"
+        - "prefix(github.com/authzed)"
+        - "localmodule"
+    goimports:
+      local-prefixes:
+        - "github.com/authzed/controller-idioms"
+  exclusions:
+    generated: "lax"
+    paths:
+      - "third_party$"
+      - "builtin$"
+      - "examples$"

adopt/adopt.go

@@ -24,13 +24,12 @@ import (
 	"context"
 	"strings"
 
+	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/go-logr/logr"
-
 	"github.com/authzed/controller-idioms/handler"
 	"github.com/authzed/controller-idioms/queue"
 	"github.com/authzed/controller-idioms/typed"

adopt/adopt_test.go

@@ -346,7 +346,7 @@ func TestSecretAdopterHandler(t *testing.T) {
 					require.Equal(t, tt.expectCtxSecret, CtxSecret.Value(ctx))
 				}, "testnext"),
 			)
-			ctx := CtxOwnerNN.WithValue(context.Background(), tt.cluster)
+			ctx := CtxOwnerNN.WithValue(t.Context(), tt.cluster)
 			ctx = CtxSecretNN.WithValue(ctx, types.NamespacedName{Namespace: "test", Name: tt.secretName})
 			ctx = QueueOps.WithValue(ctx, ctrls)
 			s.Handle(ctx)

bootstrap/resource.go

@@ -29,7 +29,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // KubeResourceObject is satisfied by any standard kube object.
@@ -40,7 +40,7 @@ type KubeResourceObject interface {
 
 // ResourceFromFile creates a KubeResourceObject with the given config file
 func ResourceFromFile[O KubeResourceObject](ctx context.Context, fieldManager string, gvr schema.GroupVersionResource, dclient dynamic.Interface, configPath string, lastHash uint64) (uint64, error) {
-	if len(configPath) <= 0 {
+	if len(configPath) == 0 {
 		logr.FromContextOrDiscard(ctx).V(4).Info("bootstrap file path not specified")
 		return 0, nil
 	}
@@ -86,7 +86,7 @@ func ResourceFromFile[O KubeResourceObject](ctx context.Context, fieldManager st
 		_, err = dclient.
 			Resource(gvr).
 			Namespace(objectDef.GetNamespace()).
-			Patch(ctx, objectDef.GetName(), types.ApplyPatchType, data, metav1.PatchOptions{FieldManager: fieldManager, Force: pointer.Bool(true)})
+			Patch(ctx, objectDef.GetName(), types.ApplyPatchType, data, metav1.PatchOptions{FieldManager: fieldManager, Force: ptr.To(true)})
 		if err != nil {
 			return hash, err
 		}

bootstrap/resource_test.go

@@ -14,11 +14,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/testing"
-	"k8s.io/klog/v2/klogr"
+	"k8s.io/klog/v2/textlogger"
 )
 
 func ExampleResourceFromFile() {
-	ctx, cancel := context.WithCancel(logr.NewContext(context.Background(), klogr.New()))
+	ctx, cancel := context.WithCancel(logr.NewContext(context.Background(), textlogger.NewLogger(textlogger.NewConfig())))
 	defer cancel()
 
 	secretGVR := corev1.SchemeGroupVersion.WithResource("secrets")

component/ensure_component_test.go

@@ -2,6 +2,7 @@ package component
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -35,7 +36,7 @@ type MyObject struct {
 }
 type MyObjectStatus struct {
 	ObservedGeneration          int64 `json:"observedGeneration,omitempty" protobuf:"varint,3,opt,name=observedGeneration"`
-	conditions.StatusConditions `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+	conditions.StatusConditions `json:"conditions,omitempty"         patchMergeKey:"type"                            patchStrategy:"merge" protobuf:"bytes,1,rep,name=conditions"`
 }
 
 func TestEnsureServiceHandler(t *testing.T) {
@@ -78,7 +79,7 @@ func TestEnsureServiceHandler(t *testing.T) {
 						"example.com/component": "the-main-service-component",
 					},
 					Annotations: map[string]string{
-						hashKey: "n649h58dh598h654hc4hc9hbbh689q",
+						hashKey: "76251aaa1ff6c84f",
 					},
 				}},
 			},
@@ -93,7 +94,7 @@ func TestEnsureServiceHandler(t *testing.T) {
 						"example.com/component": "the-main-service-component",
 					},
 					Annotations: map[string]string{
-						hashKey: "n649h58dh598h654hc4hc9hbbh689q",
+						hashKey: "76251aaa1ff6c84f",
 					},
 				},
 			}, &corev1.Service{ObjectMeta: metav1.ObjectMeta{
@@ -108,7 +109,7 @@ func TestEnsureServiceHandler(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.Background())
+			ctx, cancel := context.WithCancel(t.Context())
 			defer cancel()
 
 			ctrls := &fake.FakeInterface{}
@@ -145,8 +146,9 @@ func TestEnsureServiceHandler(t *testing.T) {
 					hash.NewObjectHash(), hashKey),
 				ctxOwner,
 				queueOps,
-				func(_ context.Context, _ *applycorev1.ServiceApplyConfiguration) (*corev1.Service, error) {
+				func(_ context.Context, sac *applycorev1.ServiceApplyConfiguration) (*corev1.Service, error) {
 					applyCalled = true
+					fmt.Print(sac.Annotations)
 					return nil, nil
 				},
 				func(_ context.Context, _ types.NamespacedName) error {

conditions/conditions.go

@@ -12,7 +12,7 @@ import (
 type StatusConditions struct {
 	// Conditions for the current state of the resource.
 	// +optional
-	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchMergeKey:"type" patchStrategy:"merge" protobuf:"bytes,1,rep,name=conditions"`
 }
 
 // GetStatusConditions returns a pointer to all status conditions.

fileinformer/file_informer.go

@@ -165,10 +165,12 @@ func NewFileSharedIndexInformer(log logr.Logger, fileName string, watcher *fsnot
 func (f *FileSharedIndexInformer) IsStopped() bool { return !f.started }
 
 func (f *FileSharedIndexInformer) AddEventHandler(handler cache.ResourceEventHandler) (cache.ResourceEventHandlerRegistration, error) {
-	return f.AddEventHandlerWithResyncPeriod(handler, f.defaultEventHandlerResyncPeriod)
+	return f.AddEventHandlerWithOptions(handler, cache.HandlerOptions{
+		ResyncPeriod: &f.defaultEventHandlerResyncPeriod,
+	})
 }
 
-func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.ResourceEventHandler, _ time.Duration) (cache.ResourceEventHandlerRegistration, error) {
+func (f *FileSharedIndexInformer) AddEventHandlerWithOptions(handler cache.ResourceEventHandler, _ cache.HandlerOptions) (cache.ResourceEventHandlerRegistration, error) {
 	f.RLock()
 	if f.started {
 		panic("cannot add event handlers after informer has started")
@@ -182,6 +184,12 @@ func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.
 	return nil, nil
 }
 
+func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.ResourceEventHandler, _ time.Duration) (cache.ResourceEventHandlerRegistration, error) {
+	return f.AddEventHandlerWithOptions(handler, cache.HandlerOptions{
+		ResyncPeriod: &f.defaultEventHandlerResyncPeriod,
+	})
+}
+
 // RemoveEventHandler implements cache.SharedInformer
 func (*FileSharedIndexInformer) RemoveEventHandler(_ cache.ResourceEventHandlerRegistration) error {
 	// TODO implement me
@@ -198,6 +206,10 @@ func (f *FileSharedIndexInformer) GetController() cache.Controller {
 	panic("implement me")
 }
 
+func (f *FileSharedIndexInformer) RunWithContext(ctx context.Context) {
+	f.Run(ctx.Done())
+}
+
 func (f *FileSharedIndexInformer) Run(stopCh <-chan struct{}) {
 	f.Do(func() {
 		defer utilruntime.HandleCrash()
@@ -311,6 +323,11 @@ func (f *FileSharedIndexInformer) SetWatchErrorHandler(_ cache.WatchErrorHandler
 	panic("implement me")
 }
 
+func (f *FileSharedIndexInformer) SetWatchErrorHandlerWithContext(_ cache.WatchErrorHandlerWithContext) error {
+	// TODO implement me
+	panic("implement me")
+}
+
 func (f *FileSharedIndexInformer) AddIndexers(_ cache.Indexers) error {
 	// TODO implement me
 	panic("implement me")