Skip to content

Commit fa72ef7

Browse files
Merge pull request #5710 from juanluisvaladas/bump-v1.30.11
[release-1.30]Bump kubernetes to v1.30.11
2 parents 6940c7e + c9454c7 commit fa72ef7

File tree

14 files changed

+111
-111
lines changed

14 files changed

+111
-111
lines changed

embedded-bins/Makefile.variables

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alpine_version = 3.19
22
alpine_patch_version = $(alpine_version).7
33
golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.20
4-
go_version = 1.22.12
4+
go_version = 1.23.7
55

66
runc_version = 1.1.15
77
runc_buildimage = $(golang_buildimage)
@@ -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.30.10
25+
kubernetes_version = 1.30.11
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.30.10/bin/linux/amd64/kubectl && \
5+
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.11/bin/linux/amd64/kubectl && \
66
chmod +x /usr/local/bin/kubectl
77

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

go.mod

+49-49
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ require (
6565

6666
// Kubernetes
6767
require (
68-
k8s.io/api v0.30.10
69-
k8s.io/apiextensions-apiserver v0.30.10
70-
k8s.io/apimachinery v0.30.10
71-
k8s.io/cli-runtime v0.30.10
72-
k8s.io/client-go v0.30.10
73-
k8s.io/cloud-provider v0.30.10
74-
k8s.io/component-base v0.30.10
75-
k8s.io/component-helpers v0.30.10
76-
k8s.io/cri-api v0.30.10
77-
k8s.io/kube-aggregator v0.30.10
78-
k8s.io/kubectl v0.30.10
79-
k8s.io/kubelet v0.30.10
80-
k8s.io/kubernetes v1.30.10
81-
k8s.io/mount-utils v0.30.10
68+
k8s.io/api v0.30.11
69+
k8s.io/apiextensions-apiserver v0.30.11
70+
k8s.io/apimachinery v0.30.11
71+
k8s.io/cli-runtime v0.30.11
72+
k8s.io/client-go v0.30.11
73+
k8s.io/cloud-provider v0.30.11
74+
k8s.io/component-base v0.30.11
75+
k8s.io/component-helpers v0.30.11
76+
k8s.io/cri-api v0.30.11
77+
k8s.io/kube-aggregator v0.30.11
78+
k8s.io/kubectl v0.30.11
79+
k8s.io/kubelet v0.30.11
80+
k8s.io/kubernetes v1.30.11
81+
k8s.io/mount-utils v0.30.11
8282
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
8383
sigs.k8s.io/controller-runtime v0.18.2
8484
sigs.k8s.io/yaml v1.4.0
@@ -274,12 +274,12 @@ require (
274274
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
275275
gopkg.in/yaml.v2 v2.4.0 // indirect
276276
gopkg.in/yaml.v3 v3.0.1 // indirect
277-
k8s.io/apiserver v0.30.10 // indirect
278-
k8s.io/controller-manager v0.30.10 // indirect
277+
k8s.io/apiserver v0.30.11 // indirect
278+
k8s.io/controller-manager v0.30.11 // indirect
279279
k8s.io/klog/v2 v2.120.1 // indirect
280-
k8s.io/kms v0.30.10 // indirect
280+
k8s.io/kms v0.30.11 // indirect
281281
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
282-
k8s.io/metrics v0.30.10 // indirect
282+
k8s.io/metrics v0.30.11 // indirect
283283
oras.land/oras-go v1.2.4 // indirect
284284
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
285285
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
@@ -291,35 +291,35 @@ require (
291291

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

go.sum

+36-36
Original file line numberDiff line numberDiff line change
@@ -924,46 +924,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
924924
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
925925
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
926926
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
927-
k8s.io/api v0.30.10 h1:2YvzRF/BELgCvxbQqFKaan5hnj2+y7JOuqu2WpVk3gg=
928-
k8s.io/api v0.30.10/go.mod h1:Hyz3ZuK7jVLJBUFvwzDSGwxHuDdsrGs5RzF16wfHIn4=
929-
k8s.io/apiextensions-apiserver v0.30.10 h1:Im5wWRzf0L4URt08K41e+Uh2bqkHN8rWH8+gk6+8/wY=
930-
k8s.io/apiextensions-apiserver v0.30.10/go.mod h1:yGWw2UU3WFGLYQjVEs/dgY57U3hNFv1SiT8PrONFZPA=
931-
k8s.io/apimachinery v0.30.10 h1:UflKuJeSSArttm05wjYP0GwpTlvjnMbDKFn6F7rKkKU=
932-
k8s.io/apimachinery v0.30.10/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
933-
k8s.io/apiserver v0.30.10 h1:ozSFhvzw/lauRFFs1auniIoHNVa2hjjkN0/7OYGlfME=
934-
k8s.io/apiserver v0.30.10/go.mod h1:lJtWYEWEDLkQ1zCLFQrjLQ0X19TlXyaa56K92C1a+f4=
935-
k8s.io/cli-runtime v0.30.10 h1:tSvl4yv7VgmZfgZcdjmv8KGD/Bota68pk9ywo1c/mcc=
936-
k8s.io/cli-runtime v0.30.10/go.mod h1:W9/mXoCYtFj/5dFtcUFTLJwhn8jZ6791HAFC8kWpM0s=
937-
k8s.io/client-go v0.30.10 h1:C0oWM82QMvosIl/IdJhWfTUb7rIxM52rNSutFBknAVY=
938-
k8s.io/client-go v0.30.10/go.mod h1:OfTvt0yuo8VpMViOsgvYQb+tMJQLNWVBqXWkzdFXSq4=
939-
k8s.io/cloud-provider v0.30.10 h1:irijCPElYtcA6rVuwBtn8LlNR13CY8ewfMnJ4foPOTg=
940-
k8s.io/cloud-provider v0.30.10/go.mod h1:OWNfg4OCbSe/BNQe9e1seODtfdAp1BTxR/ZkknxHfGA=
941-
k8s.io/component-base v0.30.10 h1:UJi0vTnTvtwWnVHcQeV1hzansnvTSKzFfMxtYAa8/GY=
942-
k8s.io/component-base v0.30.10/go.mod h1:q+6CkRDb/JOlqEpDzmuprysj4R/b/zzQO5vVBRynYQA=
943-
k8s.io/component-helpers v0.30.10 h1:julw9dAWv4vybIbSE/eksTqJrE609LJjyn7V9O1x19c=
944-
k8s.io/component-helpers v0.30.10/go.mod h1:3ID/1BxSX2ML5CLe1KdXitA7SYeSCrz0MXkPcP7M88A=
945-
k8s.io/controller-manager v0.30.10 h1:yEOaypLMR5d3IfwbFhISUfgsXj0kW+ind+XcKjQYe2w=
946-
k8s.io/controller-manager v0.30.10/go.mod h1:HCHIK96kf9/jhCfOE64MpTWjSOQtc4QLtvgBDKapXcg=
947-
k8s.io/cri-api v0.30.10 h1:2wPj1QY2N0j2xgYb2xZ1iQw8XvD4a+wkFSNJ4Rj2/ag=
948-
k8s.io/cri-api v0.30.10/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
927+
k8s.io/api v0.30.11 h1:TpkiTTxQ6GSwHnqKOPeQRRFcBknTjOBwFYjWmn25Z1U=
928+
k8s.io/api v0.30.11/go.mod h1:DZzjCDcat14fMx/4Fm3h5lsbVStfHmgNzNDMy7JQMqU=
929+
k8s.io/apiextensions-apiserver v0.30.11 h1:r0boYooz99DF6wn+myaK92I6oe80DmWSv8gueP+mcWc=
930+
k8s.io/apiextensions-apiserver v0.30.11/go.mod h1:d8Fje2TL9Oc6F48Y84ZlSCP0KQOOM5P6AYoK38WLeCE=
931+
k8s.io/apimachinery v0.30.11 h1:+qV/yXI2R7BxX1zeyELDFb0PopX22znfq5w+icav49k=
932+
k8s.io/apimachinery v0.30.11/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
933+
k8s.io/apiserver v0.30.11 h1:FpNjcxDPIWKL1T6hSG+FBn43GvwnjD10IGATTickA4w=
934+
k8s.io/apiserver v0.30.11/go.mod h1:gYexbWfBUQvIc0V5ieOGaUcJa2euK4J8jpvamwgadlo=
935+
k8s.io/cli-runtime v0.30.11 h1:rJBIprFSmMX61uwFWv07C8+VVeEDRnxAwipP511iWGQ=
936+
k8s.io/cli-runtime v0.30.11/go.mod h1:yQ5Xh33U2NRdYvB3RBKBuLBHz7PrmGsnPSRFExsMnKg=
937+
k8s.io/client-go v0.30.11 h1:yamC5zf/g5ztZO3SELklaOSZKTOAL3Q0v0i6GBvq+Mg=
938+
k8s.io/client-go v0.30.11/go.mod h1:umPRna4oj2zLU03T1m7Cla+yMzRFyhuR+jAbDZNDqlM=
939+
k8s.io/cloud-provider v0.30.11 h1:8oilVoHcTNQK8CF90MPNlr80DOyv7Y3P1P2BzGyu5D4=
940+
k8s.io/cloud-provider v0.30.11/go.mod h1:/fWjPF6tFm2nvIjVaUM3P36OGfRnnrNi2bujFjoqugk=
941+
k8s.io/component-base v0.30.11 h1:y0GDnKad+VFWKlfWqnu3oHKL5eRQ3AC8xBNwLGnMdyc=
942+
k8s.io/component-base v0.30.11/go.mod h1:JSQ3NPwvwGijXtApFqBYtsBitdbfXnwwLJkWuttRMV0=
943+
k8s.io/component-helpers v0.30.11 h1:HE1e73oHh1Qxw6rhHPWkhvMMWMvUOr3K6/BYyxUMGv0=
944+
k8s.io/component-helpers v0.30.11/go.mod h1:aSDI6Pd8Q442AwJHAOlrbeE55U8t5RNBILdAok4L/uY=
945+
k8s.io/controller-manager v0.30.11 h1:zABf3o41nd8L5Lxp1YjhQBhXucKgpFYJ7CBPoE5vKks=
946+
k8s.io/controller-manager v0.30.11/go.mod h1:PJ7eibyG6pE5xzlPMtITuUEdclHIMIG02KUFIB0vJ+8=
947+
k8s.io/cri-api v0.30.11 h1:zv8FysvmBJpWqnN0WWd50GIWvBEoETCERfev65/pWg0=
948+
k8s.io/cri-api v0.30.11/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
949949
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
950950
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
951-
k8s.io/kms v0.30.10 h1:VaoJHFouvS4hGZ1Djusoc9HOksh/02uEspV0Mfy0I/Q=
952-
k8s.io/kms v0.30.10/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
953-
k8s.io/kube-aggregator v0.30.10 h1:UB78dsI/+vCM7ar7cqeUgAsoHy6SPulEQu1OM7IR8zA=
954-
k8s.io/kube-aggregator v0.30.10/go.mod h1:gzTPjaj8Ym2p5lX7tr+nbDl2PZ7zQu8slHpUF7f+oaw=
951+
k8s.io/kms v0.30.11 h1:/aEco3RpkQVq5qvBM1HmxoOreE4C65COMRqwnaNG8ak=
952+
k8s.io/kms v0.30.11/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
953+
k8s.io/kube-aggregator v0.30.11 h1:bAZpbiylNJEX4ILM4P05326Ix3Mxq4OvXhDFvkXRGas=
954+
k8s.io/kube-aggregator v0.30.11/go.mod h1:8EodhwFtVbzmr+oEsYA6WgDsUtkNkng00NFdJxJqDlw=
955955
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
956956
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
957-
k8s.io/kubectl v0.30.10 h1:d/dsbA/JARUcL5wvRGqnjEvsBv7ageTj08PUCIcHwpE=
958-
k8s.io/kubectl v0.30.10/go.mod h1:2Okr39i+LHeK4QinNqy+IGivw8PCUcXIpfSUiZP8Llk=
959-
k8s.io/kubelet v0.30.10 h1:R8pQq2XiQdsAJVco/TyZjWFarM5YZ5uK/ckPd+qt5Ck=
960-
k8s.io/kubelet v0.30.10/go.mod h1:FO8v1212JoblFctyW/V3ZvL8S47sjV71RZLrTvtsiJA=
961-
k8s.io/kubernetes v1.30.10 h1:/x/z+MTfPkKuEjMJwWdRVxNx7xB54GlGWpcFM6KDwZc=
962-
k8s.io/kubernetes v1.30.10/go.mod h1:DGWYRXHx5NhImLiR9FvIVBsOKxwKZOX6bPF/YP7TqHY=
963-
k8s.io/metrics v0.30.10 h1:T9g9CB2CMz2qwJvofNSIvrGmUTkwIaziBtkyS0TDMv4=
964-
k8s.io/metrics v0.30.10/go.mod h1:PeCmZTfT61EfpZfKcXCq9+3Ycf7eFqTWO4PDn2An1r8=
965-
k8s.io/mount-utils v0.30.10 h1:0dUgagHFCY6G/JvPgOKrHDqguDzP3tKThH9VqAQ+ZIs=
966-
k8s.io/mount-utils v0.30.10/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
957+
k8s.io/kubectl v0.30.11 h1:pBk1AzDpndHl9oBfqJS9J2CGYNyik+x/QanXSERM7gE=
958+
k8s.io/kubectl v0.30.11/go.mod h1:a8AoybYsyppPEctupfJk4uaSy9uUWdvNfqRmSzbPPCQ=
959+
k8s.io/kubelet v0.30.11 h1:YIyQ1y+GN2XLbSKWPwnBELRbHKQBhu39gF/dDVeMDnw=
960+
k8s.io/kubelet v0.30.11/go.mod h1:tmoSrMaJHuRHFB/IyQtIAOpWefz1W68CiP6ao54QzfM=
961+
k8s.io/kubernetes v1.30.11 h1:CWMxX1vZT3GcyA2UfsKPTTuOrGrt9MQHqINJfNM1/uc=
962+
k8s.io/kubernetes v1.30.11/go.mod h1:DGWYRXHx5NhImLiR9FvIVBsOKxwKZOX6bPF/YP7TqHY=
963+
k8s.io/metrics v0.30.11 h1:G8+rAXti+TczPzUuHjvqBYTlXbbNYlwMXiapGEZG504=
964+
k8s.io/metrics v0.30.11/go.mod h1:3FIlGaB4JgsztiWhNTZizba6/ChsHgASe01bTL+zQpM=
965+
k8s.io/mount-utils v0.30.11 h1:Pro6d0wgwgTIlkXx+WGL5YPhVY6SHzIabs7zjzS+Prc=
966+
k8s.io/mount-utils v0.30.11/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
967967
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
968968
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
969969
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=

hack/tool/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ require (
9090
golang.org/x/tools v0.20.0 // indirect
9191
gopkg.in/inf.v0 v0.9.1 // indirect
9292
gopkg.in/yaml.v2 v2.4.0 // indirect
93-
k8s.io/apimachinery v0.30.10 // indirect
94-
k8s.io/client-go v0.30.10 // indirect
93+
k8s.io/apimachinery v0.30.11 // indirect
94+
k8s.io/client-go v0.30.11 // indirect
9595
k8s.io/klog/v2 v2.120.1 // indirect
9696
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
9797
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

hack/tool/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
330330
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
331331
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
332332
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
333-
k8s.io/api v0.30.9 h1:yojLzwl7TBV3XusCHXvR2AnowQFVnL9Ui3/wAga3pv4=
334-
k8s.io/api v0.30.9/go.mod h1:FGOLP66cj572P8rjO1H5x5+0vzmvf3bLc8pQlyQeBqk=
335-
k8s.io/apimachinery v0.30.9 h1:wDbY7vSPd3ALl5Fpw0yEiDyW5ozMyCpqsQ6anaCkpII=
336-
k8s.io/apimachinery v0.30.9/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
337-
k8s.io/client-go v0.30.9 h1:nIO9MJIWK/H/rDHT0PikZhEmK0MSK5hyfdT9YMTMMC0=
338-
k8s.io/client-go v0.30.9/go.mod h1:JObO2rfBeqrWn45GNMNnDReUfa6lgP4p+RjRLPJMaE8=
333+
k8s.io/api v0.30.11 h1:TpkiTTxQ6GSwHnqKOPeQRRFcBknTjOBwFYjWmn25Z1U=
334+
k8s.io/api v0.30.11/go.mod h1:DZzjCDcat14fMx/4Fm3h5lsbVStfHmgNzNDMy7JQMqU=
335+
k8s.io/apimachinery v0.30.11 h1:+qV/yXI2R7BxX1zeyELDFb0PopX22znfq5w+icav49k=
336+
k8s.io/apimachinery v0.30.11/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
337+
k8s.io/client-go v0.30.11 h1:yamC5zf/g5ztZO3SELklaOSZKTOAL3Q0v0i6GBvq+Mg=
338+
k8s.io/client-go v0.30.11/go.mod h1:umPRna4oj2zLU03T1m7Cla+yMzRFyhuR+jAbDZNDqlM=
339339
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
340340
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
341341
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

hack/tools/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
controller-gen_version = 0.14.0
22
go-bindata_version = 3.23.0+incompatible
3-
golangci-lint_version = 1.57.1
3+
golangci-lint_version = 1.60.3

inttest/cli/cli_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *CliSuite) TestK0sCliKubectlAndResetCommand() {
6262
s.T().Run("sysinfoSmoketest", func(t *testing.T) {
6363
out, err := ssh.ExecWithOutput(s.Context(), fmt.Sprintf("%s sysinfo", s.K0sFullPath))
6464
assert.NoError(t, err, "k0s sysinfo has non-zero exit code")
65-
t.Logf(out)
65+
t.Log(out)
6666
assert.Regexp(t, "\nOperating system: Linux \\(pass\\)\n", out)
6767
assert.Regexp(t, "\n Linux kernel release: ", out)
6868
assert.Regexp(t, "\n CONFIG_CGROUPS: ", out)

inttest/sonobuoy/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
user: "ubuntu"
6262
uploadBinary: true
6363
k0s:
64-
version: "1.30.10+k0s.0"
64+
version: "1.30.11+k0s.0"
6565
```
6666
6767
To deploy a k0s cluster on the AWS machine, run:
@@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts
9898
.
9999
.
100100
.
101-
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.10+k0s.0
102-
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.10+k0s.0
103-
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.10+k0s.0
101+
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.11+k0s.0
102+
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.11+k0s.0
103+
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.11+k0s.0
104104
INFO ==> Running phase: Configure k0s
105105
WARN [ssh] 63.32.21.232:22: generating default configuration
106106
INFO [ssh] 63.32.21.232:22: validating configuration
@@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready
124124
INFO ==> Running phase: Release exclusive host lock
125125
INFO ==> Running phase: Disconnect from hosts
126126
INFO ==> Finished in 1m42s
127-
INFO k0s cluster version v1.30.10+k0s.0 is now installed
127+
INFO k0s cluster version v1.30.11+k0s.0 is now installed
128128
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
129129
INFO k0sctl kubeconfig
130130
```
@@ -152,7 +152,7 @@ Example Output:
152152
/home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \
153153
--mode=certified-conformance \
154154
--plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" \
155-
--kubernetes-version=v1.30.10
155+
--kubernetes-version=v1.30.11
156156
INFO[0000] create request issued name=sonobuoy namespace= resource=namespaces
157157
INFO[0000] create request issued name=sonobuoy-serviceaccount namespace=sonobuoy resource=serviceaccounts
158158
INFO[0000] create request issued name=sonobuoy-serviceaccount-sonobuoy namespace= resource=clusterrolebindings

inttest/update-server/html/unstable/index.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: unstable
2-
version: v1.30.10+k0s.0
2+
version: v1.30.11+k0s.0
33
downloadURLs:
44
k0s:
55
linux-amd64: ..../k0s-amd64

pkg/apis/k0s/v1beta1/kubeproxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type KubeProxy struct {
4141
}
4242

4343
// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
44-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.10/config/v1alpha1/types.go#L27-L48
44+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.11/config/v1alpha1/types.go#L27-L48
4545
type KubeProxyIPTablesConfiguration struct {
4646
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
4747
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
@@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct {
5151
}
5252

5353
// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
54-
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.10/config/v1alpha1/types.go#L52-L78
54+
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.11/config/v1alpha1/types.go#L52-L78
5555
type KubeProxyIPVSConfiguration struct {
5656
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
5757
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"`

pkg/apis/k0s/v1beta1/storage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func (e *EtcdConfig) GetKeyFilePath(certDir string) string {
245245
func validateRequiredProperties(e *ExternalCluster) []error {
246246
var errors []error
247247

248-
if e.Endpoints == nil || len(e.Endpoints) == 0 {
248+
if len(e.Endpoints) == 0 {
249249
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot be null or empty"))
250250
} else if slices.Contains(e.Endpoints, "") {
251251
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot contain empty strings"))

pkg/constant/constant.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const (
8686
KubePauseContainerImage = "registry.k8s.io/pause"
8787
KubePauseContainerImageVersion = "3.9"
8888
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
89-
KubeProxyImageVersion = "v1.30.10"
89+
KubeProxyImageVersion = "v1.30.11"
9090
CoreDNSImage = "quay.io/k0sproject/coredns"
9191
CoreDNSImageVersion = "1.11.4"
9292
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"

0 commit comments

Comments
 (0)