Skip to content

Commit

Permalink
Merge pull request #5442 from twz123/bump-kubernetes-1.31
Browse files Browse the repository at this point in the history
Bump Kubernetes to v1.31.5
  • Loading branch information
twz123 authored Jan 17, 2025
2 parents 46b5ee1 + 1391ed2 commit 9e5ad0f
Show file tree
Hide file tree
Showing 12 changed files with 110 additions and 111 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs-manual.yml
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.31.3+k0s.0")'
description: 'Version tag (e.g."v1.31.5+k0s.0")'
required: true

env:
Expand Down
4 changes: 2 additions & 2 deletions cncf/GTR.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,10 @@ k0s project follows closely the upstream Kubernetes release cycle. The only diff
The k0s version string consists of the Kubernetes version and the k0s version. For example:

```text
v1.31.3+k0s.0
v1.31.5+k0s.0
```

The Kubernetes version (1.31.3) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.
The Kubernetes version (1.31.5) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.

## Installation

Expand Down
4 changes: 2 additions & 2 deletions cncf/security-self-assessment.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This document serves as the k0s project [CNCF security self-assessment](https://
| Software | https://github.com/k0sproject/k0s |
| Security Provider | No |
| Languages | Golang |
| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.31.3%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.31.3%2Bk0s.0/spdx.json) |
| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.31.5%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.31.5%2Bk0s.0/spdx.json) |

## Security links

Expand Down Expand Up @@ -139,4 +139,4 @@ The k0s maintainers triage and resolve issues. Security patches and advisories a

