Skip to content

Commit

Permalink
go1.21: drop embedded gost && kubectl
Browse files Browse the repository at this point in the history
  • Loading branch information
navigaid committed Aug 11, 2023
1 parent 28bde13 commit 27cb615
Show file tree
Hide file tree
Showing 44 changed files with 150 additions and 203 deletions.
72 changes: 0 additions & 72 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19]
go-version: [1.21]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ go_rules_dependencies()

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

git_repository(
Expand Down Expand Up @@ -223,7 +223,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
git_repository(
name = "io_bazel_rules_grafana",
# commit = "{HEAD}", # replace with a real commit hash
branch = "master",
branch = "main",
remote = "https://github.com/etsy/rules_grafana.git",
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k0s.io/cmd

go 1.20
go 1.21

replace k0s.io => ../

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k0s.io

go 1.20
go 1.21

replace k0s.io => ././

Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.20
go 1.21

use (
.
Expand Down
84 changes: 50 additions & 34 deletions go_repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2813,8 +2813,8 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/go-logr/logr",
sum = "h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=",
version = "v1.2.3",
sum = "h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=",
version = "v1.2.4",
)
go_repository(
name = "com_github_go_logr_stdr",
Expand Down Expand Up @@ -2949,8 +2949,8 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/go-task/slim-sprig",
sum = "h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=",
version = "v0.0.0-20210107165309-348f09dbbbc0",
sum = "h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=",
version = "v0.0.0-20230315185526-52ccab3ef572",
)
go_repository(
name = "com_github_go_test_deep",
Expand Down Expand Up @@ -6313,16 +6313,16 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/onsi/ginkgo/v2",
sum = "h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=",
version = "v2.9.1",
sum = "h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=",
version = "v2.9.5",
)
go_repository(
name = "com_github_onsi_gomega",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/onsi/gomega",
sum = "h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=",
version = "v1.27.4",
sum = "h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=",
version = "v1.27.6",
)
go_repository(
name = "com_github_op_go_logging",
Expand Down Expand Up @@ -6914,16 +6914,24 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/quic-go/qtls-go1-20",
sum = "h1:c6vlM0jdCR8mzSoMMC4AdJOC6eLIOy+bFjvJDRmuJLE=",
version = "v0.1.0-rc.1",
sum = "h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=",
version = "v0.3.1",
)
go_repository(
name = "com_github_quic_go_quic_go",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/quic-go/quic-go",
sum = "h1:5I+mV3QlO/IIF5onr8qU9RregPf6seDeglC7BQkmrLc=",
version = "v0.31.2-0.20230125230034-dfbfe71309ca",
sum = "h1:0TvDicIgKyKKeV3lyKmAgh/HC/bOVGKwMgiFwxjSQW0=",
version = "v0.37.2-0.20230809122639-10d11149625a",
)
go_repository(
name = "com_github_quic_go_webtransport_go",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/quic-go/webtransport-go",
sum = "h1:5XMlzemqB4qmOlgIus5zB45AcZ2kCgCy2EptUrfOPWU=",
version = "v0.5.3",
)

go_repository(
Expand Down Expand Up @@ -8366,6 +8374,14 @@ def go_repositories():
sum = "h1:cvxH1mC/VTs2oRx3njhIhpypg2EBE70rlxAKKtRU/Zg=",
version = "v2.11.0",
)
go_repository(
name = "com_github_webteleport_auth",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/webteleport/auth",
sum = "h1:+bbdFdKwx5tc8uL6x+j2DS+p185VeLCj6Yn7m9dWvko=",
version = "v0.0.2",
)

go_repository(
name = "com_github_webteleport_utils",
Expand All @@ -8380,8 +8396,8 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "github.com/webteleport/webteleport",
sum = "h1:4TX2PUK26z6um4ru7yiJMznCPWlYpQkjsO8QwDMlpng=",
version = "v0.2.6",
sum = "h1:paug+lVSC8hhib13UQh0+xsiOqfGQGNkSU/RkU4c0Po=",
version = "v0.2.8",
)
go_repository(
name = "com_github_webtransport_quic_go",
Expand Down Expand Up @@ -9677,24 +9693,24 @@ def go_repositories():
)
go_repository(
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace",
build_file_generation = "on",
build_file_proto_mode = "disable",
build_directives = [
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal @io_opentelemetry_go_otel//exporters/otlp/internal",
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal/envconfig @io_opentelemetry_go_otel//exporters/otlp/internal/envconfig",
],
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace",
sum = "h1:pDDYmo0QadUPal5fwXoY1pmMpFcdyhXOmL5drCrI3vU=",
version = "v1.10.0",
)
go_repository(
name = "io_opentelemetry_go_otel_exporters_otlp_otlptrace_otlptracegrpc",
build_file_generation = "on",
build_file_proto_mode = "disable",
build_directives = [
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal @io_opentelemetry_go_otel//exporters/otlp/internal",
"gazelle:resolve go go.opentelemetry.io/otel/exporters/otlp/internal/envconfig @io_opentelemetry_go_otel//exporters/otlp/internal/envconfig",
],
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc",
sum = "h1:KtiUEhQmj/Pa874bVYKGNVdq8NPKiacPbaRRtgXi+t4=",
version = "v1.10.0",
Expand Down Expand Up @@ -9952,8 +9968,8 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/exp",
sum = "h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=",
version = "v0.0.0-20221205204356-47842c84f3db",
sum = "h1:wu5bD43Ana/nF1ZmaLr3lW/FQeJU8CcI+Ln7yWHViXE=",
version = "v0.0.0-20230809094429-853ea248256d",
)
go_repository(
name = "org_golang_x_image",
Expand Down Expand Up @@ -9984,16 +10000,16 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/mod",
sum = "h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=",
version = "v0.9.0",
sum = "h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=",
version = "v0.11.0",
)
go_repository(
name = "org_golang_x_net",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/net",
sum = "h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=",
version = "v0.8.0",
sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
version = "v0.10.0",
)
go_repository(
name = "org_golang_x_oauth2",
Expand All @@ -10016,32 +10032,32 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/sync",
sum = "h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=",
version = "v0.1.0",
sum = "h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=",
version = "v0.2.0",
)
go_repository(
name = "org_golang_x_sys",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/sys",
sum = "h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=",
version = "v0.6.0",
sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
version = "v0.8.0",
)
go_repository(
name = "org_golang_x_term",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/term",
sum = "h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=",
version = "v0.6.0",
sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=",
version = "v0.8.0",
)
go_repository(
name = "org_golang_x_text",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/text",
sum = "h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=",
version = "v0.8.0",
sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=",
version = "v0.9.0",
)
go_repository(
name = "org_golang_x_time",
Expand All @@ -10056,8 +10072,8 @@ def go_repositories():
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "golang.org/x/tools",
sum = "h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=",
version = "v0.7.0",
sum = "h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=",
version = "v0.9.1",
)
go_repository(
name = "org_golang_x_xerrors",
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k0s.io/pkg/agent

go 1.20
go 1.21

require (
github.com/ActiveState/termtest/conpty v0.5.0
Expand Down
3 changes: 0 additions & 3 deletions pkg/agent/server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ go_library(
"plugin_fileserver.go",
"plugin_metricsserver.go",
"plugin_pingserver.go",
"plugin_redirectserver.go",
"plugin_socks5server.go",
"plugin_terminalserver.go",
"plugin_versionserver.go",
"plugin_xpraserver.go",
Expand All @@ -30,7 +28,6 @@ go_library(
"//pkg/exporter/env:go_default_library",
"//pkg/log:go_default_library",
"//pkg/middleware:go_default_library",
"@com_github_btwiuse_gost//:go_default_library",
"@com_github_btwiuse_pretty//:go_default_library",
"@io_nhooyr_websocket//:go_default_library",
"@org_golang_x_sync//errgroup:go_default_library",
Expand Down
2 changes: 2 additions & 0 deletions pkg/agent/server/plugin_redirectserver.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build plugin_redirectserver

package server

import (
Expand Down
2 changes: 2 additions & 0 deletions pkg/agent/server/plugin_socks5server.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build plugin_socks5server

package server

import (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k0s.io/pkg/apiserver

go 1.20
go 1.21

require (
github.com/emicklei/go-restful/v3 v3.9.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/asciitransport/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k0s.io/pkg/asciitransport

go 1.20
go 1.21

require (
github.com/btwiuse/pretty v0.2.1
Expand Down
Loading

0 comments on commit 27cb615

Please sign in to comment.