Skip to content

Commit e5c7adf

Browse files
twz123twz123
authored
Merge pull request #4114 from twz123/bump-kubernetes
Bump Kubernetes to v1.30.0
2 parents aa83b6f + 8c33e97 commit e5c7adf

File tree

13 files changed

+164
-157
lines changed

13 files changed

+164
-157
lines changed

‎.github/workflows/publish-docs-manual.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
version:
6-
description: 'Version tag (e.g."v1.29.4+k0s.0")'
6+
description: 'Version tag (e.g."v1.30.0+k0s.0")'
77
required: true
88

99
env:

‎Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,11 @@ pkg/client/clientset/.client-gen.stamp: .k0sbuild.docker-image.k0s hack/tools/bo
147147
--go-header-file=hack/tools/boilerplate.go.txt \
148148
--input-base='' \
149149
--input=$(subst $(space),$(comma),$(clientset_input_dirs:%=github.com/k0sproject/k0s/%)) \
150-
--output-package=github.com/k0sproject/k0s/pkg/client \
150+
--output-pkg=github.com/k0sproject/k0s/pkg/client \
151151
--clientset-name=clientset \
152-
--output-base="$$gendir/out" \
153-
--trim-path-prefix=github.com/k0sproject/k0s \
152+
--output-dir="$$gendir/out" \
154153
&& { [ ! -e pkg/client/clientset ] || mv -- pkg/client/clientset "$$gendir/old"; } \
155-
&& mv -f -- "$$gendir/out/github.com/k0sproject/k0s/pkg/client/clientset" pkg/client/.
154+
&& mv -f -- "$$gendir/out/clientset" pkg/client/.
156155
touch -- '$@'
157156

158157
codegen_targets += static/zz_generated_assets.go

‎embedded-bins/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
2222
#containerd_build_go_ldflags =
2323
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"
2424

25-
kubernetes_version = 1.29.4
25+
kubernetes_version = 1.30.0
2626
helm_version = 3.11.1
2727
kubernetes_buildimage = $(golang_buildimage)
2828
kubernetes_build_go_tags = "providerless"

‎examples/bootloose-ha-controllers/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-ubuntu18.04
22

33
ADD k0s.service /etc/systemd/system/k0s.service
44

5-
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.4/bin/linux/amd64/kubectl && \
5+
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.0/bin/linux/amd64/kubectl && \
66
chmod +x /usr/local/bin/kubectl
77

88
ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf

‎go.mod

