Skip to content

Commit

Permalink
Merge pull request #5441 from twz123/bump-kubernetes-1.30
Browse files Browse the repository at this point in the history 
[release-1.30] Bump Kubernetes to v1.30.9
  • Loading branch information
@twz123
twz123 authored Jan 17, 2025
2 parents da250d3 + f688fb8 commit dcf3c22
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs-manual.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
inputs:
version:
description: 'Version tag (e.g."v1.30.7+k0s.0")'
description: 'Version tag (e.g."v1.30.9+k0s.0")'
required: true

env:
Expand Down
2 changes: 1 addition & 1 deletion embedded-bins/Makefile.variables
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0
#containerd_build_go_ldflags =
containerd_build_go_ldflags_extra = "-w -s -extldflags=-static"

kubernetes_version = 1.30.7
kubernetes_version = 1.30.9
helm_version = 3.11.1
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
Expand Down
2 changes: 1 addition & 1 deletion examples/bootloose-ha-controllers/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-ubuntu18.04

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

RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.7/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.9/bin/linux/amd64/kubectl && \
chmod +x /usr/local/bin/kubectl

ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf
98 changes: 49 additions & 49 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,20 @@ require (

// Kubernetes
require (
k8s.io/api v0.30.7
k8s.io/apiextensions-apiserver v0.30.7
k8s.io/apimachinery v0.30.7
k8s.io/cli-runtime v0.30.7
k8s.io/client-go v0.30.7
k8s.io/cloud-provider v0.30.7
k8s.io/component-base v0.30.7
k8s.io/component-helpers v0.30.7
k8s.io/cri-api v0.30.7
k8s.io/kube-aggregator v0.30.7
k8s.io/kubectl v0.30.7
k8s.io/kubelet v0.30.7
k8s.io/kubernetes v1.30.7
k8s.io/mount-utils v0.30.7
k8s.io/api v0.30.9
k8s.io/apiextensions-apiserver v0.30.9
k8s.io/apimachinery v0.30.9
k8s.io/cli-runtime v0.30.9
k8s.io/client-go v0.30.9
k8s.io/cloud-provider v0.30.9
k8s.io/component-base v0.30.9
k8s.io/component-helpers v0.30.9
k8s.io/cri-api v0.30.9
k8s.io/kube-aggregator v0.30.9
k8s.io/kubectl v0.30.9
k8s.io/kubelet v0.30.9
k8s.io/kubernetes v1.30.9
k8s.io/mount-utils v0.30.9
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.18.2
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -275,12 +275,12 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.30.7 // indirect
k8s.io/controller-manager v0.30.7 // indirect
k8s.io/apiserver v0.30.9 // indirect
k8s.io/controller-manager v0.30.9 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kms v0.30.7 // indirect
k8s.io/kms v0.30.9 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/metrics v0.30.7 // indirect
k8s.io/metrics v0.30.9 // indirect
oras.land/oras-go v1.2.4 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand All @@ -292,35 +292,35 @@ require (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.30.7/go.mod#L239-L270
k8s.io/api => k8s.io/api v0.30.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.7
k8s.io/apimachinery => k8s.io/apimachinery v0.30.7
k8s.io/apiserver => k8s.io/apiserver v0.30.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.7
k8s.io/client-go => k8s.io/client-go v0.30.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.7
k8s.io/code-generator => k8s.io/code-generator v0.30.7
k8s.io/component-base => k8s.io/component-base v0.30.7
k8s.io/component-helpers => k8s.io/component-helpers v0.30.7
k8s.io/controller-manager => k8s.io/controller-manager v0.30.7
k8s.io/cri-api => k8s.io/cri-api v0.30.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.7
k8s.io/endpointslice => k8s.io/endpointslice v0.30.7
k8s.io/kms => k8s.io/kms v0.30.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.7
k8s.io/kubectl => k8s.io/kubectl v0.30.7
k8s.io/kubelet => k8s.io/kubelet v0.30.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.7
k8s.io/metrics => k8s.io/metrics v0.30.7
k8s.io/mount-utils => k8s.io/mount-utils v0.30.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.7
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.7
k8s.io/sample-controller => k8s.io/sample-controller v0.30.7
// https://github.com/kubernetes/kubernetes/blob/v1.30.9/go.mod#L239-L270
k8s.io/api => k8s.io/api v0.30.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.9
k8s.io/apimachinery => k8s.io/apimachinery v0.30.9
k8s.io/apiserver => k8s.io/apiserver v0.30.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.9
k8s.io/client-go => k8s.io/client-go v0.30.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.9
k8s.io/code-generator => k8s.io/code-generator v0.30.9
k8s.io/component-base => k8s.io/component-base v0.30.9
k8s.io/component-helpers => k8s.io/component-helpers v0.30.9
k8s.io/controller-manager => k8s.io/controller-manager v0.30.9
k8s.io/cri-api => k8s.io/cri-api v0.30.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.9
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.9
k8s.io/endpointslice => k8s.io/endpointslice v0.30.9
k8s.io/kms => k8s.io/kms v0.30.9
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.9
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.9
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.9
k8s.io/kubectl => k8s.io/kubectl v0.30.9
k8s.io/kubelet => k8s.io/kubelet v0.30.9
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.9
k8s.io/metrics => k8s.io/metrics v0.30.9
k8s.io/mount-utils => k8s.io/mount-utils v0.30.9
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.9
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.9
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.9
k8s.io/sample-controller => k8s.io/sample-controller v0.30.9
)
72 changes: 36 additions & 36 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,46 +920,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.30.7 h1:wB2eHI+IptVYsz5WsAQpI6+Dqi3+11wEWBqIh4fh980=
k8s.io/api v0.30.7/go.mod h1:bR0EwbmhYmJvUoeza7ZzBUmYCrVXccQ9JOdfv0BxhH0=
k8s.io/apiextensions-apiserver v0.30.7 h1:YR2iohbfRWmN6q5ukmiFrkKHFAij5Ic4+tSBZu2nvVc=
k8s.io/apiextensions-apiserver v0.30.7/go.mod h1:Uo13fs4VGPuu6SbQ/TTLTExbVQJBGvCtBNtPU526Uj4=
k8s.io/apimachinery v0.30.7 h1:CoQFxvzPFKwU1eJGN/8LgM3ZJBC3hKgvwGqRrL43uIY=
k8s.io/apimachinery v0.30.7/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.30.7 h1:4tKcwejf+OmBniwtXAXvwGce6K+G0Q4s5bWugap4d0Y=
k8s.io/apiserver v0.30.7/go.mod h1:oj6q6jJtJWxHuavNRxFp6nhUxi8UX07HZIFKu1eWYjs=
k8s.io/cli-runtime v0.30.7 h1:XQsBcf0dKk745fklRwD5pc0IdcrPJPgUr+W349VJAV4=
k8s.io/cli-runtime v0.30.7/go.mod h1:B67pZMYMp+7h2Xyy4Yeu4T9OwYvx1UmbRUqxgpCm3vA=
k8s.io/client-go v0.30.7 h1:DQRfuGWxDzxPEyyiTE/fxzAsZcj2p9sbc5671njR52w=
k8s.io/client-go v0.30.7/go.mod h1:oED9+njB91ExCc4BNPAotniB7WH1ig7CmiBx5pVA1yw=
k8s.io/cloud-provider v0.30.7 h1:RNt+A3W9Mz3J5nb5GTDG4jhbLE+VEHnXky4+HN4Tj8c=
k8s.io/cloud-provider v0.30.7/go.mod h1:yuxkkxKZ9GDOHVGD9b912J13X1miaq08N0sc6hosH3k=
k8s.io/component-base v0.30.7 h1:wtbQWLzj5xAGjz+/U/nYNnAc8+wpTUvCqN0uZuCuFF8=
k8s.io/component-base v0.30.7/go.mod h1:UjPOkWiDcvUiQRTpbr3kghl+pFMtFSgqYbWKHKRcXJc=
k8s.io/component-helpers v0.30.7 h1:cue1Oq0242BPbST7TSQld/z7gqNQkAhmDVuMMhJu7Lg=
k8s.io/component-helpers v0.30.7/go.mod h1:f7aE0tdjEIaJ/DPH00kqUnhz+jQHthSUlKKlLbJqX2Q=
k8s.io/controller-manager v0.30.7 h1:4Jo6HDjC2bsY4P8NWxEd40tVZDFnTNk1v1HcmcrejwI=
k8s.io/controller-manager v0.30.7/go.mod h1:pJXE3qdo2wO9C505kkk5T8ra0ZzcxIeZX9pwLnCGqDA=
k8s.io/cri-api v0.30.7 h1:4SRl/zLF+FuzQ6sUkrI5c6U8drlF3xF6/ad/Qs0AMuE=
k8s.io/cri-api v0.30.7/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
k8s.io/api v0.30.9 h1:yojLzwl7TBV3XusCHXvR2AnowQFVnL9Ui3/wAga3pv4=
k8s.io/api v0.30.9/go.mod h1:FGOLP66cj572P8rjO1H5x5+0vzmvf3bLc8pQlyQeBqk=
k8s.io/apiextensions-apiserver v0.30.9 h1:9Z9ADALJhh0iJYm9V4c2Pk+czkO9amMm5CEtafE2gPY=
k8s.io/apiextensions-apiserver v0.30.9/go.mod h1:RNWVgxNEnTaeBHPMiiUB5sb8IjuX98NcOsF85cnJQMg=
k8s.io/apimachinery v0.30.9 h1:wDbY7vSPd3ALl5Fpw0yEiDyW5ozMyCpqsQ6anaCkpII=
k8s.io/apimachinery v0.30.9/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/apiserver v0.30.9 h1:AvRI7YteLGKBTv9nJ/LGz5WlyJr6h1Me4TfqKkSmOvc=
k8s.io/apiserver v0.30.9/go.mod h1:pumPieZ4vKcfQRe8YYIUYyOQIFnCTBp1UXLtbsJWqyo=
k8s.io/cli-runtime v0.30.9 h1:3GM2SBOP6i3aJLis2CoTBaHq/tOlKpKcU08AIvOEMUQ=
k8s.io/cli-runtime v0.30.9/go.mod h1:45qgaqUNFY3PiAakI8LSpWz5wfoh0+0G4SMbI45kPZk=
k8s.io/client-go v0.30.9 h1:nIO9MJIWK/H/rDHT0PikZhEmK0MSK5hyfdT9YMTMMC0=
k8s.io/client-go v0.30.9/go.mod h1:JObO2rfBeqrWn45GNMNnDReUfa6lgP4p+RjRLPJMaE8=
k8s.io/cloud-provider v0.30.9 h1:cjoY8Yjv6jRbZ9ClBBqEQOD4y/jDP6eP5ucCkN40Ekg=
k8s.io/cloud-provider v0.30.9/go.mod h1:hlErhj0ekIDHiO3SfbXDwL8cTqOfqq6adOdNAdvOmZM=
k8s.io/component-base v0.30.9 h1:Zw/Q5esZ1Zj/s5VEyHZMCI41tTtgO2mYLuUtQXimXLg=
k8s.io/component-base v0.30.9/go.mod h1:GWgCrimYzk+Wty984dLEAQ5oYAF7CSDywoMpb62V/6M=
k8s.io/component-helpers v0.30.9 h1:hBqWnzasEfndn0yKc3MpTWn46Mo/A7zrYj06B5VcwR8=
k8s.io/component-helpers v0.30.9/go.mod h1:77gb0dDoZ5XULw0pOelLfQFi7+B+84McfD9e6yH5BUU=
k8s.io/controller-manager v0.30.9 h1:/6M4Ftz3O1/26lCl4W8Y9bv2JxCD3e0vKLnrylNe/+w=
k8s.io/controller-manager v0.30.9/go.mod h1:RH/RtVBCUIilHdIz+lYc/1niuyd3WFGS9GRvOYH+Tas=
k8s.io/cri-api v0.30.9 h1:B7uhtB8GO2y6EZCSo4rhHEviyxtdhFQs4UkTT406hV8=
k8s.io/cri-api v0.30.9/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.30.7 h1:uxqXTHzgpPkr8RSb6zB0NrYOeXfdt5yHyQdFkRNGdz4=
k8s.io/kms v0.30.7/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
k8s.io/kube-aggregator v0.30.7 h1:27uHEqAX9OqteptducIoAPjesrcYWir2QIb1v/btabc=
k8s.io/kube-aggregator v0.30.7/go.mod h1:jWSRAe7kfNaYJ4pzn+9XeobUxZl+nC8huj2ZEAohgAg=
k8s.io/kms v0.30.9 h1:w4bNc7ruJf6PDEfyyeb2fjVuIqMBMMGch5KmE1sCYNA=
k8s.io/kms v0.30.9/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
k8s.io/kube-aggregator v0.30.9 h1:myefdslZWmrI0cjZBQASd4iqv6FWB+ZF1XEdSw/kt1M=
k8s.io/kube-aggregator v0.30.9/go.mod h1:sj0G8io7ZlBQMD229KVH3e57PUCI+i1ihw5kUPYohRk=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/kubectl v0.30.7 h1:K9T8RufI5mKZmX5yITFzAT5I0fx9uheSVtR9OdbmIk4=
k8s.io/kubectl v0.30.7/go.mod h1:VdeIJnZTTkudzbMxkM25Us1MmeLeqhl+Eekt66eg7Ik=
k8s.io/kubelet v0.30.7 h1:SzAV1ehSnW3sTqeUW22Pg4HaRObv7tJ9TI7IHJhVAkk=
k8s.io/kubelet v0.30.7/go.mod h1:TX6TeST2u9xrika8RL8wPG/D8x/ZTz0wT7KrHLIZxIc=
k8s.io/kubernetes v1.30.7 h1:02tPr+FPLzY0J+a14SRBIxSMaTkdmkKNHYibrRtwPVQ=
k8s.io/kubernetes v1.30.7/go.mod h1:hV3c+sqOEO0eVqgSo0KW5dOJ6UjGJ2l3Pd9+Qvft8UI=
k8s.io/metrics v0.30.7 h1:fZu9LVjAq01b1iYRRwYWrxxU8/Uz5ZtUldWTpHEzMXg=
k8s.io/metrics v0.30.7/go.mod h1:vHsk+KI9qaOzogDIN8Kz4ecNJXuvaKjcT6S3vfNXKRU=
k8s.io/mount-utils v0.30.7 h1:yEGuwaYRAO2ylepooPL7D1h0SOd7Nizhgutm/HIjNMs=
k8s.io/mount-utils v0.30.7/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
k8s.io/kubectl v0.30.9 h1:MA/CfDASp4NiifA8u8ZSn4K4U1EkdqaV1Z1JlIuBjEA=
k8s.io/kubectl v0.30.9/go.mod h1:F4jYJtKSNjiHEgUx8kjEOmKK9iVXLc1FQvbCxYECc10=
k8s.io/kubelet v0.30.9 h1:E8YYc/1CsRAXgzFuhAQGA2GnmftESSg/eJkGT1fh0nQ=
k8s.io/kubelet v0.30.9/go.mod h1:j95DrESGPi/QVAZnuLTz5+45He4mF/EqVi9xKiXJyYw=
k8s.io/kubernetes v1.30.9 h1:wo56bPk/+zZcqjiMTWpPuHPyh5vKY/bl75fEKIizneA=
k8s.io/kubernetes v1.30.9/go.mod h1:hV3c+sqOEO0eVqgSo0KW5dOJ6UjGJ2l3Pd9+Qvft8UI=
k8s.io/metrics v0.30.9 h1:aLNpGsZeIOIrTHlO16AsS7AY+Q22O9iod7wouf9qD+w=
k8s.io/metrics v0.30.9/go.mod h1:pMTrEmsoOjBO+Hj9DQmWAyhKH1Py7IaVMonUFMGa0k8=
k8s.io/mount-utils v0.30.9 h1:TJhmRDz0yKWlTHCeDDYsOZSPXQUYV3yDZh0pNpWi9WA=
k8s.io/mount-utils v0.30.9/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
Expand Down
4 changes: 2 additions & 2 deletions hack/tool/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ require (
golang.org/x/tools v0.20.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.30.7 // indirect
k8s.io/client-go v0.30.7 // indirect
k8s.io/apimachinery v0.30.9 // indirect
k8s.io/client-go v0.30.9 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
12 changes: 6 additions & 6 deletions hack/tool/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.30.7 h1:wB2eHI+IptVYsz5WsAQpI6+Dqi3+11wEWBqIh4fh980=
k8s.io/api v0.30.7/go.mod h1:bR0EwbmhYmJvUoeza7ZzBUmYCrVXccQ9JOdfv0BxhH0=
k8s.io/apimachinery v0.30.7 h1:CoQFxvzPFKwU1eJGN/8LgM3ZJBC3hKgvwGqRrL43uIY=
k8s.io/apimachinery v0.30.7/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/client-go v0.30.7 h1:DQRfuGWxDzxPEyyiTE/fxzAsZcj2p9sbc5671njR52w=
k8s.io/client-go v0.30.7/go.mod h1:oED9+njB91ExCc4BNPAotniB7WH1ig7CmiBx5pVA1yw=
k8s.io/api v0.30.9 h1:yojLzwl7TBV3XusCHXvR2AnowQFVnL9Ui3/wAga3pv4=
k8s.io/api v0.30.9/go.mod h1:FGOLP66cj572P8rjO1H5x5+0vzmvf3bLc8pQlyQeBqk=
k8s.io/apimachinery v0.30.9 h1:wDbY7vSPd3ALl5Fpw0yEiDyW5ozMyCpqsQ6anaCkpII=
k8s.io/apimachinery v0.30.9/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/client-go v0.30.9 h1:nIO9MJIWK/H/rDHT0PikZhEmK0MSK5hyfdT9YMTMMC0=
k8s.io/client-go v0.30.9/go.mod h1:JObO2rfBeqrWn45GNMNnDReUfa6lgP4p+RjRLPJMaE8=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
Expand Down
12 changes: 6 additions & 6 deletions inttest/sonobuoy/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
user: "ubuntu"
uploadBinary: true
k0s:
version: "1.30.7+k0s.0"
version: "1.30.9+k0s.0"
```
To deploy a k0s cluster on the AWS machine, run:
Expand Down Expand Up @@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts
.
.
.
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.7+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.7+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.7+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.9+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.9+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.9+k0s.0
INFO ==> Running phase: Configure k0s
WARN [ssh] 63.32.21.232:22: generating default configuration
INFO [ssh] 63.32.21.232:22: validating configuration
Expand All @@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready
INFO ==> Running phase: Release exclusive host lock
INFO ==> Running phase: Disconnect from hosts
INFO ==> Finished in 1m42s
INFO k0s cluster version v1.30.7+k0s.0 is now installed
INFO k0s cluster version v1.30.9+k0s.0 is now installed
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
INFO k0sctl kubeconfig
```
Expand Down Expand Up @@ -152,7 +152,7 @@ Example Output:
/home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \
--mode=certified-conformance \
--plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" \
--kubernetes-version=v1.30.7
--kubernetes-version=v1.30.9
INFO[0000] create request issued name=sonobuoy namespace= resource=namespaces
INFO[0000] create request issued name=sonobuoy-serviceaccount namespace=sonobuoy resource=serviceaccounts
INFO[0000] create request issued name=sonobuoy-serviceaccount-sonobuoy namespace= resource=clusterrolebindings
Expand Down
2 changes: 1 addition & 1 deletion inttest/update-server/html/unstable/index.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: unstable
version: v1.30.7+k0s.0
version: v1.30.9+k0s.0
downloadURLs:
k0s:
linux-amd64: ..../k0s-amd64
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/k0s/v1beta1/kubeproxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type KubeProxy struct {
}

// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.7/config/v1alpha1/types.go#L27-L48
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.9/config/v1alpha1/types.go#L27-L48
type KubeProxyIPTablesConfiguration struct {
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
Expand All @@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct {
}

// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.7/config/v1alpha1/types.go#L52-L78
// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.9/config/v1alpha1/types.go#L52-L78
type KubeProxyIPVSConfiguration struct {
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const (
KubePauseContainerImage = "registry.k8s.io/pause"
KubePauseContainerImageVersion = "3.9"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImageVersion = "v1.30.7"
KubeProxyImageVersion = "v1.30.9"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.11.4"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
Expand Down
4 changes: 2 additions & 2 deletions static/_crds/v1beta1/k0s.k0sproject.io_clusterconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ spec:
iptables:
description: |-
KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.30.7/config/v1alpha1/types.go#L27-L48
@see https://github.com/kubernetes/kube-proxy/blob/v0.30.9/config/v1alpha1/types.go#L27-L48
properties:
localhostNodePorts:
type: boolean
Expand All @@ -564,7 +564,7 @@ spec:
ipvs:
description: |-
KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.30.7/config/v1alpha1/types.go#L52-L78
@see https://github.com/kubernetes/kube-proxy/blob/v0.30.9/config/v1alpha1/types.go#L52-L78
properties:
excludeCIDRs:
items:
Expand Down

0 comments on commit dcf3c22

Please sign in to comment.