Skip to content

Commit 27cb615

Browse files
author
navigaid
committed
go1.21: drop embedded gost && kubectl
1 parent 28bde13 commit 27cb615

File tree

44 files changed

+150
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+150
-203
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
test:
1313
strategy:
1414
matrix:
15-
go-version: [1.19]
15+
go-version: [1.21]
1616
platform: [ubuntu-latest, macos-latest, windows-latest]
1717
runs-on: ${{ matrix.platform }}
1818
steps:

‎WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ go_rules_dependencies()
4141

4242
go_register_toolchains(
4343
nogo = "@//:nogo",
44-
version = "1.20.5",
44+
version = "1.21.0",
4545
) # nogo is in the top-level BUILD file of this workspace
4646

4747
git_repository(
@@ -223,7 +223,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
223223
git_repository(
224224
name = "io_bazel_rules_grafana",
225225
# commit = "{HEAD}", # replace with a real commit hash
226-
branch = "master",
226+
branch = "main",
227227
remote = "https://github.com/etsy/rules_grafana.git",
228228
)
229229

‎cmd/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k0s.io/cmd
22

3-
go 1.20
3+
go 1.21
44

55
replace k0s.io => ../
66

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k0s.io
22

3-
go 1.20
3+
go 1.21
44

55
replace k0s.io => ././
66

‎go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.20
1+
go 1.21
22

33
use (
44
.

‎go_repos.bzl

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2813,8 +2813,8 @@ def go_repositories():
28132813
build_file_generation = "on",
28142814
build_file_proto_mode = "disable",
28152815
importpath = "github.com/go-logr/logr",
2816-
sum = "h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=",
2817-
version = "v1.2.3",
2816+
sum = "h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=",
2817+
version = "v1.2.4",
28182818
)
28192819
go_repository(
28202820
name = "com_github_go_logr_stdr",
@@ -2949,8 +2949,8 @@ def go_repositories():
29492949
build_file_generation = "on",
29502950
build_file_proto_mode = "disable",
29512951
importpath = "github.com/go-task/slim-sprig",
2952-
sum = "h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=",
2953-
version = "v0.0.0-20210107165309-348f09dbbbc0",
2952+
sum = "h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=",
2953+
version = "v0.0.0-20230315185526-52ccab3ef572",
29542954
)
29552955
go_repository(
29562956
name = "com_github_go_test_deep",
@@ -6313,16 +6313,16 @@ def go_repositories():
63136313
build_file_generation = "on",
63146314
build_file_proto_mode = "disable",
63156315
importpath = "github.com/onsi/ginkgo/v2",
6316-
sum = "h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=",
6317-
version = "v2.9.1",
6316+
sum = "h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=",
6317+
version = "v2.9.5",
63186318
)
63196319
go_repository(
63206320
name = "com_github_onsi_gomega",
63216321
build_file_generation = "on",
63226322
build_file_proto_mode = "disable",
63236323
importpath = "github.com/onsi/gomega",
6324-
sum = "h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=",
6325-
version = "v1.27.4",
6324+
sum = "h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=",
6325+
version = "v1.27.6",
63266326
)
63276327
go_repository(
63286328
name = "com_github_op_go_logging",
@@ -6914,16 +6914,24 @@ def go_repositories():
69146914
build_file_generation = "on",
69156915
build_file_proto_mode = "disable",
69166916
importpath = "github.com/quic-go/qtls-go1-20",
6917-
sum = "h1:c6vlM0jdCR8mzSoMMC4AdJOC6eLIOy+bFjvJDRmuJLE=",
6918-
version = "v0.1.0-rc.1",
6917+
sum = "h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=",
6918+
version = "v0.3.1",
69196919
)
69206920
go_repository(
69216921
name = "com_github_quic_go_quic_go",
69226922
build_file_generation = "on",
69236923
build_file_proto_mode = "disable",
69246924
importpath = "github.com/quic-go/quic-go",
6925-
sum = "h1:5I+mV3QlO/IIF5onr8qU9RregPf6seDeglC7BQkmrLc=",
6926-
version = "v0.31.2-0.20230125230034-dfbfe71309ca",
6925+
sum = "h1:0TvDicIgKyKKeV3lyKmAgh/HC/bOVGKwMgiFwxjSQW0=",
6926+
version = "v0.37.2-0.20230809122639-10d11149625a",
6927+
)
6928+
go_repository(
6929+
name = "com_github_quic_go_webtransport_go",
6930+
build_file_generation = "on",
6931+
build_file_proto_mode = "disable",
6932+
importpath = "github.com/quic-go/webtransport-go",
6933+
sum = "h1:5XMlzemqB4qmOlgIus5zB45AcZ2kCgCy2EptUrfOPWU=",
6934+
version = "v0.5.3",
69276935
)
69286936

69296937
go_repository(
@@ -8366,6 +8374,14 @@ def go_repositories():
83668374
sum = "h1:cvxH1mC/VTs2oRx3njhIhpypg2EBE70rlxAKKtRU/Zg=",
83678375
version = "v2.11.0",
83688376
)
8377+
go_repository(
8378+
name = "com_github_webteleport_auth",
8379+
build_file_generation = "on",
8380+
build_file_proto_mode = "disable",
8381+
importpath = "github.com/webteleport/auth",
8382+
sum = "h1:+bbdFdKwx5tc8uL6x+j2DS+p185VeLCj6Yn7m9dWvko=",
8383+
version = "v0.0.2",
8384+
)
83698385

83708386
go_repository(
83718387
name = "com_github_webteleport_utils",
@@ -8380,8 +8396,8 @@ def go_repositories():
83808396
build_file_generation = "on",
83818397
build_file_proto_mode = "disable",
83828398
importpath = "github.com/webteleport/webteleport",
8383-
sum = "h1:4TX2PUK26z6um4ru7yiJMznCPWlYpQkjsO8QwDMlpng=",
8384-
version = "v0.2.6",
8399+
sum = "h1:paug+lVSC8hhib13UQh0+xsiOqfGQGNkSU/RkU4c0Po=",
8400+
version = "v0.2.8",
83858401
)
83868402
go_repository(
83878403
name = "com_github_webtransport_quic_go",
@@ -9677,24 +9693,24 @@ def go_repositories():
96779693
)
96789694
go_repository(
96799695
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace",
9680-
build_file_generation = "on",
9681-
build_file_proto_mode = "disable",
96829696
build_directives = [
96839697
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal @io_opentelemetry_go_otel//exporters/otlp/internal",
96849698
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal/envconfig @io_opentelemetry_go_otel//exporters/otlp/internal/envconfig",
96859699
],
9700+
build_file_generation = "on",
9701+
build_file_proto_mode = "disable",
96869702
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace",
96879703
sum = "h1:pDDYmo0QadUPal5fwXoY1pmMpFcdyhXOmL5drCrI3vU=",
96889704
version = "v1.10.0",
96899705
)
96909706
go_repository(
96919707
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracegrpc",
9692-
build_file_generation = "on",
9693-
build_file_proto_mode = "disable",
96949708
build_directives = [
96959709
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal @io_opentelemetry_go_otel//exporters/otlp/internal",
96969710
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal/envconfig @io_opentelemetry_go_otel//exporters/otlp/internal/envconfig",
96979711
],
9712+
build_file_generation = "on",
9713+
build_file_proto_mode = "disable",
96989714
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc",
96999715
sum = "h1:KtiUEhQmj/Pa874bVYKGNVdq8NPKiacPbaRRtgXi+t4=",
97009716
version = "v1.10.0",
@@ -9952,8 +9968,8 @@ def go_repositories():
99529968
build_file_generation = "on",
99539969
build_file_proto_mode = "disable",
99549970
importpath = "golang.org/x/exp",
9955-
sum = "h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=",
9956-
version = "v0.0.0-20221205204356-47842c84f3db",
9971+
sum = "h1:wu5bD43Ana/nF1ZmaLr3lW/FQeJU8CcI+Ln7yWHViXE=",
9972+
version = "v0.0.0-20230809094429-853ea248256d",
99579973
)
99589974
go_repository(
99599975
name = "org_golang_x_image",
@@ -9984,16 +10000,16 @@ def go_repositories():
998410000
build_file_generation = "on",
998510001
build_file_proto_mode = "disable",
998610002
importpath = "golang.org/x/mod",
9987-
sum = "h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=",
9988-
version = "v0.9.0",
10003+
sum = "h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=",
10004+
version = "v0.11.0",
998910005
)
999010006
go_repository(
999110007
name = "org_golang_x_net",
999210008
build_file_generation = "on",
999310009
build_file_proto_mode = "disable",
999410010
importpath = "golang.org/x/net",
9995-
sum = "h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=",
9996-
version = "v0.8.0",
10011+
sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
10012+
version = "v0.10.0",
999710013
)
999810014
go_repository(
999910015
name = "org_golang_x_oauth2",
@@ -10016,32 +10032,32 @@ def go_repositories():
1001610032
build_file_generation = "on",
1001710033
build_file_proto_mode = "disable",
1001810034
importpath = "golang.org/x/sync",
10019-
sum = "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=",
10020-
version = "v0.1.0",
10035+
sum = "h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=",
10036+
version = "v0.2.0",
1002110037
)
1002210038
go_repository(
1002310039
name = "org_golang_x_sys",
1002410040
build_file_generation = "on",
1002510041
build_file_proto_mode = "disable",
1002610042
importpath = "golang.org/x/sys",
10027-
sum = "h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=",
10028-
version = "v0.6.0",
10043+
sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
10044+
version = "v0.8.0",
1002910045
)
1003010046
go_repository(
1003110047
name = "org_golang_x_term",
1003210048
build_file_generation = "on",
1003310049
build_file_proto_mode = "disable",
1003410050
importpath = "golang.org/x/term",
10035-
sum = "h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=",
10036-
version = "v0.6.0",
10051+
sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=",
10052+
version = "v0.8.0",
1003710053
)
1003810054
go_repository(
1003910055
name = "org_golang_x_text",
1004010056
build_file_generation = "on",
1004110057
build_file_proto_mode = "disable",
1004210058
importpath = "golang.org/x/text",
10043-
sum = "h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=",
10044-
version = "v0.8.0",
10059+
sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=",
10060+
version = "v0.9.0",
1004510061
)
1004610062
go_repository(
1004710063
name = "org_golang_x_time",
@@ -10056,8 +10072,8 @@ def go_repositories():
1005610072
build_file_generation = "on",
1005710073
build_file_proto_mode = "disable",
1005810074
importpath = "golang.org/x/tools",
10059-
sum = "h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=",
10060-
version = "v0.7.0",
10075+
sum = "h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=",
10076+
version = "v0.9.1",
1006110077
)
1006210078
go_repository(
1006310079
name = "org_golang_x_xerrors",

‎pkg/agent/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k0s.io/pkg/agent
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/ActiveState/termtest/conpty v0.5.0

‎pkg/agent/server/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ go_library(
1010
"plugin_fileserver.go",
1111
"plugin_metricsserver.go",
1212
"plugin_pingserver.go",
13-
"plugin_redirectserver.go",
14-
"plugin_socks5server.go",
1513
"plugin_terminalserver.go",
1614
"plugin_versionserver.go",
1715
"plugin_xpraserver.go",
@@ -30,7 +28,6 @@ go_library(
3028
"//pkg/exporter/env:go_default_library",
3129
"//pkg/log:go_default_library",
3230
"//pkg/middleware:go_default_library",
33-
"@com_github_btwiuse_gost//:go_default_library",
3431
"@com_github_btwiuse_pretty//:go_default_library",
3532
"@io_nhooyr_websocket//:go_default_library",
3633
"@org_golang_x_sync//errgroup:go_default_library",

‎pkg/agent/server/plugin_redirectserver.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build plugin_redirectserver
2+
13
package server
24

35
import (

0 commit comments

Comments
 (0)