Merge pull request #671 from cybozu-go/cke-tools-1.27

Update dependencies

.github/workflows/main.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Build CKE
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -31,7 +31,7 @@ jobs:
       SUITE: ${{ matrix.suite }}
       CLUSTER: "cke-cluster.yml"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -97,7 +97,7 @@ jobs:
     name: Compose test
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod

.github/workflows/release-images.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Run sonobuoy
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -42,7 +42,7 @@ jobs:
     needs: sonobuoy
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -68,7 +68,7 @@ jobs:
       image: quay.io/cybozu/golang:1.20-jammy
     needs: release-cke-image
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download sonobuoy test
         uses: actions/download-artifact@v3
         with:

.github/workflows/release-tools.yaml

@@ -8,7 +8,7 @@ jobs:
     name: Release CKE tools image
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod

.github/workflows/sonobuoy.yaml

@@ -6,7 +6,7 @@ jobs:
     name: Run sonobuoy
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod

DEVELOP.md

@@ -3,7 +3,7 @@ How to develop CKE
 
 ## Go environment
 
-Use Go 1.17 or higher.
+Use Go 1.21 or higher.
 
 ## Starting development for a new Kubernetes minor release
 

cluster_test.go

@@ -11,7 +11,7 @@ import (
 	proxyv1alpha1 "k8s.io/kube-proxy/config/v1alpha1"
 	schedulerv1 "k8s.io/kube-scheduler/config/v1"
 	kubeletv1beta1 "k8s.io/kubelet/config/v1beta1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/yaml"
 )
 
