Merge pull request #22 from coderanger/upgrade-deps

✨ Make the webhook not stomp on container restartPolicy

Author: coderanger

.github/workflows/main.yml

@@ -12,9 +12,9 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.17
+          go-version: "1.20"
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
@@ -30,17 +30,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.17
+          go-version: "1.20"
       - name: Install Kubebuilder
         id: install-kubebuilder
         run: |
           os=$(go env GOOS)
           arch=$(go env GOARCH)
-          version=2.3.1
-          curl -L https://github.com/kubernetes-sigs/kubebuilder/releases/download/v${version}/kubebuilder_${version}_${os}_${arch}.tar.gz | tar -xz -C /tmp/
-          sudo mv /tmp/kubebuilder_2.3.1_${os}_${arch} /usr/local/kubebuilder
+          version=1.29.3
+          curl -L https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-${version}-${os}-${arch}.tar.gz | tar -xz -C /tmp/
+          sudo mv /tmp/kubebuilder /usr/local/kubebuilder
       - run: make test
 
   build:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.20 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -69,11 +69,7 @@ controller-gen:
 ifeq (, $(shell which controller-gen))
 	@{ \
 	set -e ;\
-	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
-	cd $$CONTROLLER_GEN_TMP_DIR ;\
-	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/[email protected] ;\
-	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
+	go install sigs.k8s.io/controller-tools/cmd/[email protected] ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else

api/v1beta1/zz_generated.deepcopy.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -63,7 +63,7 @@ func migratorReady(targetImage, migratorNamespace, migratorName, apiUrl string)
 		return false, err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return false, err
 	}

cmd/waiter/main.go

@@ -22,7 +22,6 @@ import (
 	"time"
 
 	cu "github.com/coderanger/controller-utils"
-	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
@@ -48,11 +47,6 @@ import (
 
 type migrationsComponent struct{}
 
-type migrationsComponentWatchMap struct {
-	client client.Client
-	log    logr.Logger
-}
-
 func Migrations() *migrationsComponent {
 	return &migrationsComponent{}
 }
@@ -65,33 +59,30 @@ func (comp *migrationsComponent) Setup(ctx *cu.Context, bldr *ctrl.Builder) erro
 	bldr.Owns(&batchv1.Job{})
 	bldr.Watches(
 		&source.Kind{Type: &corev1.Pod{}},
-		&handler.EnqueueRequestsFromMapFunc{ToRequests: &migrationsComponentWatchMap{client: ctx.Client, log: ctx.Log}},
+		handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request {
+			// Obj is a Pod that just got an event, map it back to any matching Migrators.
+			requests := []reconcile.Request{}
+			// Find any Migrator objects that match this pod.
+			migrators, err := utils.ListMatchingMigrators(context.Background(), ctx.Client, obj)
+			if err != nil {
+				ctx.Log.Error(err, "error listing matching migrators")
+				// TODO Metric to track this for alerting.
+				return requests
+			}
+			for _, migrator := range migrators {
+				requests = append(requests, reconcile.Request{
+					NamespacedName: types.NamespacedName{
+						Name:      migrator.Name,
+						Namespace: migrator.Namespace,
+					},
+				})
+			}
+			return requests
+		}),
 	)
 	return nil
 }
 
-// Watch map function used above.
-// Obj is a Pod that just got an event, map it back to any matching Migrators.
-func (m *migrationsComponentWatchMap) Map(obj handler.MapObject) []reconcile.Request {
-	requests := []reconcile.Request{}
-	// Find any Migrator objects that match this pod.
-	migrators, err := utils.ListMatchingMigrators(context.Background(), m.client, obj.Meta)
-	if err != nil {
-		m.log.Error(err, "error listing matching migrators")
-		// TODO Metric to track this for alerting.
-		return requests
-	}
-	for _, migrator := range migrators {
-		requests = append(requests, reconcile.Request{
-			NamespacedName: types.NamespacedName{
-				Name:      migrator.Name,
-				Namespace: migrator.Namespace,
-			},
-		})
-	}
-	return requests
-}
-
 func (comp *migrationsComponent) Reconcile(ctx *cu.Context) (cu.Result, error) {
 	obj := ctx.Object.(*migrationsv1beta1.Migrator)
 
@@ -310,9 +301,9 @@ func (comp *migrationsComponent) Reconcile(ctx *cu.Context) (cu.Result, error) {
 	return cu.Result{}, nil
 }
 
-func (_ *migrationsComponent) findOwners(ctx *cu.Context, obj cu.Object) ([]cu.Object, error) {
+func (_ *migrationsComponent) findOwners(ctx *cu.Context, obj client.Object) ([]client.Object, error) {
 	namespace := obj.GetNamespace()
-	owners := []cu.Object{}
+	owners := []client.Object{}
 	for {
 		owners = append(owners, obj)
 		ref := metav1.GetControllerOfNoCopy(obj)
@@ -329,15 +320,15 @@ func (_ *migrationsComponent) findOwners(ctx *cu.Context, obj cu.Object) ([]cu.O
 			}
 			return nil, errors.Wrapf(err, "error finding object type for owner reference %v", ref)
 		}
-		err = ctx.Client.Get(ctx, types.NamespacedName{Name: ref.Name, Namespace: namespace}, ownerObj)
+		obj = ownerObj.(client.Object)
+		err = ctx.Client.Get(ctx, types.NamespacedName{Name: ref.Name, Namespace: namespace}, obj)
 		if err != nil {
 			// Gracefully handle objects we don't have access to
 			if kerrors.IsForbidden(err) {
 				break
 			}
 			return nil, errors.Wrapf(err, "error finding object type for owner reference %v", ref)
 		}
-		obj = ownerObj.(cu.Object)
 	}
 	// Reverse the slice so it goes top -> bottom.
 	for i, j := 0, len(owners)-1; i < j; i, j = i+1, j-1 {
@@ -346,7 +337,7 @@ func (_ *migrationsComponent) findOwners(ctx *cu.Context, obj cu.Object) ([]cu.O
 	return owners, nil
 }
 
-func (_ *migrationsComponent) findSpecFor(ctx *cu.Context, obj cu.Object) *corev1.PodSpec {
+func (_ *migrationsComponent) findSpecFor(ctx *cu.Context, obj client.Object) *corev1.PodSpec {
 	switch v := obj.(type) {
 	case *corev1.Pod:
 		return &v.Spec
@@ -373,7 +364,7 @@ func (_ *migrationsComponent) findSpecFor(ctx *cu.Context, obj cu.Object) *corev
 	}
 }
 
-func (comp *migrationsComponent) findOwnerSpec(ctx *cu.Context, obj cu.Object) (*corev1.PodSpec, error) {
+func (comp *migrationsComponent) findOwnerSpec(ctx *cu.Context, obj client.Object) (*corev1.PodSpec, error) {
 	owners, err := comp.findOwners(ctx, obj)
 	if err != nil {
 		return nil, err