Skip to content

Commit

Permalink
Merge pull request #5148 from twz123/bump-kubernetes-1.28
Browse files Browse the repository at this point in the history 
[release-1.28] Bump Kubernetes to v1.28.15
  • Loading branch information
@twz123
twz123 authored Oct 30, 2024
2 parents 332868f + a2c279d commit 1d62150
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.28.13+k0s.0")'
description: 'Version tag (e.g."v1.28.15+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.28.14
kubernetes_version = 1.28.15
helm_version = 3.11.1
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
Expand Down
2 changes: 1 addition & 1 deletion examples/footloose-ha-controllers/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/footloose/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.28.14/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.28.15/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 @@ -65,20 +65,20 @@ require (

// Kubernetes
require (
k8s.io/api v0.28.14
k8s.io/apiextensions-apiserver v0.28.14
k8s.io/apimachinery v0.28.14
k8s.io/cli-runtime v0.28.14
k8s.io/client-go v0.28.14
k8s.io/cloud-provider v0.28.14
k8s.io/component-base v0.28.14
k8s.io/component-helpers v0.28.14
k8s.io/cri-api v0.28.14
k8s.io/kube-aggregator v0.28.14
k8s.io/kubectl v0.28.14
k8s.io/kubelet v0.28.14
k8s.io/kubernetes v1.28.14
k8s.io/mount-utils v0.28.14
k8s.io/api v0.28.15
k8s.io/apiextensions-apiserver v0.28.15
k8s.io/apimachinery v0.28.15
k8s.io/cli-runtime v0.28.15
k8s.io/client-go v0.28.15
k8s.io/cloud-provider v0.28.15
k8s.io/component-base v0.28.15
k8s.io/component-helpers v0.28.15
k8s.io/cri-api v0.28.15
k8s.io/kube-aggregator v0.28.15
k8s.io/kubectl v0.28.15
k8s.io/kubelet v0.28.15
k8s.io/kubernetes v1.28.15
k8s.io/mount-utils v0.28.15
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.16.2
sigs.k8s.io/yaml v1.3.0
Expand Down Expand Up @@ -273,12 +273,12 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.14 // indirect
k8s.io/controller-manager v0.28.14 // indirect
k8s.io/apiserver v0.28.15 // indirect
k8s.io/controller-manager v0.28.15 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kms v0.28.14 // indirect
k8s.io/kms v0.28.15 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/metrics v0.28.14 // indirect
k8s.io/metrics v0.28.15 // indirect
oras.land/oras-go v1.2.4 // indirect
oras.land/oras-go/v2 v2.1.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
Expand Down Expand Up @@ -306,35 +306,35 @@ replace (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.28.14/go.mod#L250-L281
k8s.io/api => k8s.io/api v0.28.14
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.14
k8s.io/apimachinery => k8s.io/apimachinery v0.28.14
k8s.io/apiserver => k8s.io/apiserver v0.28.14
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.14
k8s.io/client-go => k8s.io/client-go v0.28.14
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.14
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.14
k8s.io/code-generator => k8s.io/code-generator v0.28.14
k8s.io/component-base => k8s.io/component-base v0.28.14
k8s.io/component-helpers => k8s.io/component-helpers v0.28.14
k8s.io/controller-manager => k8s.io/controller-manager v0.28.14
k8s.io/cri-api => k8s.io/cri-api v0.28.14
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.14
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.14
k8s.io/endpointslice => k8s.io/endpointslice v0.28.14
k8s.io/kms => k8s.io/kms v0.28.14
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.14
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.14
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.14
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.14
k8s.io/kubectl => k8s.io/kubectl v0.28.14
k8s.io/kubelet => k8s.io/kubelet v0.28.14
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.14
k8s.io/metrics => k8s.io/metrics v0.28.14
k8s.io/mount-utils => k8s.io/mount-utils v0.28.14
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.14
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.14
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.14
k8s.io/sample-controller => k8s.io/sample-controller v0.28.14
// https://github.com/kubernetes/kubernetes/blob/v1.28.15/go.mod#L250-L281
k8s.io/api => k8s.io/api v0.28.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.15
k8s.io/apimachinery => k8s.io/apimachinery v0.28.15
k8s.io/apiserver => k8s.io/apiserver v0.28.15
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.15
k8s.io/client-go => k8s.io/client-go v0.28.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.15
k8s.io/code-generator => k8s.io/code-generator v0.28.15
k8s.io/component-base => k8s.io/component-base v0.28.15
k8s.io/component-helpers => k8s.io/component-helpers v0.28.15
k8s.io/controller-manager => k8s.io/controller-manager v0.28.15
k8s.io/cri-api => k8s.io/cri-api v0.28.15
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.15
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.15
k8s.io/endpointslice => k8s.io/endpointslice v0.28.15
k8s.io/kms => k8s.io/kms v0.28.15
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.15
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.15
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.15
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.15
k8s.io/kubectl => k8s.io/kubectl v0.28.15
k8s.io/kubelet => k8s.io/kubelet v0.28.15
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.15
k8s.io/metrics => k8s.io/metrics v0.28.15
k8s.io/mount-utils => k8s.io/mount-utils v0.28.15
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.15
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.15
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.15
k8s.io/sample-controller => k8s.io/sample-controller v0.28.15
)
72 changes: 36 additions & 36 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1447,46 +1447,46 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.28.14 h1:7DXeMrQq+BJI6H7WtSMC8l1gM4QZWtWN65UbN+qZ9Uc=
k8s.io/api v0.28.14/go.mod h1:ROk/G6/7IZf14AL1WkpZdq//5khE1EtLNxkcEpSXNFM=
k8s.io/apiextensions-apiserver v0.28.14 h1:olGhq3lkOhhBOMQDGDg8ILoQ+OEtC4ceELEgg0i+2BQ=
k8s.io/apiextensions-apiserver v0.28.14/go.mod h1:wJ59VW3juItDDyP8yFTHkfmJtpDRlLgWYFzeefommBU=
k8s.io/apimachinery v0.28.14 h1:n2l8jNNOmUUDXpa8ljHCEUSeIChby1BKyqoL0AtpmGw=
k8s.io/apimachinery v0.28.14/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/apiserver v0.28.14 h1:Ji+w4LYu/vVLOKcA3toct/MxYh34geaLq9u+F4YjBgo=
k8s.io/apiserver v0.28.14/go.mod h1:6QQM1L8+dHTAURdKNasIUCgLbSBkjjCdGE6X1pSJzBU=
k8s.io/cli-runtime v0.28.14 h1:dVa/FYkq38Fbq24JEn2PRMzOcCiQ96aPkMHaS8kMJq4=
k8s.io/cli-runtime v0.28.14/go.mod h1:WCnQVD4rxIyG070HsasQj09IbKL9Fwb28zgWiqBLSis=
k8s.io/client-go v0.28.14 h1:wfPRgz07MvLMxcHfN8kAc4Qcwduc4My25A3CBU7OqBQ=
k8s.io/client-go v0.28.14/go.mod h1:HGfdb7BqkX4hRpNyVLHNQKWDU03W6a38LfIHD7QGJpI=
k8s.io/cloud-provider v0.28.14 h1:jiPB1EU1MH2kDi4ShiDZM4jukuDh1Qei1qg5uap5xAA=
k8s.io/cloud-provider v0.28.14/go.mod h1:Ai0V40gL+0ysnwQuzzhIwiMbJN+lpxP3Bzcg5hRXSk8=
k8s.io/component-base v0.28.14 h1:sJowHyRY166hBfBQ4cOKjkSvUo4bUdeuePtEOQfSNRY=
k8s.io/component-base v0.28.14/go.mod h1:DgYlfHNvP1yeBb4L+UIzMsWNtOl0yqTk+4dGGc79H0w=
k8s.io/component-helpers v0.28.14 h1:dtN1Cvov/YzfZQgC6WK0ZImzIjpPM9futsA0bXcMfEA=
k8s.io/component-helpers v0.28.14/go.mod h1:jK8LbwcqlC9Me+hNXDEN9dtnkp5+Cvy67YIwKuz6Nu0=
k8s.io/controller-manager v0.28.14 h1:p5oiTzcm4nzNAWqqZBo5qjWpWB39MdokULHh6qaS0OE=
k8s.io/controller-manager v0.28.14/go.mod h1:DQVlenSLDVTLAqfHYQHVxRC+R+sDQTg/NlSkJSislX8=
k8s.io/cri-api v0.28.14 h1:17hHgdGMsjXKs+QcplWKBVOfWl6qfEQ8ZPvcyLVJvsw=
k8s.io/cri-api v0.28.14/go.mod h1:8/bPK3T4irPoj3LjriQc1TAIheeN2yWXR3mz+8jNZ8U=
k8s.io/api v0.28.15 h1:u+Sze8gI+DayQxndS0htiJf8yVooHyUx/H4jEehtmNs=
k8s.io/api v0.28.15/go.mod h1:SJuOJTphYG05iJC9UKnUTNkY84Mvveu1P7adCgWqjCg=
k8s.io/apiextensions-apiserver v0.28.15 h1:NPlscxcvT4EutwP6rHTrlEvBvUj8HUBlXvFfUqLPWI4=
k8s.io/apiextensions-apiserver v0.28.15/go.mod h1:JguNDFsusOJwhHTzZAW2oeQ+15ekGy1ubZX9XWcZn+k=
k8s.io/apimachinery v0.28.15 h1:Jg15ZoCcAgnhSRKVS6tQyUZaX9c3i08bl2qAz8XE3bI=
k8s.io/apimachinery v0.28.15/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/apiserver v0.28.15 h1:i6cRWnWVtGL+1XCBBYilZ+dC/Yi8USpogVB4Sw2k+f4=
k8s.io/apiserver v0.28.15/go.mod h1:aEe/SUzUWmXZAYUxSUvOyo0xXtisjU+D7numTbu2Sz4=
k8s.io/cli-runtime v0.28.15 h1:+pE2uTVWe/S74JLZbp/2ylSUxLcyX+xXc7DrH7fh1lA=
k8s.io/cli-runtime v0.28.15/go.mod h1:5oKsbi5KpXOGDbBGMMnHkiuD3AzuYNWpxXJwJX4mubI=
k8s.io/client-go v0.28.15 h1:+g6Ub+i6tacV3tYJaoyK6bizpinPkamcEwsiKyHcIxc=
k8s.io/client-go v0.28.15/go.mod h1:/4upIpTbhWQVSXKDqTznjcAegj2Bx73mW/i0aennJrY=
k8s.io/cloud-provider v0.28.15 h1:QTh+CVo+Rso6xIge5Hni7gx6a7j7PvkmedgzRmnsYeE=
k8s.io/cloud-provider v0.28.15/go.mod h1:HdFjkzkUID7egSZO6n9sQHuPL7dLYHzqF6SnJXyOpeM=
k8s.io/component-base v0.28.15 h1:PRwUVO0iiKYjC9fYU2lCLlfjQffHcMv7D4ZhK9WWrKg=
k8s.io/component-base v0.28.15/go.mod h1:EtoV2f+v7rIrUlaEj1VkE5WuYGjMSBXPcXapu7tSsBs=
k8s.io/component-helpers v0.28.15 h1:VsQ7hcdqkHJ/9jR60JxK68GBUs9w0ChVXBamELwYWp4=
k8s.io/component-helpers v0.28.15/go.mod h1:o/OqOdzWU6rqqcLccRAjntG0i1/8Y5swrCQmBw0h+DU=
k8s.io/controller-manager v0.28.15 h1:T2/kyd106i3KcozKu9FwZcRNXpWjUJEI57+ikeuXJSs=
k8s.io/controller-manager v0.28.15/go.mod h1:AekcdDdcDTeL64TMiIusTh/VLCT1Q9CkhIR3IriR9oI=
k8s.io/cri-api v0.28.15 h1:wawXexvh0QCJM+ymdPy+ssksy1tZv0fOKmc8CA1t3CA=
k8s.io/cri-api v0.28.15/go.mod h1:8/bPK3T4irPoj3LjriQc1TAIheeN2yWXR3mz+8jNZ8U=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.28.14 h1:uoBVvx8lnmchDPC422srnR0l4I515xeNy39wZq9Gq60=
k8s.io/kms v0.28.14/go.mod h1:WDhjuIDVtWsE+UGkWlbSowELajcO+h0JSc8C3dHQces=
k8s.io/kube-aggregator v0.28.14 h1:ufV2PgQMrQSLAgZYkKdRPt7JifNEq3jXCEJo5c+Ssrw=
k8s.io/kube-aggregator v0.28.14/go.mod h1:ZW2mhmyesN+9wrmTrdrvFKmvdTFegzlcbTnh0Vu+ghA=
k8s.io/kms v0.28.15 h1:zvKR1nafYPbzdbq2tEl+dH1UlMnuov1pUMtfy73u224=
k8s.io/kms v0.28.15/go.mod h1:GsOkSBYseV1BsO1T4RW50SfyPmbEH0KUWEMRYQCNN0A=
k8s.io/kube-aggregator v0.28.15 h1:DCK6NbiL+MJh5nu7b3Tbs3nRbuYKdFkhCBdfZ1Crr0o=
k8s.io/kube-aggregator v0.28.15/go.mod h1:4dQdyGrgnHfmqk9YFrHpwwgD9xUwuZxZ4Uk2L5C3T7k=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/kubectl v0.28.14 h1:BiYli8iFEvV30x0JdaDCyZsqwCk2mgqlhe4eDsNjyCk=
k8s.io/kubectl v0.28.14/go.mod h1:okcvFR+Dpk9Ko4UzBvnE0ha99WfwC+QnIvp6h2Mwvto=
k8s.io/kubelet v0.28.14 h1:nKLJsbVZVBbe9i5VYhWWxv3rZ/63C/tTrweHTDmZBjY=
k8s.io/kubelet v0.28.14/go.mod h1:wGsgJm3PsckoUMbs5r8gCOc7PPXxQcyzNEHbF8U/L8k=
k8s.io/kubernetes v1.28.14 h1:Q0qoY+dKjqAhSrVSAebEMVUK5zfrg9Sz3I/4aHnOCaQ=
k8s.io/kubernetes v1.28.14/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
k8s.io/metrics v0.28.14 h1:gQCMhcRg6iBHhF5N7eA/FonlbjvAI+8EEM5IS7XWxa4=
k8s.io/metrics v0.28.14/go.mod h1:ik9PlcypnMQ7o/2La3KiJxtqy+Cp0koUYOA+F8ydaYE=
k8s.io/mount-utils v0.28.14 h1:WUaFoWulcmWEEZjUvW+iquuCw6imxvh+r65qeRgzPB0=
k8s.io/mount-utils v0.28.14/go.mod h1:ZxAFXgKzcAyi3VTd2pKFlZFswl9Q/cveJ5aptdjQOuc=
k8s.io/kubectl v0.28.15 h1:E0Oa/pe9qu6F7tCcUvDS6cjCxLVysvrodh7bs1ksMzg=
k8s.io/kubectl v0.28.15/go.mod h1:BS5gCoO2PrSturdcXxDQw1r6K6F0Gg6pb7ofAKsQbps=
k8s.io/kubelet v0.28.15 h1:AQo04wqu1teykYfHlCQBaUHwj+e8wLyRABrUaXHb8rk=
k8s.io/kubelet v0.28.15/go.mod h1:o5NqpzA4biIlssOMaHkPG/CsI6ku3WpVUuAQvpos2iQ=
k8s.io/kubernetes v1.28.15 h1:d91N2Znk+E8REIJZlrD6za2JtIwvEypa0DB1IoU4fJ0=
k8s.io/kubernetes v1.28.15/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
k8s.io/metrics v0.28.15 h1:ygYp5vcXVYKOvP12GSuknafs6Oprto4Jqnky7DqJgJc=
k8s.io/metrics v0.28.15/go.mod h1:6LUyWnZT+hwhRBHh/GhQF/ZjoGW95/ARAKNr/kzT4lg=
k8s.io/mount-utils v0.28.15 h1:f0bT4qUY/N6J1/9bMjxPa1dGG8mljzE6f+lgIX/MN2c=
k8s.io/mount-utils v0.28.15/go.mod h1:ZxAFXgKzcAyi3VTd2pKFlZFswl9Q/cveJ5aptdjQOuc=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/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 @@ -92,8 +92,8 @@ require (
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.28.13 // indirect
k8s.io/client-go v0.28.13 // indirect
k8s.io/apimachinery v0.28.15 // indirect
k8s.io/client-go v0.28.15 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // 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 @@ -354,12 +354,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0/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.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4=
k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q=
k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g=
k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk=
k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g=
k8s.io/api v0.28.15 h1:u+Sze8gI+DayQxndS0htiJf8yVooHyUx/H4jEehtmNs=
k8s.io/api v0.28.15/go.mod h1:SJuOJTphYG05iJC9UKnUTNkY84Mvveu1P7adCgWqjCg=
k8s.io/apimachinery v0.28.15 h1:Jg15ZoCcAgnhSRKVS6tQyUZaX9c3i08bl2qAz8XE3bI=
k8s.io/apimachinery v0.28.15/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/client-go v0.28.15 h1:+g6Ub+i6tacV3tYJaoyK6bizpinPkamcEwsiKyHcIxc=
k8s.io/client-go v0.28.15/go.mod h1:/4upIpTbhWQVSXKDqTznjcAegj2Bx73mW/i0aennJrY=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
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.28.14+k0s.0"
version: "1.28.15+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.28.14+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.14+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.14+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.15+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.15+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.15+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.28.14+k0s.0 is now installed
INFO k0s cluster version v1.28.15+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.28.14
--kubernetes-version=v1.28.15
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.28.14+k0s.0
version: v1.28.15+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.28.13/config/v1alpha1/types.go#L27-L42
// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.15/config/v1alpha1/types.go#L27-L42
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.28.13/config/v1alpha1/types.go#L46-L70
// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.15/config/v1alpha1/types.go#L46-L70
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_shared.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const (
MetricsImage = "registry.k8s.io/metrics-server/metrics-server"
MetricsImageVersion = "v0.7.2"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImageVersion = "v1.28.14"
KubeProxyImageVersion = "v1.28.15"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.11.3"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
Expand Down
4 changes: 2 additions & 2 deletions static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ spec:
iptables:
description: |-
KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L27-L42
@see https://github.com/kubernetes/kube-proxy/blob/v0.28.15/config/v1alpha1/types.go#L27-L42
properties:
localhostNodePorts:
type: boolean
Expand All @@ -415,7 +415,7 @@ spec:
ipvs:
description: |-
KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L46-L70
@see https://github.com/kubernetes/kube-proxy/blob/v0.28.15/config/v1alpha1/types.go#L46-L70
properties:
excludeCIDRs:
items:
Expand Down

0 comments on commit 1d62150

Please sign in to comment.