From dba60831e60a7dc88eebcf3689c2a1c6abbb7aad Mon Sep 17 00:00:00 2001 From: Maho Takara Date: Tue, 19 Nov 2024 07:29:57 +0000 Subject: [PATCH 1/3] Bump up necoperf v0.1.3 --- Dockerfile.cli | 2 +- Dockerfile.daemon | 2 +- Makefile.versions | 4 ++-- go.mod | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile.cli b/Dockerfile.cli index 12a62bd..8c1916f 100644 --- 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 index 659e4fe..791433f 100644 --- 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 diff --git a/Makefile.versions b/Makefile.versions index b0c6f50..4fa728b 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -1,5 +1,5 @@ -E2ETEST_K8S_VERSION := 1.30.0 +E2ETEST_K8S_VERSION := 1.31.2 # ref to https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-amd64 -FLATCAR_VERSION := 3815.2.2 +FLATCAR_VERSION := 4081.0.0 KIND_VERSION := 0.23.0 KUSTOMIZE_VERSION := 5.4.1 diff --git a/go.mod b/go.mod index 5040d7e..74b54fc 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/cybozu-go/necoperf -go 1.22.0 +go 1.23.0 -toolchain go1.22.6 +toolchain go1.23.3 require ( github.com/google/uuid v1.6.0 @@ -17,12 +17,12 @@ require ( golang.org/x/sync v0.8.0 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 - k8s.io/api v0.30.1 - k8s.io/apimachinery v0.30.1 - k8s.io/client-go v0.30.1 - k8s.io/cri-api v0.30.1 - k8s.io/kubernetes v1.30.1 - sigs.k8s.io/controller-runtime v0.18.4 + k8s.io/api v0.31.2 + k8s.io/apimachinery v0.31.2 + k8s.io/client-go v0.31.2 + k8s.io/cri-api v0.31.2 + k8s.io/kubernetes v1.31.2 + sigs.k8s.io/controller-runtime v0.19.1 ) require ( From c18b63d9888f3a4b77462f08dc2e27e22ef807e7 Mon Sep 17 00:00:00 2001 From: Maho Takara Date: Tue, 19 Nov 2024 07:37:20 +0000 Subject: [PATCH 2/3] update k8s ver --- Makefile.versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.versions b/Makefile.versions index 4fa728b..7e36068 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -1,4 +1,4 @@ -E2ETEST_K8S_VERSION := 1.31.2 +E2ETEST_K8S_VERSION := 1.31.0 # ref to https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-amd64 FLATCAR_VERSION := 4081.0.0 KIND_VERSION := 0.23.0 From fe639cef215f8ce1de0672626a558128f6d21bf1 Mon Sep 17 00:00:00 2001 From: Maho Takara Date: Tue, 19 Nov 2024 08:05:56 +0000 Subject: [PATCH 3/3] wrong --- Makefile | 4 ++-- Makefile.versions | 2 +- go.mod | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7a34c22..36bf3a7 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ 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 +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 index 7e36068..be7b988 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -1,4 +1,4 @@ -E2ETEST_K8S_VERSION := 1.31.0 +E2ETEST_K8S_VERSION := 1.30.3 # ref to https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-amd64 FLATCAR_VERSION := 4081.0.0 KIND_VERSION := 0.23.0 diff --git a/go.mod b/go.mod index 74b54fc..f53e91e 100644 --- a/go.mod +++ b/go.mod @@ -17,11 +17,11 @@ require ( golang.org/x/sync v0.8.0 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 - k8s.io/api v0.31.2 - k8s.io/apimachinery v0.31.2 - k8s.io/client-go v0.31.2 - k8s.io/cri-api v0.31.2 - k8s.io/kubernetes v1.31.2 + k8s.io/api v0.30.1 + k8s.io/apimachinery v0.30.1 + k8s.io/client-go v0.30.1 + k8s.io/cri-api v0.30.1 + k8s.io/kubernetes v0.30.1 sigs.k8s.io/controller-runtime v0.19.1 )