+56-56
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,22 @@ require (
6464

6565
// Kubernetes
6666
require (
67-
k8s.io/api v0.29.4
68-
k8s.io/apiextensions-apiserver v0.29.4
69-
k8s.io/apimachinery v0.29.4
70-
k8s.io/cli-runtime v0.29.4
71-
k8s.io/client-go v0.29.4
72-
k8s.io/cloud-provider v0.29.4
73-
k8s.io/component-base v0.29.4
74-
k8s.io/component-helpers v0.29.4
75-
k8s.io/cri-api v0.29.4
76-
k8s.io/kube-aggregator v0.29.4
77-
k8s.io/kubectl v0.29.4
78-
k8s.io/kubelet v0.29.4
79-
k8s.io/kubernetes v1.29.4
80-
k8s.io/mount-utils v0.29.4
67+
k8s.io/api v0.30.0
68+
k8s.io/apiextensions-apiserver v0.30.0
69+
k8s.io/apimachinery v0.30.0
70+
k8s.io/cli-runtime v0.30.0
71+
k8s.io/client-go v0.30.0
72+
k8s.io/cloud-provider v0.30.0
73+
k8s.io/component-base v0.30.0
74+
k8s.io/component-helpers v0.30.0
75+
k8s.io/cri-api v0.30.0
76+
k8s.io/kube-aggregator v0.30.0
77+
k8s.io/kubectl v0.30.0
78+
k8s.io/kubelet v0.30.0
79+
k8s.io/kubernetes v1.30.0
80+
k8s.io/mount-utils v0.30.0
8181
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
82-
sigs.k8s.io/controller-runtime v0.17.2
82+
sigs.k8s.io/controller-runtime v0.18.0
8383
sigs.k8s.io/yaml v1.4.0
8484
)
8585

@@ -131,7 +131,7 @@ require (
131131
github.com/docker/go-units v0.5.0 // indirect
132132
github.com/dustin/go-humanize v1.0.1 // indirect
133133
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
134-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
134+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
135135
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
136136
github.com/fatih/camelcase v1.0.0 // indirect
137137
github.com/fatih/color v1.13.0 // indirect
@@ -153,7 +153,7 @@ require (
153153
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
154154
github.com/golang/protobuf v1.5.4 // indirect
155155
github.com/google/btree v1.1.2 // indirect
156-
github.com/google/cel-go v0.17.7 // indirect
156+
github.com/google/cel-go v0.17.8 // indirect
157157
github.com/google/certificate-transparency-go v1.1.4 // indirect
158158
github.com/google/gnostic-models v0.6.8 // indirect
159159
github.com/google/gofuzz v1.2.0 // indirect
@@ -215,7 +215,7 @@ require (
215215
github.com/pkg/errors v0.9.1 // indirect
216216
github.com/pmezard/go-difflib v1.0.0 // indirect
217217
github.com/prometheus/client_golang v1.18.0 // indirect
218-
github.com/prometheus/client_model v0.5.0 // indirect
218+
github.com/prometheus/client_model v0.6.0 // indirect
219219
github.com/prometheus/common v0.45.0 // indirect
220220
github.com/prometheus/procfs v0.12.0 // indirect
221221
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
@@ -271,14 +271,14 @@ require (
271271
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
272272
gopkg.in/yaml.v2 v2.4.0 // indirect
273273
gopkg.in/yaml.v3 v3.0.1 // indirect
274-
k8s.io/apiserver v0.29.4 // indirect
275-
k8s.io/controller-manager v0.29.4 // indirect
276-
k8s.io/klog/v2 v2.110.1 // indirect
277-
k8s.io/kms v0.29.4 // indirect
278-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
279-
k8s.io/metrics v0.29.4 // indirect
274+
k8s.io/apiserver v0.30.0 // indirect
275+
k8s.io/controller-manager v0.30.0 // indirect
276+
k8s.io/klog/v2 v2.120.1 // indirect
277+
k8s.io/kms v0.30.0 // indirect
278+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
279+
k8s.io/metrics v0.30.0 // indirect
280280
oras.land/oras-go v1.2.4 // indirect
281-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
281+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
282282
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
283283
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
284284
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect
@@ -288,35 +288,35 @@ require (
288288

289289
// Replacements duplicated from upstream Kubernetes
290290
replace (
291-
// https://github.com/kubernetes/kubernetes/blob/v1.29.4/go.mod#L251-L282
292-
k8s.io/api => k8s.io/api v0.29.4
293-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.4
294-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.4
295-
k8s.io/apiserver => k8s.io/apiserver v0.29.4
296-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.4
297-
k8s.io/client-go => k8s.io/client-go v0.29.4
298-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.4
299-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.4
300-
k8s.io/code-generator => k8s.io/code-generator v0.29.4
301-
k8s.io/component-base => k8s.io/component-base v0.29.4
302-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.4
303-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.4
304-
k8s.io/cri-api => k8s.io/cri-api v0.29.4
305-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.4
306-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.4
307-
k8s.io/endpointslice => k8s.io/endpointslice v0.29.4
308-
k8s.io/kms => k8s.io/kms v0.29.4
309-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.4
310-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.4
311-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.4
312-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.4
313-
k8s.io/kubectl => k8s.io/kubectl v0.29.4
314-
k8s.io/kubelet => k8s.io/kubelet v0.29.4
315-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.4
316-
k8s.io/metrics => k8s.io/metrics v0.29.4
317-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.4
318-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.4
319-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.4
320-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.4
321-
k8s.io/sample-controller => k8s.io/sample-controller v0.29.4
291+
// https://github.com/kubernetes/kubernetes/blob/v1.30.0/go.mod#L239-L270
292+
k8s.io/api => k8s.io/api v0.30.0
293+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
294+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
295+
k8s.io/apiserver => k8s.io/apiserver v0.30.0
296+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
297+
k8s.io/client-go => k8s.io/client-go v0.30.0
298+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
299+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
300+
k8s.io/code-generator => k8s.io/code-generator v0.30.0
301+
k8s.io/component-base => k8s.io/component-base v0.30.0
302+
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0
303+
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0
304+
k8s.io/cri-api => k8s.io/cri-api v0.30.0
305+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
306+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0
307+
k8s.io/endpointslice => k8s.io/endpointslice v0.30.0
308+
k8s.io/kms => k8s.io/kms v0.30.0
309+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
310+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
311+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
312+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
313+
k8s.io/kubectl => k8s.io/kubectl v0.30.0
314+
k8s.io/kubelet => k8s.io/kubelet v0.30.0
315+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
316+
k8s.io/metrics => k8s.io/metrics v0.30.0
317+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0
318+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
319+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
320+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.0
321+
k8s.io/sample-controller => k8s.io/sample-controller v0.30.0
322322
)

0 commit comments

Comments
 (0)