Skip to content

Commit

Permalink
move /pkg/exporter to third_party
Browse files Browse the repository at this point in the history
  • Loading branch information
navigaid committed Mar 6, 2024
1 parent ea50824 commit 12c94d8
Show file tree
Hide file tree
Showing 32 changed files with 37 additions and 165 deletions.
1 change: 0 additions & 1 deletion .mods
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ k0s.io/pkg/cli
k0s.io/pkg/client
k0s.io/pkg/dial
k0s.io/pkg/distro
k0s.io/pkg/exporter
k0s.io/pkg/fzf
k0s.io/pkg/hub
k0s.io/pkg/manager
Expand Down
2 changes: 1 addition & 1 deletion cmd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-envparse v0.1.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.work
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use (
./pkg/client
./pkg/dial
./pkg/distro
./pkg/exporter
./pkg/fzf
./pkg/hub
./pkg/manager
Expand All @@ -34,7 +33,6 @@ replace (
k0s.io/pkg/client v0.1.14 => ./pkg/client/
k0s.io/pkg/dial v0.1.14 => ./pkg/dial/
k0s.io/pkg/distro v0.1.14 => ./pkg/distro/
k0s.io/pkg/exporter v0.1.14 => ./pkg/exporter/
k0s.io/pkg/fzf v0.1.14 => ./pkg/fzf/
k0s.io/pkg/hub v0.1.14 => ./pkg/hub/
k0s.io/pkg/manager v0.1.14 => ./pkg/manager/
Expand Down
8 changes: 8 additions & 0 deletions go_repos.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10217,6 +10217,14 @@ def go_repositories():
sum = "h1:cZhhbV8+DE0Y1kotwhr1a3RC3kFO7AtuZ4GLr3qKSc8=",
version = "v1.0.2",
)
go_repository(
name = "io_k0s_pkg_exporter",
build_file_generation = "on",
build_file_proto_mode = "disable",
importpath = "k0s.io/pkg/exporter",
sum = "h1:FkFkWE3shJH1E7LyJzF6iB3q6EZhaSzweSk5sNM35e4=",
version = "v0.1.14",
)
go_repository(
name = "io_k0s_pkg_rng",
build_file_generation = "on",
Expand Down
3 changes: 2 additions & 1 deletion pkg/agent/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mjwhitta/errors v1.0.2 // indirect
Expand All @@ -40,6 +40,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rs/cors v1.10.1 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k0s.io/pkg/wrap v0.1.14 // indirect
Expand Down
1 change: 1 addition & 0 deletions pkg/apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand Down
3 changes: 2 additions & 1 deletion pkg/client/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/gdamore/tcell v1.4.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
Expand All @@ -48,6 +48,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
Expand Down
5 changes: 4 additions & 1 deletion pkg/dial/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ require (
nhooyr.io/websocket v1.8.10
)

require k0s.io v0.1.14 // indirect
require (
golang.org/x/net v0.21.0 // indirect
k0s.io v0.1.14 // indirect
)
40 changes: 1 addition & 39 deletions pkg/hub/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ require (
github.com/jpillora/go-echo-server v0.5.0
k0s.io v0.1.14
k0s.io/pkg/agent v0.1.14
k0s.io/pkg/exporter v0.1.14
k0s.io/pkg/manager v0.1.14
k0s.io/pkg/middleware v0.1.14
k0s.io/pkg/ui v0.1.14
Expand All @@ -26,47 +25,22 @@ require (
require (
github.com/ActiveState/termtest/conpty v0.5.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 // indirect
github.com/beevik/ntp v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btwiuse/gods v0.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/denisbrodbeck/machineid v1.0.1 // indirect
github.com/dennwc/btrfs v0.0.0-20230312211831-a1f570bd01a1 // indirect
github.com/dennwc/ioctl v1.0.0 // indirect
github.com/docker/docker v25.0.1+incompatible // indirect
github.com/ebi-yade/altsvc-go v0.1.1 // indirect
github.com/ema/qdisc v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/go-envparse v0.1.0 // indirect
github.com/hodgesds/perf-utils v0.7.0 // indirect
github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect
github.com/josharian/native v1.1.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/jpillora/ansi v1.0.2 // indirect
github.com/jpillora/requestlog v1.0.0 // indirect
github.com/jpillora/sizestr v1.0.0 // indirect
github.com/jsimonetti/rtnetlink v1.3.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/lufia/iostat v1.2.1 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-xmlrpc v0.0.3 // indirect
github.com/mdlayher/ethtool v0.1.0 // indirect
github.com/mdlayher/genetlink v1.3.2 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect
github.com/mdlayher/socket v0.4.1 // indirect
github.com/mdlayher/wifi v0.1.0 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/mjwhitta/errors v1.0.2 // indirect
github.com/mjwhitta/hilighter v1.11.7 // indirect
Expand All @@ -76,20 +50,10 @@ require (
github.com/mjwhitta/where v1.2.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus-community/go-runit v0.1.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/node_exporter v1.7.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/safchain/ethtool v0.3.0 // indirect
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
github.com/webteleport/utils v0.2.5 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/mod v0.15.0 // indirect
Expand All @@ -98,10 +62,8 @@ require (
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v1.0.0 // indirect
k0s.io/pkg/asciitransport v0.1.14 // indirect
k0s.io/pkg/dial v0.1.14 // indirect
k0s.io/pkg/distro v0.1.14 // indirect
Expand Down
1 change: 0 additions & 1 deletion pkg/hub/server/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ go_library(
deps = [
"//:go_default_library",
"//pkg/api:go_default_library",
"//pkg/exporter:go_default_library",
"//pkg/hub:go_default_library",
"//pkg/hub/agent:go_default_library",
"//pkg/hub/agent/info:go_default_library",
Expand Down
64 changes: 0 additions & 64 deletions pkg/hub/server/relays.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,70 +234,6 @@ func envRelay(ag hub.Agent) http.HandlerFunc {
}
}

func k16sRelay(ag hub.Agent) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var (
vars = mux.Vars(r)
id = vars["id"]
path = strings.TrimPrefix(r.RequestURI, "/api/agent/"+id)
)
r.RequestURI = path

reqbuf, err := httputil.DumpRequest(r, true)
if err != nil {
log.Println(err)
return
}

conn, err := wrap.Hijack(w)
if err != nil {
log.Println(err)
return
}
defer conn.Close()

metricsConn := ag.NewTunnel(api.K16s)
defer metricsConn.Close()

go func() {
io.Copy(metricsConn, bytes.NewBuffer(reqbuf))
}()
io.Copy(conn, metricsConn)
}
}

func metricsRelay(ag hub.Agent) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var (
vars = mux.Vars(r)
id = vars["id"]
path = strings.TrimPrefix(r.RequestURI, "/api/agent/"+id)
)
r.RequestURI = path

reqbuf, err := httputil.DumpRequest(r, true)
if err != nil {
log.Println(err)
return
}

conn, err := wrap.Hijack(w)
if err != nil {
log.Println(err)
return
}
defer conn.Close()

metricsConn := ag.NewTunnel(api.Metrics)
defer metricsConn.Close()

go func() {
io.Copy(metricsConn, bytes.NewBuffer(reqbuf))
}()
io.Copy(conn, metricsConn)
}
}

func socks5Relay(ag hub.Agent) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
wsconn, err := websocket.Accept(w, r, &websocket.AcceptOptions{
Expand Down
18 changes: 0 additions & 18 deletions pkg/hub/server/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
echo "github.com/jpillora/go-echo-server/handler"
"k0s.io"
"k0s.io/pkg/api"
"k0s.io/pkg/exporter"
"k0s.io/pkg/hub"
"k0s.io/pkg/log"
"k0s.io/pkg/middleware"
Expand All @@ -35,7 +34,6 @@ type hubServer struct {
*http.Server

c hub.Config
MetricsHandler http.Handler
BinHandler http.Handler
sseMux *sse.SSE
}
Expand All @@ -60,7 +58,6 @@ func NewHub(c hub.Config) hub.Hub {
h = &hubServer{
c: c,
AgentManager: NewAgentManager(),
MetricsHandler: middleware.GzipMiddleware(exporter.NewHandler()),
BinHandler: middleware.GzipMiddleware(binHandler()),
sseMux: sse.NewSSE(),
}
Expand Down Expand Up @@ -181,8 +178,6 @@ func (h *hubServer) initRouter(apiPrefix string, hl http.Handler) (R *mux.Router
r.HandleFunc("/fs", h.handleTunnel(api.FS)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/socks5", h.handleTunnel(api.Socks5)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/redir", h.handleTunnel(api.Redir)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/metrics", h.handleTunnel(api.Metrics)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/k16s", h.handleTunnel(api.K16s)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/doh", h.handleTunnel(api.Doh)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/env", h.handleTunnel(api.Env)).Methods("GET").Queries("id", "{id}")
r.HandleFunc("/terminal", h.handleTunnel(api.Terminal)).Methods("GET").Queries("id", "{id}")
Expand All @@ -193,7 +188,6 @@ func (h *hubServer) initRouter(apiPrefix string, hl http.Handler) (R *mux.Router

// hub specific function
r.HandleFunc("/version", h.handleVersion).Methods("GET")
r.Handle("/metrics", h.MetricsHandler).Methods("GET")
r.Handle("/bin/k0s", h.BinHandler).Methods("GET")

return R
Expand Down Expand Up @@ -308,8 +302,6 @@ func (h *hubServer) handleAgent(w http.ResponseWriter, r *http.Request) {
ag.BasicAuth(http.HandlerFunc(socks5Relay(ag))).ServeHTTP(w, r)
case strings.HasPrefix(subpath, "/version"):
versionRelay(ag)(w, r)
case strings.HasPrefix(subpath, "/k16s"):
k16sRelay(ag)(w, r)
case strings.HasPrefix(subpath, "/env"):
envRelay(ag)(w, r)
case strings.HasPrefix(subpath, "/doh"):
Expand All @@ -318,16 +310,6 @@ func (h *hubServer) handleAgent(w http.ResponseWriter, r *http.Request) {
jsonlRelay(ag)(w, r)
case strings.HasPrefix(subpath, "/xpra"):
xpraRelay(ag)(w, r)
case strings.HasPrefix(subpath, "/metrics"):
var (
vars = r.URL.Query()
_, k16s = vars["k16s"]
)
if k16s {
k16sRelay(ag)(w, r)
} else {
metricsRelay(ag)(w, r)
}
case strings.HasPrefix(subpath, "/terminalv2"): // must come before "/terminal" otherwise won't ever match
ag.BasicAuth(http.HandlerFunc(terminalV2Relay(ag))).ServeHTTP(w, r)
case strings.HasPrefix(subpath, "/terminal"):
Expand Down
3 changes: 2 additions & 1 deletion pkg/plugin/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mjwhitta/errors v1.0.2 // indirect
github.com/mjwhitta/hilighter v1.11.7 // indirect
Expand All @@ -32,6 +32,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rs/cors v1.10.1 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand Down
3 changes: 2 additions & 1 deletion pkg/tunnel/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ require (
require (
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/rs/cors v1.10.1 // indirect
golang.org/x/net v0.21.0 // indirect
)
4 changes: 3 additions & 1 deletion pkg/utils/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ module k0s.io/pkg/utils

go 1.22.1

require github.com/gorilla/websocket v1.5.0
require github.com/gorilla/websocket v1.5.1

require golang.org/x/net v0.21.0 // indirect
2 changes: 2 additions & 0 deletions pkg/wrap/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ require (
k0s.io v0.1.14
nhooyr.io/websocket v1.8.10
)

require golang.org/x/net v0.21.0 // indirect
2 changes: 1 addition & 1 deletion third_party/cmd/envhandler/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go_library(
srcs = ["main.go"],
importpath = "k0s.io/third_party/cmd/envhandler",
visibility = ["//visibility:private"],
deps = ["//pkg/exporter/env:go_default_library"],
deps = ["//third_party/pkg/exporter/env:go_default_library"],
)

go_binary(
Expand Down
Loading

0 comments on commit 12c94d8

Please sign in to comment.