From 3f1bd12876bfc49c91c28692bc290bc05a25aa3a Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 25 Oct 2023 11:48:55 +0200 Subject: [PATCH] Bump k0sctl to v0.16.0 Signed-off-by: Tom Wieczorek --- .github/workflows/check-network.yaml | 2 +- .github/workflows/ostests-e2e.yaml | 2 +- docs/nllb.md | 2 +- hack/ostests/README.md | 2 +- .../modules/os/os_alpine_3_17_userdata.tftpl | 5 ----- hack/tool/go.mod | 8 +++----- hack/tool/go.sum | 16 ++++++---------- inttest/k0sctl/k0sctl_test.go | 2 +- 8 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.github/workflows/check-network.yaml b/.github/workflows/check-network.yaml index ac8c3e75f82f..390fd54a4eb2 100644 --- a/.github/workflows/check-network.yaml +++ b/.github/workflows/check-network.yaml @@ -15,7 +15,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: eu-west-1 TF_VERSION: 1.2.2 - K0SCTL_VERSION: 0.15.5 + K0SCTL_VERSION: 0.16.0 KUBECONFIG: ${{ github.workspace }}/kubeconfig name: "K8s Network Conformance Testing" diff --git a/.github/workflows/ostests-e2e.yaml b/.github/workflows/ostests-e2e.yaml index b342a7c3fd87..de7bc35c494b 100644 --- a/.github/workflows/ostests-e2e.yaml +++ b/.github/workflows/ostests-e2e.yaml @@ -35,7 +35,7 @@ on: k0sctl-version: type: string description: The k0sctl version to use when bootstrapping the test cluster. - default: 0.15.5 + default: 0.16.0 secrets: aws-access-key-id: description: The AWS access key ID to use when provisioning test resources. diff --git a/docs/nllb.md b/docs/nllb.md index 300cdaf40313..aacb689f86a9 100644 --- a/docs/nllb.md +++ b/docs/nllb.md @@ -135,7 +135,7 @@ $ k0sctl apply ⣿⣿⣿⣿⣟⠋⠀⠀⠀⠀⠀⢸⣿⡇⠀⢰⣾⣿⠀⠀⣿⣿⡇⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀███ ███ ███ ⣿⣿⡏⠻⣿⣷⣤⡀⠀⠀⠀⠸⠛⠁⠀⠸⠋⠁⠀⠀⣿⣿⡇⠈⠉⠉⠉⠉⠉⠉⠉⠉⢹⣿⣿⠀███ ███ ███ ⣿⣿⡇⠀⠀⠙⢿⣿⣦⣀⠀⠀⠀⣠⣶⣶⣶⣶⣶⣶⣿⣿⡇⢰⣶⣶⣶⣶⣶⣶⣶⣶⣾⣿⣿⠀█████████ ███ ██████████ -k0sctl 0.15.0 Copyright 2022, k0sctl authors. +k0sctl 0.16.0 Copyright 2022, k0sctl authors. By continuing to use k0sctl you agree to these terms: https://k0sproject.io/licenses/eula level=info msg="==> Running phase: Connect to hosts" diff --git a/hack/ostests/README.md b/hack/ostests/README.md index 67f3d94462ea..1530f9bfdf05 100644 --- a/hack/ostests/README.md +++ b/hack/ostests/README.md @@ -20,7 +20,7 @@ Two workers are a minimum requirement for the Kubernetes conformance tests. For the local plumbing: * A POSIXish environment (`env`, `sh`, `echo`, `printf`) -* [k0sctl] (tested with ~= 0.15) +* [k0sctl] (tested with 0.16.0) * [jq] (tested with ~= 1.6) For the AWS infra: diff --git a/hack/ostests/modules/os/os_alpine_3_17_userdata.tftpl b/hack/ostests/modules/os/os_alpine_3_17_userdata.tftpl index 800854bfd3d8..b355c91bad8f 100644 --- a/hack/ostests/modules/os/os_alpine_3_17_userdata.tftpl +++ b/hack/ostests/modules/os/os_alpine_3_17_userdata.tftpl @@ -8,8 +8,3 @@ rc-update add machine-id boot rc-update add cgroups boot /etc/init.d/cgroups start %{endif} - -# k0sctl currently doesn't support BusyBox/doas properly. -apk add coreutils sudo && apk del doas -apk add bash # Remove after https://github.com/k0sproject/rig/pull/94 -echo 'alpine ALL=(ALL:ALL) NOPASSWD: ALL' >/etc/sudoers.d/alpine-all-access diff --git a/hack/tool/go.mod b/hack/tool/go.mod index c6c290b93b02..928b35751256 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/hashicorp/terraform-exec v0.19.0 - github.com/k0sproject/k0sctl v0.15.5 + github.com/k0sproject/k0sctl v0.16.0 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 ) @@ -13,7 +13,6 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 // indirect github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6 // indirect - github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/a8m/envsubst v1.4.2 // indirect github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect @@ -21,7 +20,6 @@ require ( github.com/alessio/shellescape v1.4.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect - github.com/avast/retry-go v3.0.0+incompatible // indirect github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect github.com/carlmjohnson/versioninfo v0.22.5 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect @@ -36,7 +34,7 @@ require ( github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.15.0 // indirect + github.com/go-playground/validator/v10 v10.15.5 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -55,7 +53,7 @@ require ( github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/k0sproject/dig v0.2.0 // indirect - github.com/k0sproject/rig v0.12.0 // indirect + github.com/k0sproject/rig v0.15.1 // indirect github.com/k0sproject/version v0.4.2 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index 17afde09e6b8..7cd83c6de473 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -6,8 +6,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6 h1:w0E0fgc1YafGEh5cROhlROMWXiNoZqApk2PDN0M1+Ns= github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= @@ -27,8 +25,6 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmms github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0= -github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc= github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -72,8 +68,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.15.0 h1:nDU5XeOKtB3GEa+uB7GNYwhVKsgjAR7VgKoNB6ryXfw= -github.com/go-playground/validator/v10 v10.15.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24= +github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -135,10 +131,10 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w= github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78= -github.com/k0sproject/k0sctl v0.15.5 h1:6RNi+9wK6JokRhiptiw0qdY6vKcjU3vr+Y/Ciw1uXVY= -github.com/k0sproject/k0sctl v0.15.5/go.mod h1:MQqbcG0G0AAs0RhzyqhZLBbgKuUYE85po3enPZnchjg= -github.com/k0sproject/rig v0.12.0 h1:5bn1KD3lfZqSoKLGjR2Klvj8ODLT66nMpVLwB0c4x+M= -github.com/k0sproject/rig v0.12.0/go.mod h1:slhifauXduKP5hQaWnpJzTHUK2itsG0K91XcZqnzyJ0= +github.com/k0sproject/k0sctl v0.16.0 h1:bu5libLQGPGx7WqcOqI1H69dHMFHsFgmDUc99OevDJI= +github.com/k0sproject/k0sctl v0.16.0/go.mod h1:vafg/5qUKuc986qBBsKU70+DxWmdirkth55YgQVRTrQ= +github.com/k0sproject/rig v0.15.1 h1:QjEBSgDDMk24NB6vLozIilUGPn0nOGEz/AFkPOZkYWw= +github.com/k0sproject/rig v0.15.1/go.mod h1:EQQjrgGbRY6MpbuZRpzMaymJJ86RJVxIuGsPGsVNfZg= github.com/k0sproject/version v0.4.2 h1:zrbT5xRv1ai4N102ZaHTTq9Zqf6pAGFm9WCxHaC9QHY= github.com/k0sproject/version v0.4.2/go.mod h1:oEjuz2ItQQtAnGyRgwEV9m5R6/9rjoFC6EiEEzbkFdI= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= diff --git a/inttest/k0sctl/k0sctl_test.go b/inttest/k0sctl/k0sctl_test.go index 2ab243261a27..5d3ddc690caf 100644 --- a/inttest/k0sctl/k0sctl_test.go +++ b/inttest/k0sctl/k0sctl_test.go @@ -37,7 +37,7 @@ import ( "github.com/k0sproject/k0s/inttest/common" ) -const k0sctlVersion = "v0.15.5" +const k0sctlVersion = "v0.16.0" type K0sctlSuite struct { common.FootlooseSuite