Merge pull request #28 from cybozu-go/bumpup_necoperf

Bump necoperf v0.1.3
cybozu-go · Nov 21, 2024 · ee6d750 · ee6d750
2 parents 7b57b4b + 3587005
commit ee6d750
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 22 deletions.
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,4 +1,4 @@
-FROM ghcr.io/cybozu/golang:1.22-jammy as builder
+FROM ghcr.io/cybozu/golang:1.23-jammy as builder
 WORKDIR /work
 COPY go.mod go.mod
 COPY go.sum go.sum

diff --git a/Dockerfile.daemon b/Dockerfile.daemon
@@ -1,5 +1,5 @@
 ARG FLATCAR_VERSION
-FROM ghcr.io/cybozu/golang:1.22-jammy as builder
+FROM ghcr.io/cybozu/golang:1.23-jammy as builder
 
 WORKDIR /work
 COPY go.mod go.mod
@@ -18,6 +18,7 @@ ENV HOME=/home/necoperf
 COPY --from=flatcar /bin/ /bin/
 COPY --from=flatcar /sbin/setcap /sbin/setcap
 COPY --from=flatcar /lib64 /lib64
+COPY --from=flatcar /usr/lib64 /usr/lib64
 COPY --from=flatcar /usr/bin/perf /usr/bin/sleep /usr/bin/
 
 # install perf dependency

diff --git a/Makefile b/Makefile
@@ -4,10 +4,10 @@ BIN_DIR := $(shell pwd)/bin
 ENVTEST ?= $(BIN_DIR)/setup-envtest
 
 # Tool versions
-MDBOOK_VERSION = 0.4.27
-PROTOC_VERSION = 24.2
-PROTOC_GEN_GO_VERSION = 1.31.0
-PROTOC_GEN_GO_GRPC_VERSION = 1.3.0
+MDBOOK_VERSION = 0.4.42
+PROTOC_VERSION = 28.3
+PROTOC_GEN_GO_VERSION = 1.35.2
+PROTOC_GEN_GO_GRPC_VERSION = 1.5.1
 PROTOC_GEN_DOC_VERSION = 1.5.1
 MDBOOK := $(BIN_DIR)/mdbook
 

diff --git a/Makefile.versions b/Makefile.versions
@@ -1,5 +1,5 @@
 E2ETEST_K8S_VERSION  := 1.30.0
 # ref to https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-amd64
-FLATCAR_VERSION := 3815.2.2
-KIND_VERSION := 0.23.0
-KUSTOMIZE_VERSION := 5.4.1
+FLATCAR_VERSION := 4081.0.0
+KIND_VERSION := 0.25.0
+KUSTOMIZE_VERSION := 5.5.0
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/cybozu-go/necoperf
 
-go 1.22.0
-
-toolchain go1.22.6
+go 1.23.3
 
 require (
 	github.com/google/uuid v1.6.0
@@ -88,11 +86,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.30.1 // indirect
 	k8s.io/apiserver v0.30.1 // indirect
-	k8s.io/cli-runtime v0.30.1 // indirect
 	k8s.io/component-base v0.30.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/kubectl v0.30.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

diff --git a/go.sum b/go.sum
@@ -231,24 +231,16 @@ k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
 k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
 k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
 k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
-k8s.io/cli-runtime v0.30.1 h1:kSBBpfrJGS6lllc24KeniI9JN7ckOOJKnmFYH1RpTOw=
-k8s.io/cli-runtime v0.30.1/go.mod h1:zhHgbqI4J00pxb6gM3gJPVf2ysDjhQmQtnTxnMScab8=
 k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
 k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
 k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ=
 k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI=
-k8s.io/cri-api v0.30.0 h1:hZqh3vH5JZdqeAyhD9nPXSbT6GDgrtPJkPiIzhWKVhk=
-k8s.io/cri-api v0.30.0/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
 k8s.io/cri-api v0.30.1 h1:AUM78wiC56B1WJ2c795AS0IG5T57CkEdkn0IuC+miAE=
 k8s.io/cri-api v0.30.1/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY=
-k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0=
-k8s.io/kubernetes v1.30.0 h1:u3Yw8rNlo2NDSGaDpoxoHXLPQnEu1tfqHATKOJe94HY=
-k8s.io/kubernetes v1.30.0/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0=
 k8s.io/kubernetes v1.30.1 h1:XlqS6KslLEA5mQzLK2AJrhr4Z1m8oJfkhHiWJ5lue+I=
 k8s.io/kubernetes v1.30.1/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0=
 k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=