@@ -154,7 +154,7 @@ rules:
 		t.Error(`c.Options.ControllerManager.ExtraEnvvar["env1"] != "val1"`)
 	}
 	kubeSchedulerConfig, err := c.Options.Scheduler.MergeConfig(&schedulerv1.KubeSchedulerConfiguration{
-		Parallelism: pointer.Int32(999),
+		Parallelism: ptr.To(int32(999)),
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -858,63 +858,63 @@ func testClusterValidateReboot(t *testing.T) {
 		{
 			name: "zero eviction_timeout_seconds",
 			reboot: Reboot{
-				EvictionTimeoutSeconds: pointer.Int(0),
+				EvictionTimeoutSeconds: ptr.To(0),
 			},
 			wantErr: true,
 		},
 		{
 			name: "positive eviction_timeout_seconds",
 			reboot: Reboot{
-				EvictionTimeoutSeconds: pointer.Int(1),
+				EvictionTimeoutSeconds: ptr.To(1),
 			},
 			wantErr: false,
 		},
 		{
 			name: "negative eviction_timeout_seconds",
 			reboot: Reboot{
-				EvictionTimeoutSeconds: pointer.Int(-1),
+				EvictionTimeoutSeconds: ptr.To(-1),
 			},
 			wantErr: true,
 		},
 		{
 			name: "zero command_timeout_seconds",
 			reboot: Reboot{
-				CommandTimeoutSeconds: pointer.Int(0),
+				CommandTimeoutSeconds: ptr.To(0),
 			},
 			wantErr: false,
 		},
 		{
 			name: "positive command_timeout_seconds",
 			reboot: Reboot{
-				CommandTimeoutSeconds: pointer.Int(1),
+				CommandTimeoutSeconds: ptr.To(1),
 			},
 			wantErr: false,
 		},
 		{
 			name: "negative command_timeout_seconds",
 			reboot: Reboot{
-				CommandTimeoutSeconds: pointer.Int(-1),
+				CommandTimeoutSeconds: ptr.To(-1),
 			},
 			wantErr: true,
 		},
 		{
 			name: "zero max_concurrent_reboots",
 			reboot: Reboot{
-				MaxConcurrentReboots: pointer.Int(0),
+				MaxConcurrentReboots: ptr.To(0),
 			},
 			wantErr: true,
 		},
 		{
 			name: "positive max_concurrent_reboots",
 			reboot: Reboot{
-				MaxConcurrentReboots: pointer.Int(1),
+				MaxConcurrentReboots: ptr.To(1),
 			},
 			wantErr: false,
 		},
 		{
 			name: "negative max_concurrent_reboots",
 			reboot: Reboot{
-				MaxConcurrentReboots: pointer.Int(-1),
+				MaxConcurrentReboots: ptr.To(-1),
 			},
 			wantErr: true,
 		},

go.mod

@@ -1,40 +1,40 @@
 module github.com/cybozu-go/cke
 
-go 1.20
+go 1.21
 
 require (
-	github.com/99designs/gqlgen v0.17.34
+	github.com/99designs/gqlgen v0.17.40
 	github.com/containernetworking/cni v1.1.2
-	github.com/cybozu-go/etcdutil v1.6.4
+	github.com/cybozu-go/etcdutil v1.6.6
 	github.com/cybozu-go/log v1.7.0
-	github.com/cybozu-go/netutil v1.4.4
+	github.com/cybozu-go/netutil v1.4.6
 	github.com/cybozu-go/well v1.11.2
-	github.com/google/go-cmp v0.5.9
-	github.com/hashicorp/vault/api v1.9.2
-	github.com/onsi/ginkgo/v2 v2.11.0
-	github.com/onsi/gomega v1.27.8
+	github.com/google/go-cmp v0.6.0
+	github.com/hashicorp/vault/api v1.10.0
+	github.com/onsi/ginkgo/v2 v2.13.1
+	github.com/onsi/gomega v1.30.0
 	github.com/opencontainers/selinux v1.11.0
-	github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/client_model v0.4.0
-	github.com/prometheus/common v0.44.0
-	github.com/spf13/cobra v1.7.0
+	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_model v0.5.0
+	github.com/prometheus/common v0.45.0
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/vektah/gqlparser/v2 v2.5.6
-	go.etcd.io/etcd/api/v3 v3.5.9
-	go.etcd.io/etcd/client/v3 v3.5.9
-	go.etcd.io/etcd/etcdutl/v3 v3.5.9
+	github.com/vektah/gqlparser/v2 v2.5.10
+	go.etcd.io/etcd/api/v3 v3.5.10
+	go.etcd.io/etcd/client/v3 v3.5.10
+	go.etcd.io/etcd/etcdutl/v3 v3.5.10
 	go.etcd.io/gofail v0.1.0
-	golang.org/x/crypto v0.11.0
-	golang.org/x/term v0.10.0
-	k8s.io/api v0.26.6
-	k8s.io/apimachinery v0.26.6
-	k8s.io/apiserver v0.26.6
-	k8s.io/client-go v0.26.6
-	k8s.io/kube-proxy v0.26.6
-	k8s.io/kube-scheduler v0.26.6
-	k8s.io/kubelet v0.26.6
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106
-	sigs.k8s.io/yaml v1.3.0
+	golang.org/x/crypto v0.15.0
+	golang.org/x/term v0.14.0
+	k8s.io/api v0.27.8
+	k8s.io/apimachinery v0.27.8
+	k8s.io/apiserver v0.27.8
+	k8s.io/client-go v0.27.8
+	k8s.io/kube-proxy v0.27.8
+	k8s.io/kube-scheduler v0.27.8
+	k8s.io/kubelet v0.27.8
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -51,11 +51,11 @@ require (
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
@@ -64,6 +64,7 @@ require (
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -81,16 +82,17 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
-	github.com/prometheus/procfs v0.11.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
+	github.com/sosodev/duration v1.1.0 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -99,38 +101,38 @@ require (
 	github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
-	go.etcd.io/bbolt v1.3.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/v2 v2.305.9 // indirect
-	go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/server/v3 v3.5.9 // indirect
+	go.etcd.io/bbolt v1.3.8 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/client/v2 v2.305.10 // indirect
+	go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
+	go.etcd.io/etcd/server/v3 v3.5.10 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
 	go.opentelemetry.io/otel v1.16.0 // indirect
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.11.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230710151506-e685fd7b542b // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230710151506-e685fd7b542b // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230710151506-e685fd7b542b // indirect
-	google.golang.org/grpc v1.56.2 // indirect
+	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.26.6 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	k8s.io/component-base v0.27.8 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )