Update dependencies

cybozu-go · Mar 8, 2024 · d8be22d · d8be22d
1 parent e4b05f7
commit d8be22d
Show file tree

Hide file tree

Showing 17 changed files with 292 additions and 302 deletions.
diff --git a/.github/workflows/ci.yaml b/.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

diff --git a/Makefile b/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

diff --git a/README.md b/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    |

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/aqua.yaml b/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/mdBook@v0.4.31
-  - name: tilt-dev/tilt@v0.33.1
-  - name: tilt-dev/ctlptl@v0.8.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/mdBook@v0.4.37
+  - name: tilt-dev/tilt@v0.33.11
+  - name: tilt-dev/ctlptl@v0.8.28
+  - name: GoogleContainerTools/container-structure-test@v1.17.0
+  - name: mikefarah/yq@v4.42.1
   - name: clamoriniere/crd-to-markdown@v0.0.3
-  - name: kubernetes-sigs/controller-tools/controller-gen@v0.12.0
+  - name: kubernetes-sigs/controller-tools/controller-gen@v0.14.0
diff --git a/charts/cattage/crds/tenant.yaml b/charts/cattage/crds/tenant.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/name: cattage
   name: tenants.cattage.cybozu.io
@@ -25,10 +25,19 @@ spec:
           description: Tenant is the Schema for the tenants API.
           properties:
             apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              description: |-
+                APIVersion defines the versioned schema of this representation of an object.
+                Servers should convert recognized schemas to the latest internal value, and
+                may reject unrecognized values.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
               type: string
             kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              description: |-
+                Kind is a string value representing the REST resource this object represents.
+                Servers may infer this from the endpoint the client submits requests to.
+                Cannot be updated.
+                In CamelCase.
+                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
               type: string
             metadata:
               type: object
@@ -71,12 +80,16 @@ spec:
                       annotations:
                         additionalProperties:
                           type: string
-                        description: Annotations are the annotations to add to the namespace. This supersedes `namespace.commonAnnotations` in the configuration.
+                        description: |-
+                          Annotations are the annotations to add to the namespace.
+                          This supersedes `namespace.commonAnnotations` in the configuration.
                         type: object
                       labels:
                         additionalProperties:
                           type: string
-                        description: Labels are the labels to add to the namespace. This supersedes `namespace.commonLabels` in the configuration.
+                        description: |-
+                          Labels are the labels to add to the namespace.
+                          This supersedes `namespace.commonLabels` in the configuration.
                         type: object
                       name:
                         description: Name is the name of namespace to be generated.
@@ -95,23 +108,35 @@ spec:
                 conditions:
                   description: Conditions is an array of conditions.
                   items:
-                    description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions.  For example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the observations of a foo's current state.\n\t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    // +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t    // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t    // other fields\n\t}"
                     properties:
                       lastTransitionTime:
-                        description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        description: |-
+                          lastTransitionTime is the last time the condition transitioned from one status to another.
+                          This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
                         format: date-time
                         type: string
                       message:
-                        description: message is a human readable message indicating details about the transition. This may be an empty string.
+                        description: |-
+                          message is a human readable message indicating details about the transition.
+                          This may be an empty string.
                         maxLength: 32768
                         type: string
                       observedGeneration:
-                        description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        description: |-
+                          observedGeneration represents the .metadata.generation that the condition was set based upon.
+                          For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                          with respect to the current state of the instance.
                         format: int64
                         minimum: 0
                         type: integer
                       reason:
-                        description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        description: |-
+                          reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                          Producers of specific condition types may define expected values and meanings for this field,
+                          and whether the values are considered a guaranteed API.
+                          The value should be a CamelCase string.
+                          This field may not be empty.
                         maxLength: 1024
                         minLength: 1
                         pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
@@ -124,7 +149,12 @@ spec:
                           - Unknown
                         type: string
                       type:
-                        description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        description: |-
+                          type of condition in CamelCase or in foo.example.com/CamelCase.
+                          ---
+                          Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
+                          useful (see .node.status.conditions), the ability to deconflict is important.
+                          The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                         maxLength: 316
                         pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                         type: string

diff --git a/cluster.yaml b/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
diff --git a/cmd/cattage-controller/sub/run.go b/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)