fix naming

ytsaurus · Oct 16, 2024 · 8627358 · 8627358
1 parent ea185cb
commit 8627358
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -523,7 +523,7 @@ type StrawberryControllerSpec struct {
 	NodeSelector       map[string]string           `json:"nodeSelector,omitempty"`
 	ExternalProxy      *string                     `json:"externalProxy,omitempty"`
 	ControllerFamilies []string                    `json:"controllerFamilies,omitempty"`
-	DefaultFamily      *string                     `json:"defaultFamily,omitempty"`
+	DefaultRouteFamily *string                     `json:"defaultRouteFamily,omitempty"`
 }
 
 type YQLAgentSpec struct {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -29436,7 +29436,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  defaultFamily:
+                  defaultRouteFamily:
                     type: string
                   externalProxy:
                     type: string

diff --git a/docs/api.md b/docs/api.md
@@ -1465,15 +1465,15 @@ _Appears in:_
 _Appears in:_
 - [YtsaurusSpec](#ytsaurusspec)
 
-| Field | Description | Default | Validation |
-| --- | --- | --- | --- |
+| Field                                                                                                                                   | Description | Default | Validation |
+|-----------------------------------------------------------------------------------------------------------------------------------------| --- | --- | --- |
 | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#resourcerequirements-v1-core)_ |  |  |  |
-| `image` _string_ |  |  |  |
-| `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
-| `nodeSelector` _object (keys:string, values:string)_ |  |  |  |
-| `externalProxy` _string_ |  |  |  |
-| `controllerFamilies` _string array_ |  |  |  |
-| `defaultFamily` _string_ |  |  |  |
+| `image` _string_                                                                                                                        |  |  |  |
+| `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_             |  |  |  |
+| `nodeSelector` _object (keys:string, values:string)_                                                                                    |  |  |  |
+| `externalProxy` _string_                                                                                                                |  |  |  |
+| `controllerFamilies` _string array_                                                                                                     |  |  |  |
+| `defaultRouteFamily` _string_                                                                                                           |  |  |  |
 
 
 #### StructuredLoggerSpec

diff --git a/pkg/ytconfig/common.go b/pkg/ytconfig/common.go
@@ -60,7 +60,7 @@ type AddressResolver struct {
 
 type StrawberryControllerFamiliesConfig struct {
 	ControllerFamilies []string `yson:"controller_families,omitempty"`
-	DefaultFamily      string   `yson:"default_family,omitempty"`
+	DefaultRouteFamily string   `yson:"default_route_family,omitempty"`
 	ExternalProxy      *string  `yson:"external_proxy,omitempty"`
 }
 

diff --git a/pkg/ytconfig/generator.go b/pkg/ytconfig/generator.go
@@ -317,10 +317,10 @@ func (g *Generator) fillStrawberryControllerFamiliesConfig(c *StrawberryControll
 	} else {
 		c.ControllerFamilies = consts.GetDefaultStrawberryControllerFamilies()
 	}
-	if s.DefaultFamily != nil {
-		c.DefaultFamily = *s.DefaultFamily
+	if s.DefaultRouteFamily != nil {
+		c.DefaultRouteFamily = *s.DefaultRouteFamily
 	} else {
-		c.DefaultFamily = consts.DefaultStrawberryControllerFamily
+		c.DefaultRouteFamily = consts.DefaultStrawberryControllerFamily
 	}
 	c.ExternalProxy = s.ExternalProxy
 }

diff --git a/pkg/ytconfig/generator_test.go b/pkg/ytconfig/generator_test.go
@@ -356,8 +356,8 @@ func TestGetStrawberryControllerConfigWithCustomFamilies(t *testing.T) {
 		g.ytsaurus.Spec.StrawberryController.ControllerFamilies,
 		"superservice1", "superservice2", "superservice3",
 	)
-	defaultFamily := "superservice2"
-	g.ytsaurus.Spec.StrawberryController.DefaultFamily = &defaultFamily
+	defaultRouteFamily := "superservice2"
+	g.ytsaurus.Spec.StrawberryController.DefaultRouteFamily = &defaultRouteFamily
 	cfg, err := g.GetStrawberryControllerConfig()
 	require.NoError(t, err)
 	canonize.Assert(t, cfg)

diff --git a/pkg/ytconfig/strawberry.go b/pkg/ytconfig/strawberry.go
@@ -56,15 +56,15 @@ func getStrawberryController(conFamConfig StrawberryControllerFamiliesConfig, re
 	if conFamConfig.ExternalProxy != nil {
 		httpControllerMappings = make(map[string]string, len(conFamConfig.ControllerFamilies))
 		for _, cFamily := range conFamConfig.ControllerFamilies {
-			if cFamily == conFamConfig.DefaultFamily {
+			if cFamily == conFamConfig.DefaultRouteFamily {
 				httpControllerMappings["*"] = cFamily
 			} else {
 				host := fmt.Sprintf("%s.%s", cFamily, *conFamConfig.ExternalProxy)
 				httpControllerMappings[host] = cFamily
 			}
 		}
 	} else {
-		httpControllerMappings = map[string]string{"*": conFamConfig.DefaultFamily}
+		httpControllerMappings = map[string]string{"*": conFamConfig.DefaultRouteFamily}
 	}
 
 	return StrawberryController{

diff --git a/ytop-chart/templates/crds/ytsaurus.cluster.ytsaurus.tech.yaml b/ytop-chart/templates/crds/ytsaurus.cluster.ytsaurus.tech.yaml
@@ -29447,7 +29447,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  defaultFamily:
+                  defaultRouteFamily:
                     type: string
                   externalProxy:
                     type: string