add QUIC support and use netpoll for more efficient conntection handl…

…ing fix fix fix Signed-off-by: kpango <kpango@vdaas.org>
vdaas · Sep 7, 2022 · 7f84123 · 7f84123
1 parent 8ec79af
commit 7f84123
Show file tree

Hide file tree

Showing 17 changed files with 550 additions and 43 deletions.
diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml
@@ -745,27 +745,30 @@ defaults:
         timeout: ""
         # @schema {"name": "defaults.grpc.client.dial_option.net", "type": "object", "anchor": "net"}
         net:
+          # @schema {"name": "defaults.grpc.client.dial_option.net.network", "type": "string", "enum": ["tcp", "udp", "unix"]}
+          # defaults.grpc.client.dial_option.net.network -- gRPC client dialer network type
+          network: tcp
           # @schema {"name": "defaults.grpc.client.dial_option.net.dns", "type": "object"}
           dns:
             # @schema {"name": "defaults.grpc.client.dial_option.net.dns.cache_enabled", "type": "boolean"}
-            # defaults.grpc.client.dial_option.net.dns.cache_enabled -- gRPC client TCP DNS cache enabled
+            # defaults.grpc.client.dial_option.net.dns.cache_enabled -- gRPC client DNS cache enabled
             cache_enabled: true
             # @schema {"name": "defaults.grpc.client.dial_option.net.dns.refresh_duration", "type": "string"}
-            # defaults.grpc.client.dial_option.net.dns.refresh_duration -- gRPC client TCP DNS cache refresh duration
+            # defaults.grpc.client.dial_option.net.dns.refresh_duration -- gRPC client DNS cache refresh duration
             refresh_duration: 30m
             # @schema {"name": "defaults.grpc.client.dial_option.net.dns.cache_expiration", "type": "string"}
-            # defaults.grpc.client.dial_option.net.dns.cache_expiration -- gRPC client TCP DNS cache expiration
+            # defaults.grpc.client.dial_option.net.dns.cache_expiration -- gRPC client DNS cache expiration
             cache_expiration: 1h
           # @schema {"name": "defaults.grpc.client.dial_option.net.dialer", "type": "object"}
           dialer:
             # @schema {"name": "defaults.grpc.client.dial_option.net.dialer.timeout", "type": "string"}
-            # defaults.grpc.client.dial_option.net.dialer.timeout -- gRPC client TCP dialer timeout
+            # defaults.grpc.client.dial_option.net.dialer.timeout -- gRPC client dialer timeout
             timeout: ""
             # @schema {"name": "defaults.grpc.client.dial_option.net.dialer.keepalive", "type": "string"}
             # defaults.grpc.client.dial_option.net.dialer.keepalive -- gRPC client TCP dialer keep alive
             keepalive: ""
             # @schema {"name": "defaults.grpc.client.dial_option.net.dialer.dual_stack_enabled", "type": "boolean"}
-            # defaults.grpc.client.dial_option.net.dialer.dual_stack_enabled -- gRPC client TCP dialer dual stack enabled
+            # defaults.grpc.client.dial_option.net.dialer.dual_stack_enabled -- gRPC client dialer dual stack enabled
             dual_stack_enabled: true
           # @schema {"name": "defaults.grpc.client.dial_option.net.tls", "alias": "tls"}
           tls:
@@ -1972,6 +1975,8 @@ agent:
       client:
         # @schema {"name": "agent.sidecar.config.client.net", "alias": "net"}
         net:
+          # agent.sidecar.config.client.net.network -- gRPC client dialer network type
+          network: tcp
           dns:
             # agent.sidecar.config.client.net.dns.cache_enabled -- HTTP client TCP DNS cache enabled
             cache_enabled: true
@@ -2331,6 +2336,8 @@ discoverer:
         fields: {}
     # @schema {"name": "discoverer.discoverer.net", "alias": "net"}
     net:
+      # discoverer.discoverer.net.network -- gRPC client dialer network type
+      network: tcp
       dns:
         # discoverer.discoverer.net.dns.cache_enabled -- TCP DNS cache enabled
         cache_enabled: true

