Merge pull request #278 from cybozu-go/update-gomod-202403

Update dependencies
cybozu-go · Mar 22, 2024 · 8776f98 · 8776f98
2 parents e944ba4 + e9227d0
commit 8776f98
Show file tree

Hide file tree

Showing 12 changed files with 3,364 additions and 3,956 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ defaults:
   run:
     working-directory: v2
 env:
-  go-version: "1.21"
+  go-version: "1.22"
   cache-version: 1
 jobs:
   test:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,7 +7,7 @@ defaults:
   run:
     working-directory: v2
 env:
-  go-version: "1.20"
+  go-version: "1.22"
   cache-version: 1
 jobs:
   image:

diff --git a/v2/Dockerfile b/v2/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.21-jammy as build-env
+FROM --platform=$BUILDPLATFORM ghcr.io/cybozu/golang:1.22-jammy as build-env
 
 ARG TARGETARCH
 

diff --git a/v2/Makefile b/v2/Makefile
@@ -2,8 +2,8 @@
 
 IMAGE_TAG := latest
 CONTROLLER_RUNTIME_VERSION := $(shell awk '/sigs\.k8s\.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
-CONTROLLER_TOOLS_VERSION=0.13.0
-PROTOC_VERSION=25.1
+CONTROLLER_TOOLS_VERSION=0.14.0
+PROTOC_VERSION=26.0
 PROTOC_GEN_GO_VERSION := $(shell awk '/google.golang.org\/protobuf/ {print substr($$2, 2)}' go.mod)
 PROTOC_GEN_GO_GRPC_VERSON=1.3.0
 PROTOC_GEN_DOC_VERSION=1.5.1

diff --git a/v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml b/v2/config/crd/bases/coil.cybozu.com_addressblocks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: addressblocks.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -30,14 +30,18 @@ spec:
     name: v2
     schema:
       openAPIV3Schema:
-        description: "AddressBlock is the Schema for the addressblocks API \n The
-          ownerReferences field contains the AddressPool where the block is carved
-          from."
+        description: |-
+          AddressBlock is the Schema for the addressblocks API
+
+
+          The ownerReferences field contains the AddressPool where the block is carved from.
         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
           index:
             description: Index indicates the index of this block from the origin pool
@@ -51,9 +55,12 @@ spec:
             description: IPv6 is an IPv6 subnet address
             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

diff --git a/v2/config/crd/bases/coil.cybozu.com_addresspools.yaml b/v2/config/crd/bases/coil.cybozu.com_addresspools.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: addresspools.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -24,14 +24,19 @@ spec:
         description: AddressPool is the Schema for the addresspools 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
@@ -40,22 +45,25 @@ spec:
             properties:
               blockSizeBits:
                 default: 5
-                description: BlockSizeBits specifies the size of the address blocks
-                  carved from this pool. If this is 5, a block will have 2^5 = 32
-                  addresses.  Default is 5.
+                description: |-
+                  BlockSizeBits specifies the size of the address blocks carved from this pool.
+                  If this is 5, a block will have 2^5 = 32 addresses.  Default is 5.
                 format: int32
                 minimum: 0
                 type: integer
               subnets:
-                description: "Subnets is a list of IPv4, or IPv6, or dual stack IPv4/IPv6
-                  subnets in this pool. All items in the list should be consistent
-                  to have the same set of subnets. For example, if the first item
-                  is an IPv4 subnet, the other items must also be an IPv4 subnet.
-                  \n This field can be updated only by adding subnets to the list."
+                description: |-
+                  Subnets is a list of IPv4, or IPv6, or dual stack IPv4/IPv6 subnets in this pool.
+                  All items in the list should be consistent to have the same set of subnets.
+                  For example, if the first item is an IPv4 subnet, the other items must also be
+                  an IPv4 subnet.
+
+
+                  This field can be updated only by adding subnets to the list.
                 items:
-                  description: SubnetSet defines a IPv4-only or IPv6-only or IPv4/v6
-                    dual stack subnet A dual stack subnet must has the same size subnet
-                    of IPv4 and IPv6.
+                  description: |-
+                    SubnetSet defines a IPv4-only or IPv6-only or IPv4/v6 dual stack subnet
+                    A dual stack subnet must has the same size subnet of IPv4 and IPv6.
                   properties:
                     ipv4:
                       description: IPv4 is an IPv4 subnet like "10.2.0.0/16"

diff --git a/v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml b/v2/config/crd/bases/coil.cybozu.com_blockrequests.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   name: blockrequests.coil.cybozu.com
 spec:
   group: coil.cybozu.com
@@ -17,19 +17,26 @@ spec:
   - name: v2
     schema:
       openAPIV3Schema:
-        description: "BlockRequest is the Schema for the blockrequests API \n The
-          ownerReferences field contains the Node on which coild that created this
-          run."
+        description: |-
+          BlockRequest is the Schema for the blockrequests API
+
+
+          The ownerReferences field contains the Node on which coild that created this run.
         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