v3.7 , estim. worked bin but not tests

leo-astorsky · Jul 24, 2024 · 48c8f9c · 48c8f9c
1 parent 0cab694
commit 48c8f9c
Show file tree

Hide file tree

Showing 26 changed files with 54 additions and 0 deletions.
diff --git a/pkg/ytconfig/canondata/TestGetControllerAgentsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetControllerAgentsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeConfig/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetDataNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetDataNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetDiscoveryConfig/test.canondata b/pkg/ytconfig/canondata/TestGetDiscoveryConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeConfig/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeConfigWithCri/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeConfigWithCri/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetExecNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetExecNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetHTTPProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetHTTPProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetMasterCachesConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterCachesConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetMasterCachesWithFixedHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterCachesWithFixedHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetMasterConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetMasterWithFixedHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetMasterWithFixedHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetNativeClientConfig/test.canondata b/pkg/ytconfig/canondata/TestGetNativeClientConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetQueryTrackerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetQueryTrackerConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetQueueAgentConfig/test.canondata b/pkg/ytconfig/canondata/TestGetQueueAgentConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetRPCProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetRPCProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetRPCProxyWithoutOauthConfig/test.canondata b/pkg/ytconfig/canondata/TestGetRPCProxyWithoutOauthConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetSchedulerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetSchedulerConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetSchedulerWithFixedMasterHostsConfig/test.canondata b/pkg/ytconfig/canondata/TestGetSchedulerWithFixedMasterHostsConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetStrawberryControllerConfig/test.canondata b/pkg/ytconfig/canondata/TestGetStrawberryControllerConfig/test.canondata
@@ -12,6 +12,8 @@
             "address_resolver"={
                 "enable_ipv4"=%true;
                 "enable_ipv6"=%true;
+                "keep_socket"=%true;
+                "force_tcp"=%false;
                 retries=1000;
             };
         };

diff --git a/pkg/ytconfig/canondata/TestGetTCPProxyConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTCPProxyConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetTabletNodeConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTabletNodeConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetTabletNodeWithoutYtsaurusConfig/test.canondata b/pkg/ytconfig/canondata/TestGetTabletNodeWithoutYtsaurusConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%false;
         "enable_ipv6"=%true;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/canondata/TestGetYQLAgentConfig/test.canondata b/pkg/ytconfig/canondata/TestGetYQLAgentConfig/test.canondata
@@ -2,6 +2,8 @@
     "address_resolver"={
         "enable_ipv4"=%true;
         "enable_ipv6"=%false;
+        "keep_socket"=%true;
+        "force_tcp"=%false;
         retries=1000;
     };
     logging={

diff --git a/pkg/ytconfig/generator.go b/pkg/ytconfig/generator.go
@@ -6,6 +6,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	ptr "k8s.io/utils/pointer"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"go.ytsaurus.tech/yt/go/yson"
 
@@ -142,8 +143,11 @@ func (g *Generator) fillDriver(c *Driver) {
 }
 
 func (g *BaseGenerator) fillAddressResolver(c *AddressResolver) {
+	logger := log.Log
 	var retries = 1000
 
+	logger.Info("fill ar")
+	fmt.Printf("%+v\n", g)
 	c.EnableIPv4 = g.commonSpec.UseIPv4
 	c.EnableIPv6 = g.commonSpec.UseIPv6
 	c.KeepSocket = g.commonSpec.KeepSocket

diff --git a/pkg/ytconfig/generator_test.go b/pkg/ytconfig/generator_test.go
@@ -446,6 +446,8 @@ func withOauthSpec(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 func withResolverConfigured(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 	ytsaurus.Spec.UseIPv4 = true
 	ytsaurus.Spec.UseIPv6 = false
+	ytsaurus.Spec.KeepSocket = true
+	ytsaurus.Spec.ForceTcp = false
 	return ytsaurus
 }