build(deps): bump Kubernetes to 1.30

.github/workflows/ci.yaml

@@ -36,9 +36,9 @@ jobs:
     strategy:
       matrix:
         k8s-version:
-        - v1.27.10 # renovate: kindest/node
-        - v1.28.6 # renovate: kindest/node
-        - v1.29.1 # 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

@@ -56,18 +56,17 @@ generate: setup generate-applyconfigurations ## Generate code containing DeepCop
 	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="{./api/...}"
 
 GO_MODULE = $(shell go list -m)
-API_DIRS = $(shell find api -mindepth 2 -type d | sed "s|^|$(shell go list -m)/|" | paste -sd ",")
+API_DIRS = $(shell find api -mindepth 2 -type d | sed "s|^|$(shell go list -m)/|" | paste -sd " ")
 AC_PKG = internal/applyconfigurations
 .PHONY: generate-applyconfigurations
 generate-applyconfigurations: setup ## Generate applyconfigurations to support typesafe SSA.
 	rm -rf $(AC_PKG)
 	@echo ">> generating $(AC_PKG)..."
 	applyconfiguration-gen \
 		--go-header-file 	hack/boilerplate.go.txt \
-		--input-dirs		"$(API_DIRS)" \
-		--output-package  	"$(GO_MODULE)/$(AC_PKG)" \
-		--trim-path-prefix 	"$(GO_MODULE)" \
-		--output-base    	"."
+		--output-dir "$(AC_PKG)" \
+		--output-pkg "$(GO_MODULE)/$(AC_PKG)" \
+		  $(API_DIRS)
 
 .PHONY: apidoc
 apidoc: setup $(wildcard api/*/*_types.go)

aqua.yaml

@@ -7,7 +7,7 @@ registries:
     type: local
     path: registry.yaml
 packages:
-  - name: kubernetes/kubectl@v1.29.1
+  - name: kubernetes/kubectl@v1.30.0
   - name: kubernetes-sigs/kubebuilder@v3.11.0
   - name: kubernetes-sigs/kustomize@kustomize/v5.1.0
   - name: kubernetes-sigs/kind@v0.20.0
@@ -18,5 +18,5 @@ packages:
   - name: helm/helm@v3.12.1
   - name: bitnami-labs/sealed-secrets@v0.22.0
   - name: goreleaser/goreleaser@v1.19.1
-  - name: kubernetes/code-generator/applyconfiguration-gen@v0.28.3
+  - name: kubernetes/code-generator/applyconfiguration-gen@v0.30.0
     registry: local

controllers/subnamespace_controller.go

@@ -13,6 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
 	"k8s.io/client-go/util/workqueue"
 	kstatus "sigs.k8s.io/cli-utils/pkg/kstatus/status"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -125,14 +126,14 @@ func (r *SubNamespaceReconciler) reconcileNS(ctx context.Context, sn *accuratev2
 	if ns.Labels[constants.LabelParent] != sn.Namespace {
 		logger.Info("a conflicting namespace already exists")
 		ac.Status.WithConditions(
-			newStatusCondition(sn.Status.Conditions,
-				metav1.Condition{
-					Type:               string(kstatus.ConditionStalled),
-					Status:             metav1.ConditionTrue,
-					ObservedGeneration: sn.Generation,
-					Reason:             accuratev2alpha1.SubNamespaceConflict,
-					Message:            "Conflicting namespace already exists",
-				}),
+			conditionPatch(sn.Status.Conditions,
+				metav1ac.Condition().
+					WithType(string(kstatus.ConditionStalled)).
+					WithStatus(metav1.ConditionTrue).
+					WithObservedGeneration(sn.Generation).
+					WithReason(accuratev2alpha1.SubNamespaceConflict).
+					WithMessage("Conflicting namespace already exists"),
+			),
 		)
 	}
 
@@ -174,15 +175,19 @@ func (r *SubNamespaceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func newStatusCondition(existingConditions []metav1.Condition, newCondition metav1.Condition) metav1.Condition {
-	existingCondition := meta.FindStatusCondition(existingConditions, newCondition.Type)
-	if existingCondition != nil && existingCondition.Status == newCondition.Status {
-		newCondition.LastTransitionTime = existingCondition.LastTransitionTime
-	}
+func conditionPatch(existingConditions []metav1.Condition, condition *metav1ac.ConditionApplyConfiguration) *metav1ac.ConditionApplyConfiguration {
+	if condition.LastTransitionTime.IsZero() {
+		var lastTransitionTime metav1.Time
+
+		existingCondition := meta.FindStatusCondition(existingConditions, *condition.Type)
+		if existingCondition != nil && existingCondition.Status == *condition.Status {
+			lastTransitionTime = existingCondition.LastTransitionTime
+		} else {
+			lastTransitionTime = metav1.NewTime(time.Now())
+		}
 
-	if newCondition.LastTransitionTime.IsZero() {
-		newCondition.LastTransitionTime = metav1.NewTime(time.Now())
+		condition.WithLastTransitionTime(lastTransitionTime)
 	}
 
-	return newCondition
+	return condition
 }

e2e/Makefile

@@ -1,4 +1,4 @@
-KUBERNETES_VERSION = v1.29.1 # renovate: kindest/node
+KUBERNETES_VERSION = v1.29.2 # renovate: kindest/node
 
 KUBECTL_ACCURATE := $(dir $(shell pwd))/bin/kubectl-accurate
 KUBECONFIG := $(shell pwd)/.kubeconfig

go.mod

@@ -1,27 +1,27 @@
 module github.com/cybozu-go/accurate
 
-go 1.21
+go 1.22.0
 
 require (
 	github.com/go-logr/logr v1.4.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.0
-	github.com/onsi/ginkgo/v2 v2.15.0
-	github.com/onsi/gomega v1.31.1
+	github.com/onsi/ginkgo/v2 v2.17.1
+	github.com/onsi/gomega v1.32.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.26.0
-	k8s.io/api v0.29.1
-	k8s.io/apiextensions-apiserver v0.29.1
-	k8s.io/apimachinery v0.29.1
-	k8s.io/cli-runtime v0.29.1
-	k8s.io/client-go v0.29.1
-	k8s.io/component-base v0.29.1
+	k8s.io/api v0.30.0
+	k8s.io/apiextensions-apiserver v0.30.0
+	k8s.io/apimachinery v0.30.0
+	k8s.io/cli-runtime v0.30.0
+	k8s.io/client-go v0.30.0
+	k8s.io/component-base v0.30.0
 	k8s.io/klog/v2 v2.120.1
 	sigs.k8s.io/cli-utils v0.35.0
-	sigs.k8s.io/controller-runtime v0.17.0
-	sigs.k8s.io/kustomize/api v0.16.0
-	sigs.k8s.io/kustomize/kyaml v0.16.0
+	sigs.k8s.io/controller-runtime v0.18.0
+	sigs.k8s.io/kustomize/api v0.17.1
+	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -31,7 +31,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.2 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -44,7 +44,7 @@ require (
 	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/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e // indirect
@@ -72,22 +72,22 @@ require (
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.17.0 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
-	gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.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/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 )