move pkg/{dohserver,jsondns} to third_party

.mods

@@ -8,13 +8,11 @@ k0s.io/pkg/client
 k0s.io/pkg/console
 k0s.io/pkg/dial
 k0s.io/pkg/distro
-k0s.io/pkg/dohserver
 k0s.io/pkg/exporter
 k0s.io/pkg/fonts
 k0s.io/pkg/fzf
 k0s.io/pkg/gitd
 k0s.io/pkg/hub
-k0s.io/pkg/jsondns
 k0s.io/pkg/manager
 k0s.io/pkg/middleware
 k0s.io/pkg/plugin

go.work

@@ -11,13 +11,11 @@ use (
 	./pkg/console
 	./pkg/dial
 	./pkg/distro
-	./pkg/dohserver
 	./pkg/exporter
 	./pkg/fonts
 	./pkg/fzf
 	./pkg/gitd
 	./pkg/hub
-	./pkg/jsondns
 	./pkg/manager
 	./pkg/middleware
 	./pkg/plugin
@@ -42,13 +40,11 @@ replace (
 	k0s.io/pkg/console v0.1.8 => ./pkg/console/
 	k0s.io/pkg/dial v0.1.8 => ./pkg/dial/
 	k0s.io/pkg/distro v0.1.8 => ./pkg/distro/
-	k0s.io/pkg/dohserver v0.1.8 => ./pkg/dohserver/
 	k0s.io/pkg/exporter v0.1.8 => ./pkg/exporter/
 	k0s.io/pkg/fonts v0.1.8 => ./pkg/fonts/
 	k0s.io/pkg/fzf v0.1.8 => ./pkg/fzf/
 	k0s.io/pkg/gitd v0.1.8 => ./pkg/gitd/
 	k0s.io/pkg/hub v0.1.8 => ./pkg/hub/
-	k0s.io/pkg/jsondns v0.1.8 => ./pkg/jsondns/
 	k0s.io/pkg/manager v0.1.8 => ./pkg/manager/
 	k0s.io/pkg/middleware v0.1.8 => ./pkg/middleware/
 	k0s.io/pkg/plugin v0.1.8 => ./pkg/plugin/

go_repos.bzl

@@ -9282,6 +9282,22 @@ def go_repositories():
         sum = "h1:cZhhbV8+DE0Y1kotwhr1a3RC3kFO7AtuZ4GLr3qKSc8=",
         version = "v1.0.2",
     )
+    go_repository(
+        name = "io_k0s_pkg_dohserver",
+        build_file_generation = "on",
+        build_file_proto_mode = "disable",
+        importpath = "k0s.io/pkg/dohserver",
+        sum = "h1:3ZMtJe9C0ka443BAnh2Xb6krVKJ6rperAnBclKID2zo=",
+        version = "v0.1.8",
+    )
+    go_repository(
+        name = "io_k0s_pkg_jsondns",
+        build_file_generation = "on",
+        build_file_proto_mode = "disable",
+        importpath = "k0s.io/pkg/jsondns",
+        sum = "h1:egyG177v0eylI9Ur4TpkvEPN1nNTnwE4CXC8iTaV7bs=",
+        version = "v0.1.8",
+    )
     go_repository(
         name = "io_k8s_api",
         build_file_generation = "on",

pkg/agent/go.mod

@@ -14,7 +14,6 @@ require (
 	k0s.io/pkg/asciitransport v0.1.8
 	k0s.io/pkg/dial v0.1.8
 	k0s.io/pkg/distro v0.1.8
-	k0s.io/pkg/dohserver v0.1.8
 	k0s.io/pkg/middleware v0.1.8
 	k0s.io/pkg/rng v0.1.8
 	k0s.io/pkg/uuid v0.1.8
@@ -23,17 +22,14 @@ require (
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/docker/docker v20.10.17+incompatible // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/miekg/dns v1.1.58 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -44,11 +40,7 @@ require (
 	gitlab.com/mjwhitta/safety v1.11.0 // indirect
 	gitlab.com/mjwhitta/sysinfo v1.4.7 // indirect
 	gitlab.com/mjwhitta/where v1.2.4 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/tools v0.17.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k0s.io/pkg/jsondns v0.1.8 // indirect
 	k0s.io/pkg/wrap v0.1.8 // indirect
 )

pkg/agent/server/plugin_dohserver.go → third_party/pkg/agent/agent/plugin_dohserver.go

@@ -9,7 +9,7 @@ import (
 
 	"k0s.io/pkg/agent"
 	"k0s.io/pkg/api"
-	"k0s.io/pkg/dohserver"
+	"k0s.io/third_party/pkg/dohserver"
 	"k0s.io/pkg/middleware"
 )
 

third_party/pkg/cli/dohserver/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
     importpath = "k0s.io/third_party/pkg/cli/dohserver",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/dohserver:go_default_library",
         "//pkg/tunnel/listener:go_default_library",
+        "@io_k0s_pkg_dohserver//:go_default_library",
     ],
 )

pkg/dohserver/BUILD.bazel → third_party/pkg/dohserver/BUILD.bazel

@@ -9,10 +9,10 @@ go_library(
         "server.go",
         "version.go",
     ],
-    importpath = "k0s.io/pkg/dohserver",
+    importpath = "k0s.io/third_party/pkg/dohserver",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/jsondns:go_default_library",
+        "//third_party/pkg/jsondns:go_default_library",
         "@com_github_burntsushi_toml//:go_default_library",
         "@com_github_miekg_dns//:go_default_library",
         "@org_golang_x_net//idna:go_default_library",

pkg/dohserver/go.mod → third_party/pkg/dohserver/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/BurntSushi/toml v1.1.0
 	github.com/miekg/dns v1.1.58
 	golang.org/x/net v0.20.0
-	k0s.io/pkg/jsondns v0.1.8
+	k0s.io/third_party/pkg/jsondns v0.1.8
 )
 
 require (

pkg/dohserver/google.go → third_party/pkg/dohserver/google.go

@@ -37,7 +37,7 @@ import (
 	"github.com/miekg/dns"
 	"golang.org/x/net/idna"
 
-	"k0s.io/pkg/jsondns"
+	"k0s.io/third_party/pkg/jsondns"
 )
 
 func (s *Server) parseRequestGoogle(ctx context.Context, w http.ResponseWriter, r *http.Request) *DNSRequest {

pkg/dohserver/ietf.go → third_party/pkg/dohserver/ietf.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/miekg/dns"
 
-	"k0s.io/pkg/jsondns"
+	"k0s.io/third_party/pkg/jsondns"
 )
 
 func (s *Server) parseRequestIETF(ctx context.Context, w http.ResponseWriter, r *http.Request) *DNSRequest {

pkg/dohserver/server.go → third_party/pkg/dohserver/server.go

@@ -35,7 +35,7 @@ import (
 
 	"github.com/miekg/dns"
 
-	"k0s.io/pkg/jsondns"
+	"k0s.io/third_party/pkg/jsondns"
 )
 
 type Server struct {

pkg/jsondns/BUILD.bazel → third_party/pkg/jsondns/BUILD.bazel

@@ -9,7 +9,7 @@ go_library(
         "response.go",
         "unmarshal.go",
     ],
-    importpath = "k0s.io/pkg/jsondns",
+    importpath = "k0s.io/third_party/pkg/jsondns",
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_infobloxopen_go_trees//iptree:go_default_library",