[List of known users](https://docs.k0sproject.io/head/adopters/) along with some case studies.

[^1]: The serving and client certs are valid for 1 year per default. Hence upgrading, and thus restarting k0s, at least once a year will rotate the certs automatically.
[^1]: The serving and client certs are valid for 1 year per default. Hence upgrading, and thus restarting k0s, at least once a year will rotate the certs automatically.
2 changes: 1 addition & 1 deletion embedded-bins/Makefile.variables
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.31.3
kubernetes_version = 1.31.5
helm_version = 3.11.1
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
Expand Down
100 changes: 50 additions & 50 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@ require (

// Kubernetes
require (
k8s.io/api v0.31.3
k8s.io/apiextensions-apiserver v0.31.3
k8s.io/apimachinery v0.31.3
k8s.io/cli-runtime v0.31.3
k8s.io/client-go v0.31.3
k8s.io/cloud-provider v0.31.3
k8s.io/cluster-bootstrap v0.31.3
k8s.io/component-base v0.31.3
k8s.io/component-helpers v0.31.3
k8s.io/cri-api v0.31.3
k8s.io/kube-aggregator v0.31.3
k8s.io/kubectl v0.31.3
k8s.io/kubelet v0.31.3
k8s.io/kubernetes v1.31.3
k8s.io/mount-utils v0.31.3
k8s.io/api v0.31.5
k8s.io/apiextensions-apiserver v0.31.5
k8s.io/apimachinery v0.31.5
k8s.io/cli-runtime v0.31.5
k8s.io/client-go v0.31.5
k8s.io/cloud-provider v0.31.5
k8s.io/cluster-bootstrap v0.31.5
k8s.io/component-base v0.31.5
k8s.io/component-helpers v0.31.5
k8s.io/cri-api v0.31.5
k8s.io/kube-aggregator v0.31.5
k8s.io/kubectl v0.31.5
k8s.io/kubelet v0.31.5
k8s.io/kubernetes v1.31.5
k8s.io/mount-utils v0.31.5
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.4
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -271,12 +271,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.31.3 // indirect
k8s.io/controller-manager v0.31.3 // indirect
k8s.io/apiserver v0.31.5 // indirect
k8s.io/controller-manager v0.31.5 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kms v0.31.3 // indirect
k8s.io/kms v0.31.5 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/metrics v0.31.3 // indirect
k8s.io/metrics v0.31.5 // indirect
oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand All @@ -288,35 +288,35 @@ require (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.31.3/go.mod#L227-L258
k8s.io/api => k8s.io/api v0.31.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
k8s.io/apiserver => k8s.io/apiserver v0.31.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
k8s.io/client-go => k8s.io/client-go v0.31.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
k8s.io/code-generator => k8s.io/code-generator v0.31.3
k8s.io/component-base => k8s.io/component-base v0.31.3
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
k8s.io/cri-api => k8s.io/cri-api v0.31.3
k8s.io/cri-client => k8s.io/cri-client v0.31.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
k8s.io/kms => k8s.io/kms v0.31.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
k8s.io/kubectl => k8s.io/kubectl v0.31.3
k8s.io/kubelet => k8s.io/kubelet v0.31.3
k8s.io/metrics => k8s.io/metrics v0.31.3
k8s.io/mount-utils => k8s.io/mount-utils v0.31.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
// https://github.com/kubernetes/kubernetes/blob/v1.31.5/go.mod#L227-L258
k8s.io/api => k8s.io/api v0.31.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.5
k8s.io/apimachinery => k8s.io/apimachinery v0.31.5
k8s.io/apiserver => k8s.io/apiserver v0.31.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.5
k8s.io/client-go => k8s.io/client-go v0.31.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.5
k8s.io/code-generator => k8s.io/code-generator v0.31.5
k8s.io/component-base => k8s.io/component-base v0.31.5
k8s.io/component-helpers => k8s.io/component-helpers v0.31.5
k8s.io/controller-manager => k8s.io/controller-manager v0.31.5
k8s.io/cri-api => k8s.io/cri-api v0.31.5
k8s.io/cri-client => k8s.io/cri-client v0.31.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.5
k8s.io/endpointslice => k8s.io/endpointslice v0.31.5
k8s.io/kms => k8s.io/kms v0.31.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.5
k8s.io/kubectl => k8s.io/kubectl v0.31.5
k8s.io/kubelet => k8s.io/kubelet v0.31.5
k8s.io/metrics => k8s.io/metrics v0.31.5
k8s.io/mount-utils => k8s.io/mount-utils v0.31.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.5
k8s.io/sample-controller => k8s.io/sample-controller v0.31.5
)
76 changes: 38 additions & 38 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -837,48 +837,48 @@ helm.sh/helm/v3 v3.16.4 h1:rBn/h9MACw+QlhxQTjpl8Ifx+VTWaYsw3rguGBYBzr0=
helm.sh/helm/v3 v3.16.4/go.mod h1:k8QPotUt57wWbi90w3LNmg3/MWcLPigVv+0/X4B8BzA=
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.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
k8s.io/cli-runtime v0.31.3 h1:fEQD9Xokir78y7pVK/fCJN090/iYNrLHpFbGU4ul9TI=
k8s.io/cli-runtime v0.31.3/go.mod h1:Q2jkyTpl+f6AtodQvgDI8io3jrfr+Z0LyQBPJJ2Btq8=
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
k8s.io/cloud-provider v0.31.3 h1:7C3CHQUUwnv/HWWVIaibZH06iPg663RYQ6C6Zy4FnO8=
k8s.io/cloud-provider v0.31.3/go.mod h1:c7csKppoVb9Ej6upJ28AvHy4B3BtlRMzXfgezsDdPKw=
k8s.io/cluster-bootstrap v0.31.3 h1:O1Yxk1bLaxZvmQCXLaJjj5iJD+lVMfJdRUuKgbUHPlA=
k8s.io/cluster-bootstrap v0.31.3/go.mod h1:TI6TCsQQB4FfcryWgNO3SLXSKWBqHjx4DfyqSFwixj8=
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
k8s.io/component-helpers v0.31.3 h1:0zGPD2PrekhFWgmz85XxlMEl7dfhlKC1tERZDe3onQc=
k8s.io/component-helpers v0.31.3/go.mod h1:HZ1HZx2TKXM7xSUV2cR9L5yDoyZPhhHQNaE3BPBLPUQ=
k8s.io/controller-manager v0.31.3 h1:TyUav69iNYwLGwA96JDhusoZoGRdh1sdrLjXmWTcPgs=
k8s.io/controller-manager v0.31.3/go.mod h1:yuhec+dbXmBz+4c32kxJxmcauB+1pjO2ttfYODWuv18=
k8s.io/cri-api v0.31.3 h1:dsZXzrGrCEwHjsTDlAV7rutEplpMLY8bfNRMIqrtXjo=
k8s.io/cri-api v0.31.3/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E=
k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk=
k8s.io/apiextensions-apiserver v0.31.5 h1:50+b/hHx4nyvQ+gaFH7p5myPEZyekGhGGAQb4vnBUlQ=
k8s.io/apiextensions-apiserver v0.31.5/go.mod h1:6vZ7IIlk3l7GSFcbaNz5CEYpUBLsQ0ee+LgLGOsExWQ=
k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU=
k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.5 h1:n0daI1zIb+G2Jkzqjm2NQJSJfTKccgFeHHQM4LYsz7E=
k8s.io/apiserver v0.31.5/go.mod h1:SboTZ2NHCsXjAHqTrE/kDTnrzquVY5mDKNnoCdRFLJw=
k8s.io/cli-runtime v0.31.5 h1:d8Q1CW6u8DWlU+wZgs7gQXeEl5J9rAHU4uDUz2uFtFY=
k8s.io/cli-runtime v0.31.5/go.mod h1:8zdTB5+NadarkrlOLzboMNxBjrTs6O2alRIokk9mzEY=
k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0=
k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU=
k8s.io/cloud-provider v0.31.5 h1:2uzN7bO1KjKLFr3BvjVZfgVIR0Cxc4m10RKP65FwGUs=
k8s.io/cloud-provider v0.31.5/go.mod h1:TNZnihtjhQzENg9HtIzEpKHAQs0U73XHRW+BAoxzIS0=
k8s.io/cluster-bootstrap v0.31.5 h1:Y0ifYM7FmtyjYXcc6LOffu2SUz/kCi7+LVyr7gze+w4=
k8s.io/cluster-bootstrap v0.31.5/go.mod h1:+1q2sfS06EM4Nsovdift0/6nGxZ3xFoFC4yvWf7+y7E=
k8s.io/component-base v0.31.5 h1:kpFiy1hI7F4Owp+o59H2CVLzmN94qwcPz+2L6wRhkqM=
k8s.io/component-base v0.31.5/go.mod h1:OiiusrmcLz42i9VvcAd94yQIN7UzQHJxN/hXxwYzj6E=
k8s.io/component-helpers v0.31.5 h1:4CGg9/+RLbeM2r5nPyoyocsAteXRGHs4yv23yBdw7KE=
k8s.io/component-helpers v0.31.5/go.mod h1:E2i3XIrLFiGUdTOTrJvKPlDs9eVja4vm+N4nDk6XTRw=
k8s.io/controller-manager v0.31.5 h1:FBlp/1k4puNIjIFsz5gexN4X+FbsMW/dHN8Cxjzowjs=
k8s.io/controller-manager v0.31.5/go.mod h1:6O7StIoLuQUbOC0gwaKfiu96FquTLhxsbEP7jlkOWy0=
k8s.io/cri-api v0.31.5 h1:VWedOGJyzaxOsMtwsCkSGP0DcJOrGGTqcAEdCoKmlxw=
k8s.io/cri-api v0.31.5/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.31.3 h1:XCFmiJn5CCKs8xoOLpCmu42Ubm/KW85wNHybGFcSAYc=
k8s.io/kms v0.31.3/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
k8s.io/kube-aggregator v0.31.3 h1:DqHPdTglJHgOfB884AaroyxrML/aL82ASYOh65m7MSk=
k8s.io/kube-aggregator v0.31.3/go.mod h1:Kx59Xjnf0SnY47qf9Or++4y3XCHQ3kR0xk1Di6KFiFU=
k8s.io/kms v0.31.5 h1:KqAHTnJDSoTt8ZSLsalz6gmwlX0lzVWAVSYcqEj6Lqw=
k8s.io/kms v0.31.5/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94=
k8s.io/kube-aggregator v0.31.5 h1:ibCqykJwv7Ht4tgwd1793N6h444gf5m7ZH2dpJ0r4yI=
k8s.io/kube-aggregator v0.31.5/go.mod h1:bWajrGqcljoq5w1zWwj1qU34VoKfZeMZSCbK/vp127s=
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.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
k8s.io/kubelet v0.31.3 h1:DIXRAmvVGp42mV2vpA1GCLU6oO8who0/vp3Oq6kSpbI=
k8s.io/kubelet v0.31.3/go.mod h1:KSdbEfNy5VzqUlAHlytA/fH12s+sE1u8fb/8JY9sL/8=
k8s.io/kubernetes v1.31.3 h1:oqb7HdfnTelrGlZ6ziNugvQ/L/aJWR704114EAhUn9Q=
k8s.io/kubernetes v1.31.3/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
k8s.io/metrics v0.31.3 h1:DkT9I3gFlb2/z+/4BMY7WrQ/PnbukuV4Yli82v/KBCM=
k8s.io/metrics v0.31.3/go.mod h1:2w9gpd8z+13oJmaPR6p3kDyrDqnxSyoKpnOw2qLIdhI=
k8s.io/mount-utils v0.31.3 h1:CANy3prUYvvDCc2X7ZKgpjpDhAidx4gjGh/WwDrCPq8=
k8s.io/mount-utils v0.31.3/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU=
k8s.io/kubectl v0.31.5 h1:WRA5WA3rwxflKeO0PsjMpP3ZicNsv7fD8YEmA9+Rbck=
k8s.io/kubectl v0.31.5/go.mod h1:WeEyd2KzUme3Laf7+5dM3aiDMRffeX8U90So1I6HkS0=
k8s.io/kubelet v0.31.5 h1:AnGDd4NV1PybzffhosECiJe5dWxZJ/f6S4gtuZuHzIA=
k8s.io/kubelet v0.31.5/go.mod h1:tILiNKFnjjWUg/SGIclQ6GA8ZWN653wATqIrzParnjs=
k8s.io/kubernetes v1.31.5 h1:hIW8YLP1MtsAIyot6U0uPqTois0ESjUrvPK6hElUUEk=
k8s.io/kubernetes v1.31.5/go.mod h1:9xmT2buyTYj8TRKwRae7FcuY8k5+xlxv7VivvO0KKfs=
k8s.io/metrics v0.31.5 h1:0QQQ20yA3IdXyXC0CXLveRwOXF0ekCuPf6iNKVqXIbw=
k8s.io/metrics v0.31.5/go.mod h1:wAMENPwG+OFEYRy6CHgjOXqWOfv4yzwQzGr7jPWU/WE=
k8s.io/mount-utils v0.31.5 h1:WrY+6v6PlAkOeBVXEBrLhAvx9YnlAk8JorMCSowEMtI=
k8s.io/mount-utils v0.31.5/go.mod h1:HV/VYBUGqYUj4vt82YltzpWvgv8FPg0G9ItyInT3NPU=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
Expand Down
5 changes: 2 additions & 3 deletions hack/tool/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module tool

go 1.23
toolchain go1.23.4

require (
github.com/hashicorp/terraform-exec v0.21.0
Expand Down Expand Up @@ -90,8 +89,8 @@ require (
golang.org/x/time v0.7.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.31.3 // indirect
k8s.io/client-go v0.31.3 // indirect
k8s.io/apimachinery v0.31.5 // indirect
k8s.io/client-go v0.31.5 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
Expand Down
12 changes: 6 additions & 6 deletions inttest/sonobuoy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
user: "ubuntu"
uploadBinary: true
k0s:
version: "1.31.3+k0s.0"
version: "1.31.5+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.31.3+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.3+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.3+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.31.5+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.31.3+k0s.0 is now installed
INFO k0s cluster version v1.31.5+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.31.3
--kubernetes-version=v1.31.5
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: unstable
version: v1.31.3+k0s.0
version: v1.31.5+k0s.0
downloadURLs:
k0s:
linux-amd64: ..../k0s-amd64
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/k0s/v1beta1/kubeproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type KubeProxy struct {
}

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

// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.3/config/v1alpha1/types.go#L52-L78
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.5/config/v1alpha1/types.go#L52-L78
type KubeProxyIPVSConfiguration struct {
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"`
Expand All @@ -72,7 +72,7 @@ type KubeProxyIPVSConfiguration struct {
}

// KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.3/config/v1alpha1/types.go#L82-L97
// @see https://github.com/kubernetes/kube-proxy/blob/v0.31.5/config/v1alpha1/types.go#L82-L97
type KubeProxyNFTablesConfiguration struct {
SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"`
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant.go
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.31.3"
KubeProxyImageVersion = "v1.31.5"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.12.0"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
Expand Down
Loading

0 comments on commit 9e5ad0f

Please sign in to comment.