Skip to content

Commit

Permalink
Bump Kubernetes to v1.28.7
Browse files Browse the repository at this point in the history
  • Loading branch information
twz123 committed Feb 19, 2024
1 parent dca8e4b commit a6b3c24
Show file tree
Hide file tree
Showing 13 changed files with 108 additions and 108 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.28.6+k0s.0")'
description: 'Version tag (e.g."v1.28.7+k0s.0")'
required: true

env:
Expand Down
2 changes: 1 addition & 1 deletion docs/autopilot.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
version: v{{{ extra.k8s_version }}}+k0s.0
platforms:
linux-amd64:
url: https://github.com/k0sproject/k0s/releases/download/v1.28.6+k0s.0/k0s-v1.28.6+k0s.0-amd64
url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64
sha256: '0000000000000000000000000000000000000000000000000000000000000000'
targets:
controllers:
Expand Down
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.28.6
kubernetes_version = 1.28.7
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
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.6/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.28.7/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
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ require (

// Kubernetes
require (
k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver v0.28.6
k8s.io/apimachinery v0.28.6
k8s.io/cli-runtime v0.28.6
k8s.io/client-go v0.28.6
k8s.io/cloud-provider v0.28.6
k8s.io/component-base v0.28.6
k8s.io/component-helpers v0.28.6
k8s.io/cri-api v0.28.6
k8s.io/kube-aggregator v0.28.6
k8s.io/kubectl v0.28.6
k8s.io/kubelet v0.28.6
k8s.io/kubernetes v1.28.6
k8s.io/mount-utils v0.28.6
k8s.io/api v0.28.7
k8s.io/apiextensions-apiserver v0.28.7
k8s.io/apimachinery v0.28.7
k8s.io/cli-runtime v0.28.7
k8s.io/client-go v0.28.7
k8s.io/cloud-provider v0.28.7
k8s.io/component-base v0.28.7
k8s.io/component-helpers v0.28.7
k8s.io/cri-api v0.28.7
k8s.io/kube-aggregator v0.28.7
k8s.io/kubectl v0.28.7
k8s.io/kubelet v0.28.7
k8s.io/kubernetes v1.28.7
k8s.io/mount-utils v0.28.7
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.6 // indirect
k8s.io/controller-manager v0.28.6 // indirect
k8s.io/apiserver v0.28.7 // indirect
k8s.io/controller-manager v0.28.7 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kms v0.28.6 // indirect
k8s.io/kms v0.28.7 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/metrics v0.28.6 // indirect
k8s.io/metrics v0.28.7 // 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.6/go.mod#L250-L281
k8s.io/api => k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6
k8s.io/apimachinery => k8s.io/apimachinery v0.28.6
k8s.io/apiserver => k8s.io/apiserver v0.28.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.6
k8s.io/client-go => k8s.io/client-go v0.28.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.6
k8s.io/code-generator => k8s.io/code-generator v0.28.6
k8s.io/component-base => k8s.io/component-base v0.28.6
k8s.io/component-helpers => k8s.io/component-helpers v0.28.6
k8s.io/controller-manager => k8s.io/controller-manager v0.28.6
k8s.io/cri-api => k8s.io/cri-api v0.28.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.6
k8s.io/endpointslice => k8s.io/endpointslice v0.28.6
k8s.io/kms => k8s.io/kms v0.28.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.6
k8s.io/kubectl => k8s.io/kubectl v0.28.6
k8s.io/kubelet => k8s.io/kubelet v0.28.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.6
k8s.io/metrics => k8s.io/metrics v0.28.6
k8s.io/mount-utils => k8s.io/mount-utils v0.28.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.6
k8s.io/sample-controller => k8s.io/sample-controller v0.28.6
// https://github.com/kubernetes/kubernetes/blob/v1.28.7/go.mod#L250-L281
k8s.io/api => k8s.io/api v0.28.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.7
k8s.io/apimachinery => k8s.io/apimachinery v0.28.7
k8s.io/apiserver => k8s.io/apiserver v0.28.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.7
k8s.io/client-go => k8s.io/client-go v0.28.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.7
k8s.io/code-generator => k8s.io/code-generator v0.28.7
k8s.io/component-base => k8s.io/component-base v0.28.7
k8s.io/component-helpers => k8s.io/component-helpers v0.28.7
k8s.io/controller-manager => k8s.io/controller-manager v0.28.7
k8s.io/cri-api => k8s.io/cri-api v0.28.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.7
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.7
k8s.io/endpointslice => k8s.io/endpointslice v0.28.7
k8s.io/kms => k8s.io/kms v0.28.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.7
k8s.io/kubectl => k8s.io/kubectl v0.28.7
k8s.io/kubelet => k8s.io/kubelet v0.28.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.7
k8s.io/metrics => k8s.io/metrics v0.28.7
k8s.io/mount-utils => k8s.io/mount-utils v0.28.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.7
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.7
k8s.io/sample-controller => k8s.io/sample-controller v0.28.7
)
72 changes: 36 additions & 36 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1390,46 +1390,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.6 h1:yy6u9CuIhmg55YvF/BavPBBXB+5QicB64njJXxVnzLo=
k8s.io/api v0.28.6/go.mod h1:AM6Ys6g9MY3dl/XNaNfg/GePI0FT7WBGu8efU/lirAo=
k8s.io/apiextensions-apiserver v0.28.6 h1:myB3iG/3v3jqCg28JDbOefu4sH2/erNEXgytRzJKBOo=
k8s.io/apiextensions-apiserver v0.28.6/go.mod h1:qlp6xRKBgyRhe5AYc81TQpLx4kLNK8/sGQUOwMkVjRk=
k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0=
k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
k8s.io/apiserver v0.28.6 h1:SfS5v4I5UGvh0q/1rzvNwLFsK+r7YzcsixnUc0NwoEk=
k8s.io/apiserver v0.28.6/go.mod h1:8n0aerS3kPm9usyB8B+an6/BZ5+Fa9fNqlASFdDDVwk=
k8s.io/cli-runtime v0.28.6 h1:bDH2+ZbHBK3NORGmIygj/zWOkVd/hGWg9RqAa5c/Ev0=
k8s.io/cli-runtime v0.28.6/go.mod h1:KFk67rlb7Pxh15uLbYGBUlW7ZUcpl7IM1GnHtskrcWA=
k8s.io/client-go v0.28.6 h1:Gge6ziyIdafRchfoBKcpaARuz7jfrK1R1azuwORIsQI=
k8s.io/client-go v0.28.6/go.mod h1:+nu0Yp21Oeo/cBCsprNVXB2BfJTV51lFfe5tXl2rUL8=
k8s.io/cloud-provider v0.28.6 h1:KfexGkg8UVsfb7Jq163V/eyMVm0/IUHrnJnZ9m/qN8A=
k8s.io/cloud-provider v0.28.6/go.mod h1:J8X7fNWmekayasdhQGSab4hm7hk0KQssDsA5WQlPi8k=
k8s.io/component-base v0.28.6 h1:G4T8VrcQ7xZou3by/fY5NU5mfxOBlWaivS2lPrEltAo=
k8s.io/component-base v0.28.6/go.mod h1:Dg62OOG3ALu2P4nAG00UdsuHoNLQJ5VsUZKQlLDcS+E=
k8s.io/component-helpers v0.28.6 h1:0vkzt/Oesntc8TJ1LrD5g4IIKAZljHcgTd7aMHkmULg=
k8s.io/component-helpers v0.28.6/go.mod h1:E1wTMmZYIdNZEUnglIbSf314IsvI0K1elnBIsdJwTM4=
k8s.io/controller-manager v0.28.6 h1:Gw/SN1z9AVWMpO7bsl7SGYFvRFQ3v5zmiLMS/DXfDsY=
k8s.io/controller-manager v0.28.6/go.mod h1:LHG+7FwwANxLrXD3Zn0EGMTMQ6mEYrFMkQ/CmqLOveo=
k8s.io/cri-api v0.28.6 h1:TN2vRaf8656ag46dG5J30xxkr9mu1/14NZWkvhJTCEk=
k8s.io/cri-api v0.28.6/go.mod h1:zWVXihHsxPjRh4EBQHirnniYdqE4SmnLzv2nn56iL+Q=
k8s.io/api v0.28.7 h1:YKIhBxjXKaxuxWJnwohV0aGjRA5l4IU0Eywf/q19AVI=
k8s.io/api v0.28.7/go.mod h1:y4RbcjCCMff1930SG/TcP3AUKNfaJUgIeUp58e/2vyY=
k8s.io/apiextensions-apiserver v0.28.7 h1:NQlzP/vmvIO9Qt7wQTdMe9sGWGkozQZMPk9suehAvR8=
k8s.io/apiextensions-apiserver v0.28.7/go.mod h1:ST+ZOppyy+Z0mIxezSOK8qwIXctNwdFLNpGkQp8bw4M=
k8s.io/apimachinery v0.28.7 h1:2Z38/XRAOcpb+PonxmBEmjG7hBfmmr41xnr0XvpTnB4=
k8s.io/apimachinery v0.28.7/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
k8s.io/apiserver v0.28.7 h1:J8sQsOi+eA97+LGKve7ysYwfjFBf1sjPP/IFrrv6UdU=
k8s.io/apiserver v0.28.7/go.mod h1:Ui6QxEMRsE4ah7NGiocso7Zep70R8zV9r4OUNGso7/k=
k8s.io/cli-runtime v0.28.7 h1:a0B8JLObJ4RSIYvgzkiYyV26Ubh376YiNQ6Ryr9hdaQ=
k8s.io/cli-runtime v0.28.7/go.mod h1:Y11JDqc/y2zwGjTuhKzqLAPyRt+QDjWbqaXPtNfrGdY=
k8s.io/client-go v0.28.7 h1:3L6402+tjmOl8twX3fjUQ/wsYAkw6UlVNDVP+rF6YGA=
k8s.io/client-go v0.28.7/go.mod h1:xIoEaDewZ+EwWOo1/F1t0IOKMPe1rwBZhLu9Es6y0tE=
k8s.io/cloud-provider v0.28.7 h1:/UmsdF2QU+U7xohJw+kYVsq2uEsMIHuaLe9SEXig/I8=
k8s.io/cloud-provider v0.28.7/go.mod h1:eIsSt8QiSpJRcJXRbfi60w+kJ6d/sk2U8EQ0K/YN24o=
k8s.io/component-base v0.28.7 h1:Cq5aQ52N0CTaOMiary4rXzR4RoTP77Z3ll4qSg4qH7s=
k8s.io/component-base v0.28.7/go.mod h1:RrtNBKrSuckksSQ3fV9PhwBSHO/ZbwJXM2Z0OPx+UJk=
k8s.io/component-helpers v0.28.7 h1:YPdfkbl5GEuWVv6r2kNPRbqFWd7Rduk0A+tqnQpKPWA=
k8s.io/component-helpers v0.28.7/go.mod h1:kMAWTPtouyxk+jIAx6eLGRkaSRN87ompmLyLkUhvpKg=
k8s.io/controller-manager v0.28.7 h1:ydHuFsyP+ani/AZioMltwnd0WEddvoiha64sp4gOGV8=
k8s.io/controller-manager v0.28.7/go.mod h1:EGtoGg/vN0Crr+xi615nVGlginAuVHbGfC55po+dfQo=
k8s.io/cri-api v0.28.7 h1:n5cy5cn74Rr+FL/CnmaO1Y+JMghQ+h+uV6jC0mhz84Q=
k8s.io/cri-api v0.28.7/go.mod h1:zWVXihHsxPjRh4EBQHirnniYdqE4SmnLzv2nn56iL+Q=
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.6 h1:WfpL9iSiB012zPUtPGT+OGv4yncdcvwH1ce/UYv4RjQ=
k8s.io/kms v0.28.6/go.mod h1:ONhtDMHoDgKQ/QzN6WiqJlmnpE9iyMQg1pLock4zug8=
k8s.io/kube-aggregator v0.28.6 h1:opRVDw+inLPIyAqG9Fu3+EYWcmbTHOHJNrmuKoeuzQM=
k8s.io/kube-aggregator v0.28.6/go.mod h1:NXzqtkCuAfv/modgRbAkPdfUZF+koazCy8Qrs8L+WyE=
k8s.io/kms v0.28.7 h1:cvzpVHD+me7lRPqRJSeZvbKK8e9wob+iBx4mpg+9wa4=
k8s.io/kms v0.28.7/go.mod h1:t+mtSTTV8FiJ+87zSQ7FPn/F8TNzBP1/zTYFH69pX8c=
k8s.io/kube-aggregator v0.28.7 h1:5QqoXr7ckVX8lhzNVN681fZcrqrXkmmRDupd21TUjHY=
k8s.io/kube-aggregator v0.28.7/go.mod h1:elikzGl/2Y2UCTuAg6tL/k5yxWE4Zefyfw1YJ3S6W80=
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.6 h1:46O3gGJYlpqy7wtwYlggieemyIcuZqmflnQVDci3MgY=
k8s.io/kubectl v0.28.6/go.mod h1:FS5ugZhi3kywpMQSCnp8MN+gctdFHJACzC6mH3fZ6lc=
k8s.io/kubelet v0.28.6 h1:Ofn26Lr/4MCApqNPbRHEALIx5YTnKjNxC1CfEgwbrUA=
k8s.io/kubelet v0.28.6/go.mod h1:ANu5Pa5P4beDu2BGTW588WsFPfjmkgKbikiUvatdzAo=
k8s.io/kubernetes v1.28.6 h1:Nn2fXNjaqmKyXeFq6verbdqzlj1aqUpBcyeC1OhRFa4=
k8s.io/kubernetes v1.28.6/go.mod h1:0qpyGJTR3blkbQOmZA3Z0u1VDZJNxJM8ifLUVNJN0X8=
k8s.io/metrics v0.28.6 h1:7BZqPSl356LG98AaoOqTcPKbl5aloXNrThj2AtS15Rg=
k8s.io/metrics v0.28.6/go.mod h1:eeqj1hFqI14iSsKVfa8Vu/+OIfi7s8lxpnCJOA7teLg=
k8s.io/mount-utils v0.28.6 h1:Ehe42uw7mjJume2pLt37CZl7oSIjiKGCngDCs5/otjo=
k8s.io/mount-utils v0.28.6/go.mod h1:pAnxhVbtMafSzAmFBgIfCdbM52+ObB7bBIN4MpuWk2o=
k8s.io/kubectl v0.28.7 h1:XUV9lP7K2azjBjrGo9UPIRPFj6ofXF8I2lK7wSQehBg=
k8s.io/kubectl v0.28.7/go.mod h1:LFUYAHkMtiijT8ZpOqEcFrVhNUAt0W0KluxvLix1+vg=
k8s.io/kubelet v0.28.7 h1:EruF3Ajdta6fza7OK4fTpS3kV6b4XOKWIkvosMFQJVg=
k8s.io/kubelet v0.28.7/go.mod h1:p9/lHBv+aO9os2D3ygCs4x9jEC2GWAH9OdeC5misTuU=
k8s.io/kubernetes v1.28.7 h1:XV7AiCqtuOLaERR7uWcJnVpGG090lzJ9A37ftQuJhN4=
k8s.io/kubernetes v1.28.7/go.mod h1:0qpyGJTR3blkbQOmZA3Z0u1VDZJNxJM8ifLUVNJN0X8=
k8s.io/metrics v0.28.7 h1:DcxklECVz2NYVWmk6iK9dAmCHqCM0QxPAQtMA66a+kU=
k8s.io/metrics v0.28.7/go.mod h1:YE9kCsZPhx2i93xK2BjWdpWGS1CYyv9NSMlPkob6hDc=
k8s.io/mount-utils v0.28.7 h1:E9cq0QEbUmi76SqMQYBrKLT/EzpfWSEhkshYOjf3usM=
k8s.io/mount-utils v0.28.7/go.mod h1:pAnxhVbtMafSzAmFBgIfCdbM52+ObB7bBIN4MpuWk2o=
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
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.6 // indirect
k8s.io/client-go v0.28.6 // indirect
k8s.io/apimachinery v0.28.7 // indirect
k8s.io/client-go v0.28.7 // 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
10 changes: 5 additions & 5 deletions hack/tool/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,11 @@ 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.6 h1:yy6u9CuIhmg55YvF/BavPBBXB+5QicB64njJXxVnzLo=
k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0=
k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
k8s.io/client-go v0.28.6 h1:Gge6ziyIdafRchfoBKcpaARuz7jfrK1R1azuwORIsQI=
k8s.io/client-go v0.28.6/go.mod h1:+nu0Yp21Oeo/cBCsprNVXB2BfJTV51lFfe5tXl2rUL8=
k8s.io/api v0.28.7 h1:YKIhBxjXKaxuxWJnwohV0aGjRA5l4IU0Eywf/q19AVI=
k8s.io/apimachinery v0.28.7 h1:2Z38/XRAOcpb+PonxmBEmjG7hBfmmr41xnr0XvpTnB4=
k8s.io/apimachinery v0.28.7/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
k8s.io/client-go v0.28.7 h1:3L6402+tjmOl8twX3fjUQ/wsYAkw6UlVNDVP+rF6YGA=
k8s.io/client-go v0.28.7/go.mod h1:xIoEaDewZ+EwWOo1/F1t0IOKMPe1rwBZhLu9Es6y0tE=
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
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.6+k0s.0"
version: "1.28.7+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.6+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.7+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.7+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.7+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.6+k0s.0 is now installed
INFO k0s cluster version v1.28.7+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.6
--kubernetes-version=v1.28.7
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.28.6+k0s.0
version: v1.28.7+k0s.0
downloadURLs:
k0s:
linux-amd64: ..../k0s-amd64
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/k0s/v1beta1/kubeproxy.go
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.6/config/v1alpha1/types.go#L27-L42
// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.7/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.6/config/v1alpha1/types.go#L46-L70
// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.7/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
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.6.4"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImageVersion = "v1.28.6"
KubeProxyImageVersion = "v1.28.7"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.11.1"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
Expand Down
Loading

0 comments on commit a6b3c24

Please sign in to comment.