update kubernetes to 1.30.5 (#767)

update kubernetes to 1.30.5
cybozu-go · Sep 25, 2024 · e5eaa10 · e5eaa10
1 parent af338b9
commit e5eaa10
Show file tree

Hide file tree

Showing 14 changed files with 1,364 additions and 213 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,27 +5,15 @@ This project employs a versioning scheme described in [RELEASE.md](RELEASE.md#ve
 
 ## [Unreleased]
 
-## [1.29.0]
+## [1.30.0-rc.1]
 
 ### Changed
 
-- Upgrade Kubernetes to 1.29.7 [#759](https://github.com/cybozu-go/cke/pull/759), [#749](https://github.com/cybozu-go/cke/pull/749), [#750](https://github.com/cybozu-go/cke/pull/750), [#752](https://github.com/cybozu-go/cke/pull/752), [#754](https://github.com/cybozu-go/cke/pull/754)
-- Use docker compose v2 in appropriate way in CI [#764](https://github.com/cybozu-go/cke/pull/764)
-
-## [1.29.0-rc.2]
-
-### Changed
-
-- Upgrade Kubernetes to 1.29.7 [#759](https://github.com/cybozu-go/cke/pull/759)
-
-## [1.29.0-rc.1]
-
-### Changed
-
-- Upgrade for Kubernetes 1.29.6 [#749](https://github.com/cybozu-go/cke/pull/749), [#750](https://github.com/cybozu-go/cke/pull/750), [#752](https://github.com/cybozu-go/cke/pull/752), [#754](https://github.com/cybozu-go/cke/pull/754)
+- Update Kubernetes to 1.30.5 [#767](https://github.com/cybozu-go/cke/pull/767)
 
 ## Ancient changes
 
+- See [release-1.29/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.29/CHANGELOG.md) for changes in CKE 1.29.
 - See [release-1.28/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.28/CHANGELOG.md) for changes in CKE 1.28.
 - See [release-1.27/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.27/CHANGELOG.md) for changes in CKE 1.27.
 - See [release-1.26/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.26/CHANGELOG.md) for changes in CKE 1.26.
@@ -44,7 +32,5 @@ This project employs a versioning scheme described in [RELEASE.md](RELEASE.md#ve
 - See [release-1.13/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.13/CHANGELOG.md) for changes in CKE 1.13.
 - See [release-1.12/CHANGELOG.md](https://github.com/cybozu-go/cke/blob/release-1.12/CHANGELOG.md) for changes in CKE 1.12.
 
-[Unreleased]: https://github.com/cybozu-go/cke/compare/v1.29.0...HEAD
-[1.29.0]: https://github.com/cybozu-go/cke/compare/v1.28.6...v1.29.0
-[1.29.0-rc.2]: https://github.com/cybozu-go/cke/compare/v1.29.0-rc.1...v1.29.0-rc.2
-[1.29.0-rc.1]: https://github.com/cybozu-go/cke/compare/v1.28.6...v1.29.0-rc.1
+[Unreleased]: https://github.com/cybozu-go/cke/compare/v1.30.0-rc.1...HEAD
+[1.30.0-rc.1]: https://github.com/cybozu-go/cke/compare/v1.29.0...v1.30.0-rc.1
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Makefile for cke
 
-ETCD_VERSION = 3.5.14
+ETCD_VERSION = 3.5.15
 
 .PHONY: all
 all: test

diff --git a/RELEASE.md b/RELEASE.md
@@ -43,7 +43,9 @@ It should look like:
 2. Make a branch to release
 
     ```console
-    $ git neco dev "bump-$VERSION"
+    $ git checkout main
+    $ git pull
+    $ git checkout -b "bump-$VERSION"
     ```
 
 3. Update `version.go`.
@@ -52,7 +54,8 @@ It should look like:
 
     ```console
     $ git commit -a -m "Bump version to $VERSION"
-    $ git neco review
+    $ git push -u origin HEAD
+    $ gh pr create -f
     ```
 
 6. When updating to `x.y.0` or its RC, run Sonobuoy test manually and make sure that it has been passed.

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/cybozu-go/cke
 go 1.22.5
 
 require (
-	github.com/99designs/gqlgen v0.17.49
+	github.com/99designs/gqlgen v0.17.50
 	github.com/containernetworking/cni v1.2.3
 	github.com/cybozu-go/etcdutil v1.6.8
 	github.com/cybozu-go/log v1.7.0
@@ -14,7 +14,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.20.2
 	github.com/onsi/gomega v1.34.2
 	github.com/opencontainers/selinux v1.11.0
-	github.com/prometheus/client_golang v1.20.3
+	github.com/prometheus/client_golang v1.20.4
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.59.1
 	github.com/spf13/cobra v1.8.1
@@ -113,7 +113,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.20.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/oauth2 v0.22.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect

diff --git a/go.sum b/go.sum
@@ -40,8 +40,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/99designs/gqlgen v0.17.49 h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ=
-github.com/99designs/gqlgen v0.17.49/go.mod h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0=
+github.com/99designs/gqlgen v0.17.50 h1:c0CggpVl4Eh9jDU8QVB/PRqwDBrJzd2RQYZCO7e+ZRs=
+github.com/99designs/gqlgen v0.17.50/go.mod h1:77/+pVe6zlTsz++oUg2m8VLgzdUPHxjoAG3BxI5y8Rc=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -309,8 +309,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4=
-github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
+github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
@@ -485,8 +485,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

diff --git a/images.go b/images.go
@@ -10,12 +10,12 @@ func (i Image) Name() string {
 
 // Container image definitions
 const (
-	EtcdImage            = Image("ghcr.io/cybozu/etcd:3.5.14.1")
-	KubernetesImage      = Image("ghcr.io/cybozu/kubernetes:1.29.7.1")
-	ToolsImage           = Image("ghcr.io/cybozu-go/cke-tools:1.29.0")
-	PauseImage           = Image("ghcr.io/cybozu/pause:3.9.0.5")
-	CoreDNSImage         = Image("ghcr.io/cybozu/coredns:1.11.1.3")
-	UnboundImage         = Image("ghcr.io/cybozu/unbound:1.20.0.2")
+	EtcdImage            = Image("ghcr.io/cybozu/etcd:3.5.15.1")
+	KubernetesImage      = Image("ghcr.io/cybozu/kubernetes:1.30.5.1")
+	ToolsImage           = Image("ghcr.io/cybozu-go/cke-tools:1.30.0")
+	PauseImage           = Image("ghcr.io/cybozu/pause:3.9.0.6")
+	CoreDNSImage         = Image("ghcr.io/cybozu/coredns:1.11.3.1")
+	UnboundImage         = Image("ghcr.io/cybozu/unbound:1.21.0.1")
 	UnboundExporterImage = Image("ghcr.io/cybozu/unbound_exporter:0.4.6.2")
 )
 

diff --git a/mtest/Makefile b/mtest/Makefile
@@ -1,11 +1,11 @@
 # Makefile for multi-host testing using ginkgo
 
 # tool versions
-MANAGEMENT_ETCD_VERSION = 3.5.14
-VAULT_VERSION = 1.16.0
-K8S_VERSION = 1.29.7
-CONTAINERD_VERSION = 1.7.19
-CRITOOLS_VERSION = 1.30.0
+MANAGEMENT_ETCD_VERSION = 3.5.15
+VAULT_VERSION = 1.17.2
+K8S_VERSION = 1.30.5
+CONTAINERD_VERSION = 1.7.21
+CRITOOLS_VERSION = 1.31.1
 CT_VERSION = 0.9.3
 
 # configuration variables
@@ -36,7 +36,7 @@ export HOST1 HOST2 NODE1 NODE2 NODE3 NODE4 NODE5 NODE6 PLACEMAT GINKGO SUITE
 # non-configuration variables
 MANAGEMENT_ETCD_ARCHIVE := etcd-v$(MANAGEMENT_ETCD_VERSION)-linux-amd64.tar.gz
 VAULT_ARCHIVE := vault_$(VAULT_VERSION)_linux_amd64.zip
-KUBECTL_URL := https://storage.googleapis.com/kubernetes-release/release/v$(K8S_VERSION)/bin/linux/amd64/kubectl
+KUBECTL_URL := https://dl.k8s.io/v$(K8S_VERSION)/bin/linux/amd64/kubectl
 SSH_PRIVKEY = $(realpath ./mtest_key)
 OUTPUT := ./output
 DATA_DIR := $(abspath $(OUTPUT))/data