diff --git a/cmd/agent/core/ngt/dummyCa.pem b/cmd/agent/core/ngt/dummyCa.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
diff --git a/cmd/agent/core/ngt/dummyServer.crt b/cmd/agent/core/ngt/dummyServer.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIC/jCCAeYCCQCb1aA3TeyoljANBgkqhkiG9w0BAQUFADBBMQswCQYDVQQGEwJK
+UDEOMAwGA1UECAwFVG9reW8xEjAQBgNVBAcMCWNoaXlvZGFrdTEOMAwGA1UECgwF
+eWFob28wHhcNMTgwOTE4MDMxMjQyWhcNMjgwOTE1MDMxMjQyWjBBMQswCQYDVQQG
+EwJKUDEOMAwGA1UECAwFVG9reW8xEjAQBgNVBAcMCWNoaXlvZGFrdTEOMAwGA1UE
+CgwFeWFob28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUBKwhDHGl
+yj5GFOhDlyH67BsW9l/A2rna21WVnq69ANN9WmaiFp32C+2BrqF8DYwtPyoaTgXd
++WQ8wmtjlYwp378P743vBgf6tazZYKbCa7PZsNMLCdI0KurXf6iwOkCY7zQQcOji
+STUVtfr009LFgc8KBduxBiyEe1tXoN1qrjUZgty/05EtW09QFE2XqVFQS4jN6CC4
+whmN3J7yWHyZv3K1lO0aeC31kIOqw0/DxD/Dj/RMJBpz0q3jeYJwvM3rE4DNajTW
+6BLiPWVkLW4H3paRE6jYfyCRazE8tLLWHzGGqPWUElV2rKWzdV6OnyWLFxWC2RK/
+71IuZS1UDqmHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFaGiKYXqlKhqHDND/RJ
+oJnZfgEYca6urTKHgmYYu3SJRe6Gf3j/1NZZJ9EKr9vGIiFhpKOHcdnBkeXEweWK
+7+8yyCxG7Uw3Ixw7jQPQ/bAzb7CJ8Q2Ogsj1EqSHbPoOyu2a0fYCu3rLomDVNdbn
+9BX2ywyiUonV36H773DrAbe0a/+LhThW9SftUyeyK+0RIU4PML0C5rQWUxNsz6yR
+OIkfFdRA10nOqIfV2jVHbNT7bnMI9HLBpltbfoY7SBEFncRdEbkGvemjUIB7YAe4
+sjosi65MZ/BcCUcC0s8tczl1/e/UjoJ/uC91APKFSmKu2RltBNVTLxSpAxZv+2bV
+SGI=
+-----END CERTIFICATE-----
diff --git a/cmd/agent/core/ngt/dummyServer.key b/cmd/agent/core/ngt/dummyServer.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA1ASsIQxxpco+RhToQ5ch+uwbFvZfwNq52ttVlZ6uvQDTfVpm
+ohad9gvtga6hfA2MLT8qGk4F3flkPMJrY5WMKd+/D++N7wYH+rWs2WCmwmuz2bDT
+CwnSNCrq13+osDpAmO80EHDo4kk1FbX69NPSxYHPCgXbsQYshHtbV6Ddaq41GYLc
+v9ORLVtPUBRNl6lRUEuIzegguMIZjdye8lh8mb9ytZTtGngt9ZCDqsNPw8Q/w4/0
+TCQac9Kt43mCcLzN6xOAzWo01ugS4j1lZC1uB96WkROo2H8gkWsxPLSy1h8xhqj1
+lBJVdqyls3Vejp8lixcVgtkSv+9SLmUtVA6phwIDAQABAoIBAQCvuhus3LKJdmI9
+FfEYrHg2kGE3nAbrQp7OvgJmm3o7Hycre7UbXWGZYHN/i+0+c8AedH8CBG8qdx1U
+mtQFWxssTc3/eE8MsNQGQXQ9S7WL6VbM9JlHSeGW6YdyC9YWEoIeAA0IH312qLS+
+BPI24CaPGzMuHILla7eUKuYfcC50zuLcqZVrk3Mf/jQrAlc8YKaModGBn6DFw766
+z9k+04KDjmAc4iOoR9hD+8ELx+q0H4tPztRDLzJ7HOdPaBEbHT+xbV7KQb9gHa0F
+FQMvGAdQV/FxwDimLt/eY65+xqf4nSO+TtYnEH6TtAE3AW2SCj8+eFBigLxl1I0C
+Vysm+wVhAoGBAO4Nnh7G9ZpFCQQ1aZuBDiCwIi/k4bSD53SI1t097d9DprCItq9Y
+tckza8oxsMnpY8t6/F9ab9tQzEz7NSOkRTo8sMc6yD6zpz0cz3WSbuw7E31u7HDx
+S300MMSW/ufINOjBmQGeIoMhCX2JZswiTy88vkV4UtA0oNEo4bp67FvxAoGBAOQA
+lc4qN2hE/o77qbWiPF8X7vQt6ulf4C4QO1Pyk3gYPFeqz0x9/EjGI9CVHUGuRbTb
+pYYDfQgozRYnjz3iCU9g8DIY93SImpsQUm0k7QRHkWFa9s0Fp2ymn9PkASiJxQgk
+9l6CqTNUbGJLC1AI9LNAkr1WIzzX9lOOhEHFpTT3AoGAQOCbOF4W731jEK+R4ZyR
+gh0epBjn3m+Yc+0bSd6n5pIkarZHu5AcswH9nXRfbxfZZ8pT35ThKU9i7pQEDnul
+llKWByYhDt2ddY1ViQBolJ8hF61UaQ+J+ExyAhH41Kh+qvSgQ42acExfrsP0rSuo
+kwImBP7e6vl83qQaqNz5b7ECgYEAlgVUjKz2fCM5o/cveZXgR2nGDuDPuvMc3PJN
+NzVblx/LRJvdfqU/BNtq4WncMEVtFE2aIg3VjTLbjwJEnCFIovRT14LZ/9GKeRFK
+SwqK8c/tdrOVxN09hp40eAWERZoxDOTVPuaWUnHwRtS+AtGBwRhx9SbiVLx9Fgmm
+OGjGBY0CgYEAr2Go4s2QBQXpvJPdYSUGi/osF1jfntIL0JydqBOy9xx9R6d/CvWX
+8ekhlYdXLZPmgUoZ8EIBlULRs+8XJRn1zXGBUu1hEdU8rO7WdkHV6tJBIw6mSppV
+btGQ8m0qKBLMJco77ZZCjp5lsG/Af308ojuK/DJcomH1slxyTkSYEjg=
+-----END RSA PRIVATE KEY-----
diff --git a/cmd/agent/core/ngt/sample.yaml b/cmd/agent/core/ngt/sample.yaml
@@ -24,6 +24,7 @@ logging:
 server_config:
   servers:
     - name: grpc
