diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index 7c2a1a8080..0000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,72 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "master" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - schedule: - - cron: '36 14 * * 6' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'go', 'javascript', 'python', 'ruby' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 443112864a..fd8a242cca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: diff --git a/WORKSPACE b/WORKSPACE index 8823e46253..c99c8ee3f7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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( @@ -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", ) diff --git a/cmd/go.mod b/cmd/go.mod index 7780aba197..927abb77d4 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -1,6 +1,6 @@ module k0s.io/cmd -go 1.20 +go 1.21 replace k0s.io => ../ diff --git a/go.mod b/go.mod index e0212e8906..dbf325ccff 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k0s.io -go 1.20 +go 1.21 replace k0s.io => ././ diff --git a/go.work b/go.work index 2feccb9876..aeae3994c4 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.20 +go 1.21 use ( . diff --git a/go_repos.bzl b/go_repos.bzl index 43cf792adf..5b82009e52 100644 --- a/go_repos.bzl +++ b/go_repos.bzl @@ -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", @@ -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", @@ -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", @@ -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( @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/pkg/agent/go.mod b/pkg/agent/go.mod index d2b1cb7d70..ab591f831d 100644 --- a/pkg/agent/go.mod +++ b/pkg/agent/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/agent -go 1.20 +go 1.21 require ( github.com/ActiveState/termtest/conpty v0.5.0 diff --git a/pkg/agent/server/BUILD.bazel b/pkg/agent/server/BUILD.bazel index cc8475023f..d4215db98a 100644 --- a/pkg/agent/server/BUILD.bazel +++ b/pkg/agent/server/BUILD.bazel @@ -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", @@ -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", diff --git a/pkg/agent/server/plugin_redirectserver.go b/pkg/agent/server/plugin_redirectserver.go index 8d0e927493..26c9594bbb 100644 --- a/pkg/agent/server/plugin_redirectserver.go +++ b/pkg/agent/server/plugin_redirectserver.go @@ -1,3 +1,5 @@ +//go:build plugin_redirectserver + package server import ( diff --git a/pkg/agent/server/plugin_socks5server.go b/pkg/agent/server/plugin_socks5server.go index 2727b834a3..fa7fe3ea9a 100644 --- a/pkg/agent/server/plugin_socks5server.go +++ b/pkg/agent/server/plugin_socks5server.go @@ -1,3 +1,5 @@ +//go:build plugin_socks5server + package server import ( diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index a01778ef2e..e2908364e2 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -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 diff --git a/pkg/asciitransport/go.mod b/pkg/asciitransport/go.mod index eb5c16203c..cc1569b75c 100644 --- a/pkg/asciitransport/go.mod +++ b/pkg/asciitransport/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/asciitransport -go 1.20 +go 1.21 require ( github.com/btwiuse/pretty v0.2.1 diff --git a/pkg/cli/go.mod b/pkg/cli/go.mod index a6765d6e29..c4f0a6dd43 100644 --- a/pkg/cli/go.mod +++ b/pkg/cli/go.mod @@ -1,11 +1,11 @@ module k0s.io/pkg/cli -go 1.20 +go 1.21 require ( github.com/btwiuse/multicall v0.0.2 github.com/creativeprojects/go-selfupdate v0.6.1 - github.com/webteleport/webteleport v0.2.6 + github.com/webteleport/webteleport v0.2.8 k0s.io v0.1.6 k0s.io/pkg/agent v0.1.6 k0s.io/pkg/apiserver v0.0.0-20220906145908-796acc0825e7 @@ -81,11 +81,11 @@ require ( github.com/go-kit/log v0.2.1 // indirect github.com/go-log/log v0.2.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.1 // indirect github.com/go-openapi/swag v0.22.3 // indirect - github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -149,7 +149,7 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/onsi/ginkgo/v2 v2.9.1 // indirect + github.com/onsi/ginkgo/v2 v2.9.5 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/selinux v1.10.2 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect @@ -160,10 +160,9 @@ require ( github.com/prometheus/node_exporter v1.5.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect - github.com/quic-go/qtls-go1-18 v0.2.0 // indirect - github.com/quic-go/qtls-go1-19 v0.2.0 // indirect - github.com/quic-go/qtls-go1-20 v0.1.0-rc.1 // indirect - github.com/quic-go/quic-go v0.31.2-0.20230125230034-dfbfe71309ca // indirect + github.com/quic-go/qtls-go1-20 v0.3.1 // indirect + github.com/quic-go/quic-go v0.37.2-0.20230809122639-10d11149625a // indirect + github.com/quic-go/webtransport-go v0.5.3 // indirect github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/rs/cors v1.8.2 // indirect @@ -181,9 +180,8 @@ require ( github.com/tjfoc/gmsm v1.4.1 // indirect github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect github.com/ulikunitz/xz v0.5.8 // indirect + github.com/webteleport/auth v0.0.2 // indirect github.com/webteleport/utils v0.0.3 // indirect - github.com/webtransport/quic-go v0.0.0-webtransport // indirect - github.com/webtransport/webtransport-go v0.0.0-webtransport // indirect github.com/xlab/treeprint v1.1.0 // indirect github.com/xtaci/kcp-go/v5 v5.6.1 // indirect github.com/xtaci/smux v1.5.17 // indirect @@ -200,16 +198,16 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.4.0 // indirect - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect - golang.org/x/mod v0.9.0 // indirect - golang.org/x/net v0.8.0 // indirect + golang.org/x/exp v0.0.0-20230809094429-853ea248256d // indirect + golang.org/x/mod v0.11.0 // indirect + golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/sync v0.2.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/term v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.7.0 // indirect + golang.org/x/tools v0.9.1 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect diff --git a/pkg/cli/k0s/BUILD.bazel b/pkg/cli/k0s/BUILD.bazel index 67fab610f6..29a976b0bb 100644 --- a/pkg/cli/k0s/BUILD.bazel +++ b/pkg/cli/k0s/BUILD.bazel @@ -10,7 +10,6 @@ go_library( "//pkg/cli/chassis:go_default_library", "//pkg/cli/client:go_default_library", "//pkg/cli/hub:go_default_library", - "//pkg/cli/kubectl:go_default_library", "//pkg/cli/kuber:go_default_library", "//pkg/cli/miniclient:go_default_library", "//pkg/cli/mnt:go_default_library", diff --git a/pkg/cli/k0s/k0s.go b/pkg/cli/k0s/k0s.go index 952eb2b4db..d7bb36af3a 100644 --- a/pkg/cli/k0s/k0s.go +++ b/pkg/cli/k0s/k0s.go @@ -8,7 +8,8 @@ import ( "k0s.io/pkg/cli/chassis" "k0s.io/pkg/cli/client" "k0s.io/pkg/cli/hub" - "k0s.io/pkg/cli/kubectl" + + // "k0s.io/pkg/cli/kubectl" "k0s.io/pkg/cli/kuber" "k0s.io/pkg/cli/miniclient" "k0s.io/pkg/cli/mnt" @@ -32,10 +33,10 @@ var cmdRun multicall.RunnerFuncMap = map[string]multicall.RunnerFunc{ "hub2": hub.Run2, "agent": agent.Run, "upgrade": upgrade.Run, - "kubectl": kubectl.Run, - "kuber": kuber.Run, - "knot": TODO, - "version": version.Run, + // "kubectl": kubectl.Run, + "kuber": kuber.Run, + "knot": TODO, + "version": version.Run, } func Run(args []string) error { diff --git a/pkg/client/go.mod b/pkg/client/go.mod index 2598129855..63f89bf4e8 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/client -go 1.20 +go 1.21 require ( github.com/VojtechVitek/yaml-cli v0.0.5 diff --git a/pkg/console/go.mod b/pkg/console/go.mod index e936fc6b37..0c9474a187 100644 --- a/pkg/console/go.mod +++ b/pkg/console/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/console -go 1.20 +go 1.21 require ( github.com/pkg/errors v0.9.1 diff --git a/pkg/dial/go.mod b/pkg/dial/go.mod index 11fda9b195..a9c828c9d5 100644 --- a/pkg/dial/go.mod +++ b/pkg/dial/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/dial -go 1.20 +go 1.21 require ( github.com/gorilla/websocket v1.5.0 diff --git a/pkg/distro/go.mod b/pkg/distro/go.mod index e21d15090a..11f8f7fef9 100644 --- a/pkg/distro/go.mod +++ b/pkg/distro/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/distro -go 1.20 +go 1.21 require gitlab.com/mjwhitta/sysinfo v1.4.7 diff --git a/pkg/dohserver/go.mod b/pkg/dohserver/go.mod index e343def3e3..046520b301 100644 --- a/pkg/dohserver/go.mod +++ b/pkg/dohserver/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/dohserver -go 1.20 +go 1.21 require ( github.com/BurntSushi/toml v1.1.0 diff --git a/pkg/exporter/go.mod b/pkg/exporter/go.mod index 5e9dbe1a6f..ed18435709 100644 --- a/pkg/exporter/go.mod +++ b/pkg/exporter/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/exporter -go 1.20 +go 1.21 require ( github.com/prometheus/client_golang v1.14.0 diff --git a/pkg/fonts/go.mod b/pkg/fonts/go.mod index 6036588f5d..e360b41225 100644 --- a/pkg/fonts/go.mod +++ b/pkg/fonts/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/fonts -go 1.20 +go 1.21 require ( github.com/lukesampson/figlet v0.0.0-20190211215653-8a3ef4a6ac42 diff --git a/pkg/fzf/go.mod b/pkg/fzf/go.mod index f718bea231..08f0e8b1d6 100644 --- a/pkg/fzf/go.mod +++ b/pkg/fzf/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/fzf -go 1.20 +go 1.21 require ( github.com/gdamore/tcell v1.4.0 diff --git a/pkg/gitd/go.mod b/pkg/gitd/go.mod index 339e80ec89..7e7159e948 100644 --- a/pkg/gitd/go.mod +++ b/pkg/gitd/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/gitd -go 1.20 +go 1.21 require ( github.com/gorilla/mux v1.8.0 diff --git a/pkg/hub/go.mod b/pkg/hub/go.mod index cc68186d93..c0b9d9f75a 100644 --- a/pkg/hub/go.mod +++ b/pkg/hub/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/hub -go 1.20 +go 1.21 require ( github.com/abbot/go-http-auth v0.4.0 diff --git a/pkg/jsondns/go.mod b/pkg/jsondns/go.mod index be982ea903..9c2bd6284d 100644 --- a/pkg/jsondns/go.mod +++ b/pkg/jsondns/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/jsondns -go 1.20 +go 1.21 require ( github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 diff --git a/pkg/manager/go.mod b/pkg/manager/go.mod index af92f82cc0..a67da60610 100644 --- a/pkg/manager/go.mod +++ b/pkg/manager/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/manager -go 1.20 +go 1.21 require ( github.com/btwiuse/gods v0.0.1 diff --git a/pkg/middleware/go.mod b/pkg/middleware/go.mod index 2d066ecff0..fd4c84c0e8 100644 --- a/pkg/middleware/go.mod +++ b/pkg/middleware/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/middleware -go 1.20 +go 1.21 require ( github.com/gorilla/handlers v1.5.1 diff --git a/pkg/plugin/go.mod b/pkg/plugin/go.mod index 7f14834f7f..4cba656fa2 100644 --- a/pkg/plugin/go.mod +++ b/pkg/plugin/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/plugin -go 1.20 +go 1.21 require ( k0s.io v0.1.5 diff --git a/pkg/reverseproxy/go.mod b/pkg/reverseproxy/go.mod index 51ab7236be..4c45f52ed2 100644 --- a/pkg/reverseproxy/go.mod +++ b/pkg/reverseproxy/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/reverseproxy -go 1.20 +go 1.21 require k0s.io v0.1.5 diff --git a/pkg/rng/go.mod b/pkg/rng/go.mod index ebbd5ab962..10ad2ae61f 100644 --- a/pkg/rng/go.mod +++ b/pkg/rng/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/rng -go 1.20 +go 1.21 require github.com/docker/docker v20.10.17+incompatible diff --git a/pkg/simple/go.mod b/pkg/simple/go.mod index 2d43693185..531782c74f 100644 --- a/pkg/simple/go.mod +++ b/pkg/simple/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/simple -go 1.20 +go 1.21 require ( github.com/gorilla/handlers v1.5.1 diff --git a/pkg/tunnel/go.mod b/pkg/tunnel/go.mod index de57ece5a7..b6baee254f 100644 --- a/pkg/tunnel/go.mod +++ b/pkg/tunnel/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/tunnel -go 1.20 +go 1.21 require ( github.com/btwiuse/gost v0.0.3 diff --git a/pkg/ui/go.mod b/pkg/ui/go.mod index 3f32875d6c..ee71ecdb75 100644 --- a/pkg/ui/go.mod +++ b/pkg/ui/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/ui -go 1.20 +go 1.21 require ( github.com/gorilla/mux v1.8.0 diff --git a/pkg/utils/go.mod b/pkg/utils/go.mod index 4cc5813841..d445c916eb 100644 --- a/pkg/utils/go.mod +++ b/pkg/utils/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/utils -go 1.20 +go 1.21 require github.com/gorilla/websocket v1.5.0 diff --git a/pkg/uuid/go.mod b/pkg/uuid/go.mod index 345f00397d..842ff1a1a3 100644 --- a/pkg/uuid/go.mod +++ b/pkg/uuid/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/uuid -go 1.20 +go 1.21 require ( github.com/denisbrodbeck/machineid v1.0.1 diff --git a/pkg/wrap/go.mod b/pkg/wrap/go.mod index 89956e05b6..d5546e2b84 100644 --- a/pkg/wrap/go.mod +++ b/pkg/wrap/go.mod @@ -1,6 +1,6 @@ module k0s.io/pkg/wrap -go 1.20 +go 1.21 require ( github.com/gorilla/websocket v1.5.0 diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel index 7e613e4543..17bca1e7e1 100644 --- a/third_party/BUILD.bazel +++ b/third_party/BUILD.bazel @@ -20,7 +20,6 @@ go_library( "//third_party/pkg/cli/gitd:go_default_library", "//third_party/pkg/cli/goproxy:go_default_library", "//third_party/pkg/cli/gos:go_default_library", - "//third_party/pkg/cli/gost:go_default_library", "//third_party/pkg/cli/k16s:go_default_library", "//third_party/pkg/cli/trojan:go_default_library", "//third_party/pkg/cli/webproc:go_default_library", diff --git a/third_party/cmd/kurl/main.go b/third_party/cmd/kurl/main.go index ad5dbe468a..203b2b8bd8 100644 --- a/third_party/cmd/kurl/main.go +++ b/third_party/cmd/kurl/main.go @@ -2,7 +2,9 @@ // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/third_party/cmd/mnt-etcd/main.go b/third_party/cmd/mnt-etcd/main.go index dc47c56b02..eb92096ec5 100644 --- a/third_party/cmd/mnt-etcd/main.go +++ b/third_party/cmd/mnt-etcd/main.go @@ -11,7 +11,7 @@ import ( "time" "github.com/gorilla/handlers" - "go.etcd.io/etcd/client/v3" + clientv3 "go.etcd.io/etcd/client/v3" "k0s.io/pkg/tunnel/listener" ) diff --git a/third_party/cmd/yaegi/yaegi.go b/third_party/cmd/yaegi/yaegi.go index 79c2f7a81d..51412d2a13 100644 --- a/third_party/cmd/yaegi/yaegi.go +++ b/third_party/cmd/yaegi/yaegi.go @@ -8,7 +8,7 @@ If invoked with no arguments, it processes the standard input in a Read-Eval-Print-Loop. A prompt is displayed if standard input is a terminal. -File Mode +# File Mode In file mode, as in a standard Go compiler, source files are read entirely before being parsed, then evaluated. It allows to handle forward @@ -21,7 +21,7 @@ starts with "#!" characters (the shebang pattern to allow executable scripts), for example "#!/usr/bin/env yaegi". In that case, the initial file is interpreted in REPL mode. -REPL mode +# REPL mode In REPL mode, the interpreter parses the code incrementally. As soon as a statement is complete, it evaluates it. This makes the interpreter @@ -59,37 +59,39 @@ Example of a one liner: $ yaegi -e 'println(reflect.TypeOf(fmt.Print))' Options: - -e string - evaluate the string and return. - -i - start an interactive REPL after file execution. - -syscall - include syscall symbols. - -tags tag,list - a comma-separated list of build tags to consider satisfied during - the interpretation. - -unsafe - include unsafe symbols. + + -e string + evaluate the string and return. + -i + start an interactive REPL after file execution. + -syscall + include syscall symbols. + -tags tag,list + a comma-separated list of build tags to consider satisfied during + the interpretation. + -unsafe + include unsafe symbols. Environment variables: - YAEGI_SYSCALL=1 - Include syscall symbols (same as -syscall flag). - YAEGI_UNRESTRICTED=1 - Include unrestricted symbols (same as -unrestricted flag). - YAEGI_UNSAFE=1 - Include unsafe symbols (same as -unsafe flag). - YAEGI_PROMPT=1 - Force enable the printing of the REPL prompt and the result of last instruction, - even if stdin is not a terminal. - YAEGI_AST_DOT=1 - Generate and display graphviz dot of AST with dotty(1) - YAEGI_CFG_DOT=1 - Generate and display graphviz dot of CFG with dotty(1) - YAEGI_DOT_CMD='dot -Tsvg -ofoo.svg' - Defines how to process the dot code generated whenever YAEGI_AST_DOT and/or - YAEGI_CFG_DOT is enabled. If any of YAEGI_AST_DOT or YAEGI_CFG_DOT is set, - but YAEGI_DOT_CMD is not defined, the default is to write to a .dot file - next to the Go source file. + + YAEGI_SYSCALL=1 + Include syscall symbols (same as -syscall flag). + YAEGI_UNRESTRICTED=1 + Include unrestricted symbols (same as -unrestricted flag). + YAEGI_UNSAFE=1 + Include unsafe symbols (same as -unsafe flag). + YAEGI_PROMPT=1 + Force enable the printing of the REPL prompt and the result of last instruction, + even if stdin is not a terminal. + YAEGI_AST_DOT=1 + Generate and display graphviz dot of AST with dotty(1) + YAEGI_CFG_DOT=1 + Generate and display graphviz dot of CFG with dotty(1) + YAEGI_DOT_CMD='dot -Tsvg -ofoo.svg' + Defines how to process the dot code generated whenever YAEGI_AST_DOT and/or + YAEGI_CFG_DOT is enabled. If any of YAEGI_AST_DOT or YAEGI_CFG_DOT is set, + but YAEGI_DOT_CMD is not defined, the default is to write to a .dot file + next to the Go source file. */ package main diff --git a/third_party/go.mod b/third_party/go.mod index 23df3038c3..075e5b815e 100644 --- a/third_party/go.mod +++ b/third_party/go.mod @@ -1,6 +1,6 @@ module k0s.io/third_party -go 1.20 +go 1.21 replace github.com/buildkite/agent/v3 => github.com/btwiuse/agent/v3 v3.27.1-0.20210217080418-ae42a28eefa7 diff --git a/third_party/main.go b/third_party/main.go index fa776e46bb..5d3236713d 100644 --- a/third_party/main.go +++ b/third_party/main.go @@ -22,7 +22,8 @@ import ( "k0s.io/third_party/pkg/cli/gitd" "k0s.io/third_party/pkg/cli/goproxy" "k0s.io/third_party/pkg/cli/gos" - "k0s.io/third_party/pkg/cli/gost" + + // "k0s.io/third_party/pkg/cli/gost" "k0s.io/third_party/pkg/cli/k16s" "k0s.io/third_party/pkg/cli/trojan" "k0s.io/third_party/pkg/cli/webproc" @@ -52,8 +53,8 @@ var cmdRun multicall.RunnerFuncMap = map[string]multicall.RunnerFunc{ "hub2": hub.Run2, "agent": agent.Run, "gitd": gitd.Run, - "gost": gost.Main, - "filebrowser": filebrowser.Run, + // "gost": gost.Main, + "filebrowser": filebrowser.Run, } func Run(args []string) error {