Skip to content

Commit

Permalink
Merge pull request #3520 from twz123/k8s-1.27.6
Browse files Browse the repository at this point in the history 
[release-1.27] Bump Kubernetes to v1.27.6
  • Loading branch information
@twz123
twz123 authored Sep 22, 2023
2 parents 0fbcc72 + 903149f commit 2b80b83
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 109 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.27.5+k0s.0")'
description: 'Version tag (e.g."v1.27.6+k0s.0")'
required: true

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

// Kubernetes
require (
k8s.io/api v0.27.5
k8s.io/apiextensions-apiserver v0.27.5
k8s.io/apimachinery v0.27.5
k8s.io/cli-runtime v0.27.5
k8s.io/client-go v0.27.5
k8s.io/cloud-provider v0.27.5
k8s.io/component-base v0.27.5
k8s.io/component-helpers v0.27.5
k8s.io/cri-api v0.27.5
k8s.io/kube-aggregator v0.27.5
k8s.io/kubectl v0.27.5
k8s.io/kubelet v0.27.5
k8s.io/kubernetes v1.27.5
k8s.io/mount-utils v0.27.5
k8s.io/api v0.27.6
k8s.io/apiextensions-apiserver v0.27.6
k8s.io/apimachinery v0.27.6
k8s.io/cli-runtime v0.27.6
k8s.io/client-go v0.27.6
k8s.io/cloud-provider v0.27.6
k8s.io/component-base v0.27.6
k8s.io/component-helpers v0.27.6
k8s.io/cri-api v0.27.6
k8s.io/kube-aggregator v0.27.6
k8s.io/kubectl v0.27.6
k8s.io/kubelet v0.27.6
k8s.io/kubernetes v1.27.6
k8s.io/mount-utils v0.27.6
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
sigs.k8s.io/controller-runtime v0.13.1-0.20230412185432-fbd6b944a634 // includes https://github.com/kubernetes-sigs/controller-runtime/pull/2223
sigs.k8s.io/yaml v1.3.0
Expand Down Expand Up @@ -152,7 +152,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/cel-go v0.12.7 // indirect
github.com/google/certificate-transparency-go v1.1.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -268,12 +268,12 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.27.5 // indirect
k8s.io/controller-manager v0.27.5 // indirect
k8s.io/apiserver v0.27.6 // indirect
k8s.io/controller-manager v0.27.6 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kms v0.27.5 // indirect
k8s.io/kms v0.27.6 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/metrics v0.27.5 // indirect
k8s.io/metrics v0.27.6 // indirect
oras.land/oras-go v1.2.4-0.20230505142456-f92397840738 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down Expand Up @@ -305,34 +305,34 @@ replace (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.27.5/go.mod#L245-L275
k8s.io/api => k8s.io/api v0.27.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.5
k8s.io/apimachinery => k8s.io/apimachinery v0.27.5
k8s.io/apiserver => k8s.io/apiserver v0.27.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.5
k8s.io/client-go => k8s.io/client-go v0.27.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.5
k8s.io/code-generator => k8s.io/code-generator v0.27.5
k8s.io/component-base => k8s.io/component-base v0.27.5
k8s.io/component-helpers => k8s.io/component-helpers v0.27.5
k8s.io/controller-manager => k8s.io/controller-manager v0.27.5
k8s.io/cri-api => k8s.io/cri-api v0.27.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.5
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.5
k8s.io/kms => k8s.io/kms v0.27.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.5
k8s.io/kubectl => k8s.io/kubectl v0.27.5
k8s.io/kubelet => k8s.io/kubelet v0.27.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.5
k8s.io/metrics => k8s.io/metrics v0.27.5
k8s.io/mount-utils => k8s.io/mount-utils v0.27.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.5
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.5
k8s.io/sample-controller => k8s.io/sample-controller v0.27.5
// https://github.com/kubernetes/kubernetes/blob/v1.27.6/go.mod#L245-L275
k8s.io/api => k8s.io/api v0.27.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.6
k8s.io/apimachinery => k8s.io/apimachinery v0.27.6
k8s.io/apiserver => k8s.io/apiserver v0.27.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.6
k8s.io/client-go => k8s.io/client-go v0.27.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.6
k8s.io/code-generator => k8s.io/code-generator v0.27.6
k8s.io/component-base => k8s.io/component-base v0.27.6
k8s.io/component-helpers => k8s.io/component-helpers v0.27.6
k8s.io/controller-manager => k8s.io/controller-manager v0.27.6
k8s.io/cri-api => k8s.io/cri-api v0.27.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.6
k8s.io/kms => k8s.io/kms v0.27.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.6
k8s.io/kubectl => k8s.io/kubectl v0.27.6
k8s.io/kubelet => k8s.io/kubelet v0.27.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.6
k8s.io/metrics => k8s.io/metrics v0.27.6
k8s.io/mount-utils => k8s.io/mount-utils v0.27.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.6
k8s.io/sample-controller => k8s.io/sample-controller v0.27.6
)
76 changes: 38 additions & 38 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/cel-go v0.12.7 h1:jM6p55R0MKBg79hZjn1zs2OlrywZ1Vk00rxVvad1/O0=
github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
github.com/google/certificate-transparency-go v1.1.4 h1:hCyXHDbtqlr/lMXU0D4WgbalXL0Zk4dSWWMbPV8VrqY=
github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ=
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
Expand Down Expand Up @@ -1433,46 +1433,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.27.5 h1:49hIzqJNSuOQpA53MMihgAS4YDcQitTy58B9PMFthLc=
k8s.io/api v0.27.5/go.mod h1:zjBZB+c0KDU55Wxb9Bob9WZGxu9zdKHitzHxBtaIVoA=
k8s.io/apiextensions-apiserver v0.27.5 h1:YiDDsH8irDOsFiGoezJAU7pqq4avoFcCIQ2/DghZgsY=
k8s.io/apiextensions-apiserver v0.27.5/go.mod h1:ihpozWiLbNytEGiHQbgrEkkyTKWhIhchy0SHX+aY1eU=
k8s.io/apimachinery v0.27.5 h1:6Q5HBXYJJPisd6yDVAprLe6FQsmw7a7Cu69dcrpQET8=
k8s.io/apimachinery v0.27.5/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apiserver v0.27.5 h1:HUP50yjA+X8YiXzxaz6hpFc7cfsx17bAreOZKbpChLo=
k8s.io/apiserver v0.27.5/go.mod h1:HYUembDZJMisyctQRJzQFxRKEGzL+IKeD2UdTcy4OIM=
k8s.io/cli-runtime v0.27.5 h1:E9553yT9DimKjRF3D1s1k5k2lMsJb4/oO0JusA1CIyI=
k8s.io/cli-runtime v0.27.5/go.mod h1:J15sxV5QcME/9qEI0Vwg6Msr8V4mj1a/XeZK8R4AzMo=
k8s.io/client-go v0.27.5 h1:sH/fkqzk35kuf0GPx+dZuN7fhEswBSAVCrWFq3E1km0=
k8s.io/client-go v0.27.5/go.mod h1:u+IKnqPZSPw51snIMKiIAV8LQQ+hya5bvxpOOPTUXPI=
k8s.io/cloud-provider v0.27.5 h1:J+1tBv/uBDbR/gPO+wjAHO6yRv7aDyxqA0LRwEsv0IE=
k8s.io/cloud-provider v0.27.5/go.mod h1:UCClQnTeCqbDcXlK/5+QnHSI1uJfj5jvYpuEhVI7kDs=
k8s.io/component-base v0.27.5 h1:IXo80yOVx7qXG2g1loPpo2g1HUK3CnxNpq9LtGmXAmM=
k8s.io/component-base v0.27.5/go.mod h1:AGJyFHmaxplY4C4lu18UrJBNHcxdv0o6jOL/+HcC0S0=
k8s.io/component-helpers v0.27.5 h1:V966SPo7cVdxkKs0tfuHao7GNSM8H+krlg3rKGiKjeo=
k8s.io/component-helpers v0.27.5/go.mod h1:DysJsLaHI3yPgDi1KF7dROTf7gm7BPQgxIbuXYd8sQk=
k8s.io/controller-manager v0.27.5 h1:rYBwln2iEWQHgx+f6FhDzGg6wnmItgfSMnSPpNlNJJQ=
k8s.io/controller-manager v0.27.5/go.mod h1:p3CTvzcMQeyI/Gb3AaP9Vjz2Pi7XV4ChOuHIKAMATQg=
k8s.io/cri-api v0.27.5 h1:SnOj4KRwHmsYFmUuVsx9bY8Gq9znWfyTdN7djUVdzJM=
k8s.io/cri-api v0.27.5/go.mod h1:+Ts/AVYbIo04S86XbTD73UPp/DkTiYxtsFeOFEu32L0=
k8s.io/api v0.27.6 h1:PBWu/lywJe2qQcshMjubzcBg7+XDZOo7O8JJAWuYtUo=
k8s.io/api v0.27.6/go.mod h1:AQYj0UsFCp3qJE7bOVnUuy4orCsXVkvHefnbYQiNWgk=
k8s.io/apiextensions-apiserver v0.27.6 h1:mOwSBJtThZhpJr+8gEkc3wFDIjq87E3JspR5mtZxIg8=
k8s.io/apiextensions-apiserver v0.27.6/go.mod h1:AVNlLYRrESG5Poo6ASRUhY2pvoKPcNt8y/IuZ4lx3o8=
k8s.io/apimachinery v0.27.6 h1:mGU8jmBq5o8mWBov+mLjdTBcU+etTE19waies4AQ6NE=
k8s.io/apimachinery v0.27.6/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apiserver v0.27.6 h1:r/eHN8r3lG2buggHrVMy++kKhHlHn1HWSX1dqDtes54=
k8s.io/apiserver v0.27.6/go.mod h1:Xeo9OEXn2kDLK5pqspjdXQx7YKgDyKSpwIB4p0BmpAQ=
k8s.io/cli-runtime v0.27.6 h1:ik1+20C0AvxYcqEzwebH2PHOlqBTKUHZnOuPtG2CCl8=
k8s.io/cli-runtime v0.27.6/go.mod h1:+qSBK08EJL1fFvsfVNlETzsgGtxIhascIGZSuaQXQro=
k8s.io/client-go v0.27.6 h1:vzI8804gpUtpMCNaFjIFyJrifH7u//LJCJPy8fQuYQg=
k8s.io/client-go v0.27.6/go.mod h1:PMsXcDKiJTW7PHJ64oEsIUJF319wm+EFlCj76oE5QXM=
k8s.io/cloud-provider v0.27.6 h1:LuMBzpojGTKhl0AgcaE3SMz0F22BpGVbAPUI8Ifpl5k=
k8s.io/cloud-provider v0.27.6/go.mod h1:FWcfh5Kdw41HIblKXWzS2K3u1rHbWUfPDdk3JvmWQ58=
k8s.io/component-base v0.27.6 h1:hF5WxX7Tpi9/dXAbLjPVkIA6CA6Pi6r9JOHyo0uCDYI=
k8s.io/component-base v0.27.6/go.mod h1:NvjLtaneUeb0GgMPpCBF+4LNB9GuhDHi16uUTjBhQfU=
k8s.io/component-helpers v0.27.6 h1:aP9rWRcCOu9CTFMYN16ca1wJ8xEtE8vdDf5zZAeexgI=
k8s.io/component-helpers v0.27.6/go.mod h1:TllV1mWvXPvNj45ii2YInHNdZJ881dmdORRVGk8nL8s=
k8s.io/controller-manager v0.27.6 h1:4K4C1Ok7/bBwW4Pa8CRnLgFwNsRNUbZbAtqBTibtEBw=
k8s.io/controller-manager v0.27.6/go.mod h1:582Zin/Kn/qvLPO+gzzxl3XxM92fTK3hLb24rKKjxGU=
k8s.io/cri-api v0.27.6 h1:2h8YYRlob5c1baGkcCALCXuX3bKQIVid7J8t8qUi0mI=
k8s.io/cri-api v0.27.6/go.mod h1:+Ts/AVYbIo04S86XbTD73UPp/DkTiYxtsFeOFEu32L0=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.27.5 h1:PQzDfcjv6kpsCDrqB9ZjsNviB9xI8LlUwr9AitrPWmg=
k8s.io/kms v0.27.5/go.mod h1:myBrteyByscWU+6yJUSwP7111C4afVaScZtpmG4lTyg=
k8s.io/kube-aggregator v0.27.5 h1:/Q1QfyNyrBWFJKMxAlc1duOliZMvOt7fq1pZSxD3FXo=
k8s.io/kube-aggregator v0.27.5/go.mod h1:59Vo5BGjbKT7yjLkanv7SQ6WiBwRgj+j6yhiEjv/ook=
k8s.io/kms v0.27.6 h1:0IWDsxoget7Gs4zzMAY+y7dwNaGvwlAvS2XQVuFECU0=
k8s.io/kms v0.27.6/go.mod h1:9YQuCFa+n88RWokHkl+4RHFQ9DATSip/ihBqxlDUBuw=
k8s.io/kube-aggregator v0.27.6 h1:X6SlAHKu5qhabCPvKk9AK5HqJ4kHjIp8T1jTc4gIa5k=
k8s.io/kube-aggregator v0.27.6/go.mod h1:49vSYFfW3hYwFN40v1fxMJwWo86VPADxs18kbfHsp0Q=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
k8s.io/kubectl v0.27.5 h1:ATIs0KAhKaExzLzm38j2uHTo6TeJ6qHJyajGktTXBCA=
k8s.io/kubectl v0.27.5/go.mod h1:aT54VMjuGQqKqpgkxAL3+ZDCyYkGalSQToYWjyhMYq8=
k8s.io/kubelet v0.27.5 h1:uysO9NozKUi5zAde+hMXfCU1dWNjL/UBhRGVZk8uUJQ=
k8s.io/kubelet v0.27.5/go.mod h1:xwIXdhJReWW2GuFQpAlj1qbaxD1O7JpGueItvc47tXg=
k8s.io/kubernetes v1.27.5 h1:qnkrNAPz2jm/k+oWBNOJ6q+kCQ7OXkO8v3WWU9jumwo=
k8s.io/kubernetes v1.27.5/go.mod h1:MbYZxAacYS6HjZ6VJuvKaKTilbzp0B0atzW3J8TFBEo=
k8s.io/metrics v0.27.5 h1:AKeVCpPUCFXCY2wLIHXwOrBKXHwVyLmZCcncfn7BgvI=
k8s.io/metrics v0.27.5/go.mod h1:FMrfgYpjaWIx+ZB2cGUgEYMKNO5vayj0nX2HERJa5AM=
k8s.io/mount-utils v0.27.5 h1:6g98ViXeqbhQ8gd/IWuW2+ksMBxFOtVEokSkNGtOQ4Y=
k8s.io/mount-utils v0.27.5/go.mod h1:vmcjYdi2Vg1VTWY7KkhvwJVY6WDHxb/QQhiQKkR8iNs=
k8s.io/kubectl v0.27.6 h1:mZJTqfIsRjahlHmYJth9r/ivWs9RhavFR0EvMM9Jb5Y=
k8s.io/kubectl v0.27.6/go.mod h1:QgZcOIbcICjxHXOhrFC6jJXe5/Sik2fPuyV67kzjGX4=
k8s.io/kubelet v0.27.6 h1:zh3xknclUEp0a3zLVM9GxCDFownh+EpxYNcX30fMvi0=
k8s.io/kubelet v0.27.6/go.mod h1:X9ZcgmOR6/I42slO2Lxd+F8WAO7TXS6UHYyobTDUPzE=
k8s.io/kubernetes v1.27.6 h1:S89BDD6Rl316AMoxbkddiNhGyUHmxV3fdxGtrx8aqq8=
k8s.io/kubernetes v1.27.6/go.mod h1:otFZGfN11HvC2Es0PN7FpbkSDRT7LYG7xyc9pCd6f4E=
k8s.io/metrics v0.27.6 h1:M+Ix1WicmfzTn/1LPix9fKKhxEN+/88jdlu1fvmbLec=
k8s.io/metrics v0.27.6/go.mod h1:rM5f+jbcPHj7kNgL0M5dR85KzehH7XTFv74Dou1YIIE=
k8s.io/mount-utils v0.27.6 h1:Y8TH5zcHLgHFHbwSZWMrbpDyad46+k2WnIgCfmwzqpk=
k8s.io/mount-utils v0.27.6/go.mod h1:vmcjYdi2Vg1VTWY7KkhvwJVY6WDHxb/QQhiQKkR8iNs=
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk=
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.4-0.20230505142456-f92397840738 h1:Nb9UIOXWjmxhbZ/og27D3TpDytMvT/jKyNw9jho2BhI=
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 (
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.27.5 // indirect
k8s.io/client-go v0.27.5 // indirect
k8s.io/apimachinery v0.27.6 // indirect
k8s.io/client-go v0.27.6 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
10 changes: 5 additions & 5 deletions hack/tool/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
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.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
k8s.io/api v0.27.6 h1:PBWu/lywJe2qQcshMjubzcBg7+XDZOo7O8JJAWuYtUo=
k8s.io/apimachinery v0.27.6 h1:mGU8jmBq5o8mWBov+mLjdTBcU+etTE19waies4AQ6NE=
k8s.io/apimachinery v0.27.6/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/client-go v0.27.6 h1:vzI8804gpUtpMCNaFjIFyJrifH7u//LJCJPy8fQuYQg=
k8s.io/client-go v0.27.6/go.mod h1:PMsXcDKiJTW7PHJ64oEsIUJF319wm+EFlCj76oE5QXM=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
Expand Down
6 changes: 3 additions & 3 deletions inttest/conformance/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ In order to run the conformance test, you will need to set the tested k0s versio
In the same directory as your `main.tf` file, create an additional file `terraform.tfvars` with the following input:

```terraform
k0s_version=v1.27.5+k0s.0
k8s_version=v1.27.5
k0s_version=v1.27.6+k0s.0
k8s_version=v1.27.6
sonobuoy_version=0.53.2
```

### 2. Environment variables

```shell
TF_VAR_k0s_version=v1.27.5+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.5 terraform apply
TF_VAR_k0s_version=v1.27.6+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.6 terraform apply
```

**NOTE:** By default, terraform will fetch sonobuoy version **0.53.2**. If you want to use a different version you can override this with one of the above methods.
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.27.5+k0s.0"
version: "1.27.6+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.27.5+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.5+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.5+k0s.0
INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.6+k0s.0
INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.6+k0s.0
INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.27.6+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.27.5+k0s.0 is now installed
INFO k0s cluster version v1.27.6+k0s.0 is now installed
INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
INFO k0sctl kubeconfig
```
Expand All @@ -151,7 +151,7 @@ Example Output:
➜ make check-conformance
/home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \
--mode=certified-conformance \
--kubernetes-version=v1.27.5
--kubernetes-version=v1.27.6
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.27.5+k0s.0
version: v1.27.6+k0s.0
downloadURLs:
k0s:
linux-amd64: ..../k0s-amd64
Expand Down
Loading

0 comments on commit 2b80b83

Please sign in to comment.