Skip to content

Commit

Permalink
Merge pull request #4186 from twz123/bump-kubernetes-1.27
Browse files Browse the repository at this point in the history 
[release-1.27] Bump Kubernetes to v1.27.12
  • Loading branch information
@twz123
twz123 authored Mar 28, 2024
2 parents e4b6da3 + 490b1d3 commit 68ed6f8
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 112 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.11+k0s.0")'
description: 'Version tag (e.g."v1.27.12+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.27.11
kubernetes_version = 1.27.12
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.11/bin/linux/amd64/kubectl && \
RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.27.12/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.11
k8s.io/apiextensions-apiserver v0.27.11
k8s.io/apimachinery v0.27.11
k8s.io/cli-runtime v0.27.11
k8s.io/client-go v0.27.11
k8s.io/cloud-provider v0.27.11
k8s.io/component-base v0.27.11
k8s.io/component-helpers v0.27.11
k8s.io/cri-api v0.27.11
k8s.io/kube-aggregator v0.27.11
k8s.io/kubectl v0.27.11
k8s.io/kubelet v0.27.11
k8s.io/kubernetes v1.27.11
k8s.io/mount-utils v0.27.11
k8s.io/api v0.27.12
k8s.io/apiextensions-apiserver v0.27.12
k8s.io/apimachinery v0.27.12
k8s.io/cli-runtime v0.27.12
k8s.io/client-go v0.27.12
k8s.io/cloud-provider v0.27.12
k8s.io/component-base v0.27.12
k8s.io/component-helpers v0.27.12
k8s.io/cri-api v0.27.12
k8s.io/kube-aggregator v0.27.12
k8s.io/kubectl v0.27.12
k8s.io/kubelet v0.27.12
k8s.io/kubernetes v1.27.12
k8s.io/mount-utils v0.27.12
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 @@ -151,7 +151,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.12.7 // indirect
github.com/google/certificate-transparency-go v1.1.4 // indirect
Expand Down Expand Up @@ -271,12 +271,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.11 // indirect
k8s.io/controller-manager v0.27.11 // indirect
k8s.io/apiserver v0.27.12 // indirect
k8s.io/controller-manager v0.27.12 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kms v0.27.11 // indirect
k8s.io/kms v0.27.12 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/metrics v0.27.11 // indirect
k8s.io/metrics v0.27.12 // 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 @@ -308,34 +308,34 @@ replace (

// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.27.11/go.mod#L249-L279
k8s.io/api => k8s.io/api v0.27.11
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.11
k8s.io/apimachinery => k8s.io/apimachinery v0.27.11
k8s.io/apiserver => k8s.io/apiserver v0.27.11
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.11
k8s.io/client-go => k8s.io/client-go v0.27.11
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.11
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.11
k8s.io/code-generator => k8s.io/code-generator v0.27.11
k8s.io/component-base => k8s.io/component-base v0.27.11
k8s.io/component-helpers => k8s.io/component-helpers v0.27.11
k8s.io/controller-manager => k8s.io/controller-manager v0.27.11
k8s.io/cri-api => k8s.io/cri-api v0.27.11
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.11
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.11
k8s.io/kms => k8s.io/kms v0.27.11
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.11
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.11
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.11
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.11
k8s.io/kubectl => k8s.io/kubectl v0.27.11
k8s.io/kubelet => k8s.io/kubelet v0.27.11
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.11
k8s.io/metrics => k8s.io/metrics v0.27.11
k8s.io/mount-utils => k8s.io/mount-utils v0.27.11
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.11
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.11
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.11
k8s.io/sample-controller => k8s.io/sample-controller v0.27.11
// https://github.com/kubernetes/kubernetes/blob/v1.27.12/go.mod#L249-L279
k8s.io/api => k8s.io/api v0.27.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.12
k8s.io/apimachinery => k8s.io/apimachinery v0.27.12
k8s.io/apiserver => k8s.io/apiserver v0.27.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.12
k8s.io/client-go => k8s.io/client-go v0.27.12
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.12
k8s.io/code-generator => k8s.io/code-generator v0.27.12
k8s.io/component-base => k8s.io/component-base v0.27.12
k8s.io/component-helpers => k8s.io/component-helpers v0.27.12
k8s.io/controller-manager => k8s.io/controller-manager v0.27.12
k8s.io/cri-api => k8s.io/cri-api v0.27.12
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.12
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.12
k8s.io/kms => k8s.io/kms v0.27.12
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.12
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.12
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.12
k8s.io/kubectl => k8s.io/kubectl v0.27.12
k8s.io/kubelet => k8s.io/kubelet v0.27.12
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.12
k8s.io/metrics => k8s.io/metrics v0.27.12
k8s.io/mount-utils => k8s.io/mount-utils v0.27.12
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.12
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.12
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.27.12
k8s.io/sample-controller => k8s.io/sample-controller v0.27.12
)
76 changes: 38 additions & 38 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
github.com/golangplus/bytes v1.0.0/go.mod h1:AdRaCFwmc/00ZzELMWb01soso6W1R/++O1XL80yAn+A=
github.com/golangplus/fmt v1.0.0/go.mod h1:zpM0OfbMCjPtd2qkTD/jX2MgiFCqklhSUFyDW44gVQE=
Expand Down Expand Up @@ -1493,46 +1493,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.11 h1:IsGrWbXt7RkE+arc9GLQPYI5AtZkT+feBMorY+Nzx4I=
k8s.io/api v0.27.11/go.mod h1:SGqTcyqa0e+Db3pgyH6v+por5dO2OdTkKDCdD3Op3Ng=
k8s.io/apiextensions-apiserver v0.27.11 h1:+NZfWpN842yab/O1RRDu8+11eSACA2cPa2VixSxiONM=
k8s.io/apiextensions-apiserver v0.27.11/go.mod h1:BhfSAHizE6MjUiD0FtBxwOakCr8/GLB7Icepd0jk7XU=
k8s.io/apimachinery v0.27.11 h1:ivrKMN7JgdtKhay14S5UQlvilV3z6W+wjiSQTzyr5zc=
k8s.io/apimachinery v0.27.11/go.mod h1:IHu2ovJ60RqxyPSLmTel7KDLdOCRbpOxwtUBmwBnT/E=
k8s.io/apiserver v0.27.11 h1:ztQgOjOlRLeRqii0vWBKmXAPj+NS4RW75sUHk8IobIs=
k8s.io/apiserver v0.27.11/go.mod h1:fQNBsQ2CI0XJz0dD6hLuStPLR9ym6EmUBn5TuUJBsQU=
k8s.io/cli-runtime v0.27.11 h1:vAyvn5fsucgRW2uNhYTYPoc1nD5LJxj3iSP+X7NLK6Y=
k8s.io/cli-runtime v0.27.11/go.mod h1:4WtAVi2YDtleXsVRYcoDZxLg4o5iuRBiOdaOGO0nN+U=
k8s.io/client-go v0.27.11 h1:SZChXsDaN6lB5IYywCpvQs/ZUa5vK2NHkpEwUhoK3fQ=
k8s.io/client-go v0.27.11/go.mod h1:Rg3Yeuk9sX87gpVunVn3AsvMkGZfXuutTDC/jigBNUo=
k8s.io/cloud-provider v0.27.11 h1:Q+n3+aJDaiZBkjHiFJxK1P1kClxucF43WF/m10Udzoo=
k8s.io/cloud-provider v0.27.11/go.mod h1:NDARj8iDJoy0oFALr64AsO7Z1b5CdD77o3xXzJmYlc0=
k8s.io/component-base v0.27.11 h1:oq1xukCfjOlF6Jpe7/1PMOXhzicW3HqaUi8aaBmvCEM=
k8s.io/component-base v0.27.11/go.mod h1:YHs4U6ETkkvGj7NR44ISaSMiDQrV7nPtUnIenALJicw=
k8s.io/component-helpers v0.27.11 h1:bJ+cHp+YnponkR0qg3OGqwJglJ6CowM2lZpMrPPXRzE=
k8s.io/component-helpers v0.27.11/go.mod h1:6w2eYpHKywq4XhVHr7iW57W0wSBeQSyd107U4KSqJoM=
k8s.io/controller-manager v0.27.11 h1:Z/Y/w9ejDcDmKM7PCaNTwVJpXjXyDtu4a5eRM9dYz5U=
k8s.io/controller-manager v0.27.11/go.mod h1:Was1Sl9fNUaoKqdTZWRNA+z4kZt7pYokmTJzrgEWBus=
k8s.io/cri-api v0.27.11 h1:z5aa4rnkns+d7GCsbCAMO5kFw+zlb06tk+Av+vDYg1Q=
k8s.io/cri-api v0.27.11/go.mod h1:Bid1MLlktCFQG6tCTLJfhAddp9IPuF5Xt8kWBwkxkRs=
k8s.io/api v0.27.12 h1:Qprj/nuFj4xjbsAuJ05F1sCHs1d0x33n/Ni0oAVEFDo=
k8s.io/api v0.27.12/go.mod h1:PNRL63V26JzKe2++ho6W/YRp3k9XG7nirN4J7WRy5gY=
k8s.io/apiextensions-apiserver v0.27.12 h1:1A1+0rlOrqKi+LbCTf3MeFbYmBFGoQ9rFHxBgFnhOpE=
k8s.io/apiextensions-apiserver v0.27.12/go.mod h1:KkUHCjJ/Awhly9NnVsYySZtQSxuWU+8IL4p2ffE4JQ8=
k8s.io/apimachinery v0.27.12 h1:Nt20vwaAHcZsM4WdkOtLaDeBJHg9QJW8JyOOEn6xzRA=
k8s.io/apimachinery v0.27.12/go.mod h1:5/SjQaDYQgZOv8kuzNMzmNGrqh4/iyknC5yWjxU9ll8=
k8s.io/apiserver v0.27.12 h1:NYhYDrJgsLSaWPHLy6VydS2i+PyXKUGuAOMWQwVCkuI=
k8s.io/apiserver v0.27.12/go.mod h1:h0W4loXx+QzPlljY4XbDSsk+ob8vGgz2d6d/YZEgd4Y=
k8s.io/cli-runtime v0.27.12 h1:9iMbnrIuKe6B+0iIgMJueXace7e3lEQwU5hOrZM1nBo=
k8s.io/cli-runtime v0.27.12/go.mod h1:UWZLKn9tn/Z451VAVUTGb1bg2Zz7pSf2u7AJPLcJE7g=
k8s.io/client-go v0.27.12 h1:ouIB3ZitBjmBWh/9auP4erVl8AXkheqcmbH7FSFa7DI=
k8s.io/client-go v0.27.12/go.mod h1:h3X7RGr5s9Wm4NtI06Bzt3am4Kj6aXuZQcP7OD+48Sk=
k8s.io/cloud-provider v0.27.12 h1:8boxCbi7uSl7w/3u8WkQ3c0j6QdZH/3ik70sPiO2CN4=
k8s.io/cloud-provider v0.27.12/go.mod h1:Vfoj+1LWgGWzwCbBma5oGaQDNcpbhrqlsJktjhGsYzU=
k8s.io/component-base v0.27.12 h1:2/ooM9/gNxS2fZuRnLj3TWWg7KnEYmRj321du10waZA=
k8s.io/component-base v0.27.12/go.mod h1:SPA6ABqK2HDRuzMjoEEkj7ciDvK5bUpdHtvZQwdi/xM=
k8s.io/component-helpers v0.27.12 h1:bT7oDIXvDHK3nI/yrv2/N9nYmVuttwtR3DKhngbL7nQ=
k8s.io/component-helpers v0.27.12/go.mod h1:Wn2l/7jpmZbC1VpmUTeLYh0Wsp20SFfIYNNJAHSVX7g=
k8s.io/controller-manager v0.27.12 h1:cwaOfgdXqKQhHpxlT1TjKi5AeG861qb3ViulDSH1j30=
k8s.io/controller-manager v0.27.12/go.mod h1:WfUX9MdNP33By4TaznIA1QpCWnydKP36NSSvHxvnfOw=
k8s.io/cri-api v0.27.12 h1:d9WBiGlPNjqQBIM6ZVLJmRO77r4GGBQGjfGl44BZPUA=
k8s.io/cri-api v0.27.12/go.mod h1:t9SglmzvbkAJv8WGBC/laS+J3ro+N3hvXDavSZh8/IU=
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.11 h1:6zRE3QeLHeTaxDXqg7CY44FPd+9/PvRofjrBg8eFfr0=
k8s.io/kms v0.27.11/go.mod h1:B4bthjp9iM2foefi2jW/0Hepi5bvm+8Gjkfkp5jnZmE=
k8s.io/kube-aggregator v0.27.11 h1:BjX0atUDfwnt3edLTFdaGm52KCJSx6gmjADsYA9/UNE=
k8s.io/kube-aggregator v0.27.11/go.mod h1:/1fmDeEQeqkyi7JrcKlll+toDUdyWiMISw1FtaSuxME=
k8s.io/kms v0.27.12 h1:9FnDfhYeeC3yThx+OiYCk8hHpN7oHRYKBpD+9ozYK0E=
k8s.io/kms v0.27.12/go.mod h1:fi8VnrPB0X00h4f7yHz2yIo7MN+XW+MZLykNWUU6WWU=
k8s.io/kube-aggregator v0.27.12 h1:hjMQMs6vjUrt1ST54xECxBj21iYlqi3NzYLtyRKf4Sc=
k8s.io/kube-aggregator v0.27.12/go.mod h1:8ZmqZTzAXmu2SAsDK2SEwcB0MCneWf2TA04HVtstJU4=
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.11 h1:rndS6LxY+qjTsEE/frCRlCL/TWeokWOgynSa3v5lbPM=
k8s.io/kubectl v0.27.11/go.mod h1:1eq/sCLAWOsPaHt/zojqEvVJECOmC68ol6eO4RyC4oc=
k8s.io/kubelet v0.27.11 h1:o6XGh8QdGjXEYCHpdTOSY8GhrxhO80HIX7jWyL3ySvg=
k8s.io/kubelet v0.27.11/go.mod h1:h0ycSyyeSeQfTqJNxBUXF6hwAyETtwTb2oS0GKfaxP4=
k8s.io/kubernetes v1.27.11 h1:Qrd9IwWfkP0BO+LpH0rNttC3ZieMGgZW2mIvb8q9Ynw=
k8s.io/kubernetes v1.27.11/go.mod h1:cRLM3g95AsipdxwaEkPgIFiF+qda0y3UKHyDHVSj6ok=
k8s.io/metrics v0.27.11 h1:f9BQgW0uQ36y9dujRNCk+dTealrDH92NZQLomKRqh/A=
k8s.io/metrics v0.27.11/go.mod h1:yFjS1ikJHpl5Htn4MCspHwNUs6ix3rbRLysiyeIMoHo=
k8s.io/mount-utils v0.27.11 h1:1fTa/fOXxAO4XfQbp/vkwgY/2v5YVO1WQ9NU+uZbumk=
k8s.io/mount-utils v0.27.11/go.mod h1:ZTpotHgWN49RtIuK0Dy98noHxs2D0hqsbKMnwnKgY44=
k8s.io/kubectl v0.27.12 h1:BYRMNxmrazTNp5/CH7QReaMjoeQIESMv34fpDuC1czE=
k8s.io/kubectl v0.27.12/go.mod h1:IKQvyGhgZBY6KEXOcHoV8Ac7NIt/9PqI6MVrtmhi4NA=
k8s.io/kubelet v0.27.12 h1:YuS+iEuk2fmHLOxTtsLGfJWGzXF8vPTaYeSPIusbkAk=
k8s.io/kubelet v0.27.12/go.mod h1:sXoK4QKwMZPj9jennWapX9PaJ6onCHEqHmQxLREunOE=
k8s.io/kubernetes v1.27.12 h1:PrGJKsOsu1GPEyygpgaZl3UYBHjdL3WS7YfAYtINpGs=
k8s.io/kubernetes v1.27.12/go.mod h1:k9v6vyp50gmrtfPnKJypLEJJk/JlCT2jRPY0Hh7QBN4=
k8s.io/metrics v0.27.12 h1:FSrOhJ1LdvMCk+5doBzs+hu6IGyxp41nEjnW0KkaEPI=
k8s.io/metrics v0.27.12/go.mod h1:moXvBzculdWcjF8eNPi7PN4Xk9kHXN/MOsLlGe3B/lw=
k8s.io/mount-utils v0.27.12 h1:C+p6XlShMu075CyasSix7lG9EtkdVOSETYxkBuhpWZI=
k8s.io/mount-utils v0.27.12/go.mod h1:ZTpotHgWN49RtIuK0Dy98noHxs2D0hqsbKMnwnKgY44=
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
6 changes: 3 additions & 3 deletions hack/tool/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/gofrs/uuid v4.3.1+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand Down Expand Up @@ -90,8 +90,8 @@ require (
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apimachinery v0.27.11 // indirect
k8s.io/client-go v0.27.11 // indirect
k8s.io/apimachinery v0.27.12 // indirect
k8s.io/client-go v0.27.12 // 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
16 changes: 8 additions & 8 deletions hack/tool/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Expand Down Expand Up @@ -460,12 +460,12 @@ 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.11 h1:IsGrWbXt7RkE+arc9GLQPYI5AtZkT+feBMorY+Nzx4I=
k8s.io/api v0.27.11/go.mod h1:SGqTcyqa0e+Db3pgyH6v+por5dO2OdTkKDCdD3Op3Ng=
k8s.io/apimachinery v0.27.11 h1:ivrKMN7JgdtKhay14S5UQlvilV3z6W+wjiSQTzyr5zc=
k8s.io/apimachinery v0.27.11/go.mod h1:IHu2ovJ60RqxyPSLmTel7KDLdOCRbpOxwtUBmwBnT/E=
k8s.io/client-go v0.27.11 h1:SZChXsDaN6lB5IYywCpvQs/ZUa5vK2NHkpEwUhoK3fQ=
k8s.io/client-go v0.27.11/go.mod h1:Rg3Yeuk9sX87gpVunVn3AsvMkGZfXuutTDC/jigBNUo=
k8s.io/api v0.27.12 h1:Qprj/nuFj4xjbsAuJ05F1sCHs1d0x33n/Ni0oAVEFDo=
k8s.io/api v0.27.12/go.mod h1:PNRL63V26JzKe2++ho6W/YRp3k9XG7nirN4J7WRy5gY=
k8s.io/apimachinery v0.27.12 h1:Nt20vwaAHcZsM4WdkOtLaDeBJHg9QJW8JyOOEn6xzRA=
k8s.io/apimachinery v0.27.12/go.mod h1:5/SjQaDYQgZOv8kuzNMzmNGrqh4/iyknC5yWjxU9ll8=
k8s.io/client-go v0.27.12 h1:ouIB3ZitBjmBWh/9auP4erVl8AXkheqcmbH7FSFa7DI=
k8s.io/client-go v0.27.12/go.mod h1:h3X7RGr5s9Wm4NtI06Bzt3am4Kj6aXuZQcP7OD+48Sk=
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.11+k0s.0
k8s_version=v1.27.11
k0s_version=v1.27.12+k0s.0
k8s_version=v1.27.12
sonobuoy_version=0.53.2
```

### 2. Environment variables

```shell
TF_VAR_k0s_version=v1.27.11+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.11 terraform apply
TF_VAR_k0s_version=v1.27.12+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.27.12 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
Loading

0 comments on commit 68ed6f8

Please sign in to comment.