+      network: udp
       host: 0.0.0.0
       port: 8081
       grpc:
@@ -66,10 +67,10 @@ server_config:
     - readiness
   full_shutdown_duration: 600s
   tls:
-    ca: /path/to/ca
-    cert: /path/to/cert
-    enabled: false
-    key: /path/to/key
+    ca: ./dummyCa.pem
+    cert: ./dummyServer.crt
+    enabled: true
+    key: ./dummyServer.key
 observability:
   enabled: false
   collector:

diff --git a/go.mod b/go.mod
@@ -16,6 +16,7 @@ replace (
 	cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager v1.5.0
 	cloud.google.com/go/storage => cloud.google.com/go/storage v1.26.0
 	cloud.google.com/go/trace => cloud.google.com/go/trace v1.2.0
+<<<<<<< HEAD
 	code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt v0.0.0-20211005130812-5bb3c17173e5
 	contrib.go.opencensus.io/exporter/aws => contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9
 	contrib.go.opencensus.io/exporter/prometheus => contrib.go.opencensus.io/exporter/prometheus v0.4.2
@@ -100,6 +101,13 @@ replace (
 	github.com/certifi/gocertifi => github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d
 	github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.2
 	github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.3.0
+=======
+	github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20220504154517-49906996bd99+incompatible
+	github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.28-0.20220504154517-49906996bd99
+	github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.19
+	github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.44.13
+	github.com/buger/jsonparser => github.com/buger/jsonparser v1.1.1
+>>>>>>> feature/internal-net/support-quic
 	github.com/chzyer/logex => github.com/chzyer/logex v1.2.1
 	github.com/chzyer/readline => github.com/chzyer/readline v1.5.1
 	github.com/chzyer/test => github.com/chzyer/test v1.0.0
@@ -309,6 +317,7 @@ replace (
 	github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.3.0
 	github.com/josharian/intern => github.com/josharian/intern v1.0.0
 	github.com/json-iterator/go => github.com/json-iterator/go v1.1.12
+<<<<<<< HEAD
 	github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v1.0.0
 	github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible
 	github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.3.0
@@ -369,6 +378,11 @@ replace (
 	github.com/nxadm/tail => github.com/nxadm/tail v1.4.8
 	github.com/oklog/run => github.com/oklog/run v1.1.0
 	github.com/oklog/ulid => github.com/oklog/ulid v1.3.1
+=======
+	github.com/klauspost/compress => github.com/klauspost/compress v1.15.5-0.20220512161851-3909335c441d
+	github.com/kpango/glg => github.com/kpango/glg v1.6.10
+	github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.27.0
+>>>>>>> feature/internal-net/support-quic
 	github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega => github.com/onsi/gomega v1.20.2
 	github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0
@@ -567,7 +581,12 @@ require (
 	code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6
 	contrib.go.opencensus.io/exporter/prometheus v0.0.0-00010101000000-000000000000
 	github.com/aws/aws-sdk-go v1.43.31
+<<<<<<< HEAD
 	github.com/envoyproxy/protoc-gen-validate v0.6.7
+=======
+	github.com/cloudwego/netpoll v0.2.2
+	github.com/envoyproxy/protoc-gen-validate v0.1.0
+>>>>>>> feature/internal-net/support-quic
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-redis/redis/v8 v8.0.0-00010101000000-000000000000
 	github.com/go-sql-driver/mysql v1.6.0
@@ -582,6 +601,7 @@ require (
 	github.com/kpango/fuid v0.0.0-00010101000000-000000000000
 	github.com/kpango/gache v0.0.0-00010101000000-000000000000
 	github.com/kpango/glg v1.6.10
+<<<<<<< HEAD
 	github.com/leanovate/gopter v0.0.0-00010101000000-000000000000
 	github.com/lucasb-eyer/go-colorful v0.0.0-00010101000000-000000000000
 	github.com/pierrec/lz4/v3 v3.0.0-00010101000000-000000000000
@@ -590,6 +610,17 @@ require (
 	github.com/scylladb/gocqlx v0.0.0-00010101000000-000000000000
 	github.com/vdaas/vald-client-go v0.0.0-00010101000000-000000000000
 	github.com/zeebo/xxh3 v1.0.2
+=======
+	github.com/leanovate/gopter v0.2.9
+	github.com/lucas-clemente/quic-go v0.0.0-00010101000000-000000000000
+	github.com/lucasb-eyer/go-colorful v1.2.0
+	github.com/pierrec/lz4/v3 v3.3.4
+	github.com/quasilyte/go-ruleguard v0.3.15
+	github.com/quasilyte/go-ruleguard/dsl v0.3.19
+	github.com/scylladb/gocqlx v1.5.0
+	github.com/tensorflow/tensorflow v0.0.0-00010101000000-000000000000
+	github.com/zeebo/xxh3 v1.0.1
+>>>>>>> feature/internal-net/support-quic
 	go.opencensus.io v0.23.0
 	go.opentelemetry.io/otel v1.9.0
 	go.opentelemetry.io/otel/exporters/jaeger v0.0.0-00010101000000-000000000000
@@ -627,7 +658,13 @@ require (
 	git.sr.ht/~sbinet/gg v0.3.1 // indirect
 	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+<<<<<<< HEAD
+=======
+	github.com/bytedance/gopkg v0.0.0-20220413063733-65bf48ffb3a7 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
+>>>>>>> feature/internal-net/support-quic
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
@@ -643,8 +680,14 @@ require (
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/go-pdf/fpdf v0.6.0 // indirect
+<<<<<<< HEAD
 	github.com/go-toolsmith/astcopy v1.0.2 // indirect
 	github.com/go-toolsmith/astequal v1.0.3 // indirect
+=======
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/go-toolsmith/astcopy v1.0.0 // indirect
+	github.com/go-toolsmith/astequal v1.0.1 // indirect
+>>>>>>> feature/internal-net/support-quic
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -667,13 +710,22 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+<<<<<<< HEAD
 	github.com/mailru/easyjson v0.7.7 // indirect
+=======
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
+>>>>>>> feature/internal-net/support-quic
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.13.0 // indirect
@@ -691,8 +743,13 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
+<<<<<<< HEAD
 	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
+=======
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
+	golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect
+>>>>>>> feature/internal-net/support-quic
 	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
@@ -702,9 +759,16 @@ require (
 	google.golang.org/api v0.94.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+<<<<<<< HEAD
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.24.2 // indirect
 	k8s.io/component-base v0.24.2 // indirect
+=======
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/apiextensions-apiserver v0.24.0 // indirect
+	k8s.io/component-base v0.24.0 // indirect
+>>>>>>> feature/internal-net/support-quic
 	k8s.io/klog/v2 v2.60.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect