Update dependencies

.github/workflows/ci.yaml

@@ -52,9 +52,9 @@ jobs:
     strategy:
       matrix:
         k8s-version:
-          - v1.25.11 # renovate: kindest/node
-          - v1.26.6 # renovate: kindest/node
-          - v1.27.3 # renovate: kindest/node
+          - v1.27.11 # renovate: kindest/node
+          - v1.28.7 # renovate: kindest/node
+          - v1.29.2 # renovate: kindest/node
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3

Makefile

@@ -1,6 +1,6 @@
 # Tool versions
 CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
-ARGOCD_VERSION = 2.6.8
+ARGOCD_VERSION = 2.10.2
 
 # Test tools
 BIN_DIR := $(shell pwd)/bin

README.md

@@ -21,6 +21,8 @@ Cattage supports the following versions:
 
 | Cattage      | Argo CD | Accurate |
 |--------------|---------|----------|
+| 1.2.0        | 2.10.x  | 1.3.x    |
+| 1.1.0        | 2.6.x   | 1.0.x    |
 | 1.0.0        | 2.5.x   | 0.4.x    |
 | 0.1.4        | 2.4.17  | 0.4.x    |
 | 0.1.3        | 2.3.9   | 0.4.x    |

aqua.yaml

@@ -3,17 +3,17 @@
 # https://aquaproj.github.io/
 registries:
   - type: standard
-    ref: v4.23.0 # renovate: depName=aquaproj/aqua-registry
+    ref: v4.150.0 # renovate: depName=aquaproj/aqua-registry
 packages:
-  - name: argoproj/argo-cd@v2.6.8
-  - name: kubernetes/kubectl@v1.27.3
-  - name: kubernetes-sigs/kubebuilder@v3.11.0
-  - name: kubernetes-sigs/kustomize@kustomize/v5.1.0
-  - name: kubernetes-sigs/kind@v0.20.0
-  - name: rust-lang/[email protected].31
-  - name: tilt-dev/[email protected].1
-  - name: tilt-dev/[email protected].20
-  - name: GoogleContainerTools/container-structure-test@v1.15.0
-  - name: mikefarah/yq@v4.34.1
+  - name: argoproj/argo-cd@v2.10.2
+  - name: kubernetes/kubectl@v1.29.2
+  - name: kubernetes-sigs/kubebuilder@v3.14.0
+  - name: kubernetes-sigs/kustomize@kustomize/v5.3.0
+  - name: kubernetes-sigs/kind@v0.22.0
+  - name: rust-lang/[email protected].37
+  - name: tilt-dev/[email protected].11
+  - name: tilt-dev/[email protected].28
+  - name: GoogleContainerTools/container-structure-test@v1.17.0
+  - name: mikefarah/yq@v4.42.1
   - name: clamoriniere/[email protected]
-  - name: kubernetes-sigs/controller-tools/controller-gen@v0.12.0
+  - name: kubernetes-sigs/controller-tools/controller-gen@v0.14.0

cluster.yaml

@@ -7,5 +7,5 @@ apiVersion: ctlptl.dev/v1alpha1
 kind: Cluster
 name: kind-cattage-dev
 product: kind
-kubernetesVersion: v1.27.3 # renovate: kindest/node
+kubernetesVersion: v1.29.2 # renovate: kindest/node
 registry: ctlptl-registry

cmd/cattage-controller/sub/run.go

@@ -4,20 +4,21 @@ import (
 	"fmt"
 	"os"
 
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
 	cattagev1beta1 "github.com/cybozu-go/cattage/api/v1beta1"
 	"github.com/cybozu-go/cattage/controllers"
 	"github.com/cybozu-go/cattage/hooks"
 	"github.com/cybozu-go/cattage/pkg/config"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
@@ -49,14 +50,18 @@ func subMain(ns, addr string, port int) error {
 				Unstructured: true,
 			},
 		},
-		MetricsBindAddress:      options.metricsAddr,
+		Metrics: metricsserver.Options{
+			BindAddress: options.metricsAddr,
+		},
 		HealthProbeBindAddress:  options.probeAddr,
 		LeaderElection:          true,
 		LeaderElectionID:        options.leaderElectionID,
 		LeaderElectionNamespace: ns,
-		Host:                    addr,
-		Port:                    port,
-		CertDir:                 options.certDir,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Host:    addr,
+			Port:    port,
+			CertDir: options.certDir,
+		}),
 	})
 	if err != nil {
 		return fmt.Errorf("unable to start manager: %w", err)

e2e/Makefile

@@ -1,5 +1,5 @@
-KUBERNETES_VERSION = v1.27.3 # renovate: kindest/node
-ARGOCD_VERSION = 2.6.8
+KUBERNETES_VERSION = v1.29.2 # renovate: kindest/node
+ARGOCD_VERSION = 2.10.2
 
 KIND_CONFIG = kind-config.yaml
 export KUBECONFIG

go.mod

@@ -1,75 +1,77 @@
 module github.com/cybozu-go/cattage
 
-go 1.20
+go 1.22
+
+toolchain go1.22.1
 
 require (
-	github.com/google/go-cmp v0.5.9
-	github.com/onsi/ginkgo/v2 v2.11.0
-	github.com/onsi/gomega v1.27.8
-	github.com/spf13/cobra v1.7.0
-	k8s.io/api v0.27.3
-	k8s.io/apimachinery v0.27.3
-	k8s.io/client-go v0.27.3
-	k8s.io/klog/v2 v2.100.1
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106
-	sigs.k8s.io/controller-runtime v0.15.0
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
-	sigs.k8s.io/yaml v1.3.0
+	github.com/google/go-cmp v0.6.0
+	github.com/onsi/ginkgo/v2 v2.16.0
+	github.com/onsi/gomega v1.31.1
+	github.com/spf13/cobra v1.8.0
+	k8s.io/api v0.29.2
+	k8s.io/apimachinery v0.29.2
+	k8s.io/client-go v0.29.2
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
+	sigs.k8s.io/controller-runtime v0.17.2
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-logr/zapr v1.2.4 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.15.1 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.27.2 // indirect
-	k8s.io/component-base v0.27.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+	k8s.io/apiextensions-apiserver v0.29.0 // indirect
+	k8s.io/component-base v0.29.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 )