some fixes

ytsaurus · Nov 11, 2024 · 9580039 · 9580039
1 parent 8627358
commit 9580039
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -517,13 +517,17 @@ type QueryTrackerSpec struct {
 }
 
 type StrawberryControllerSpec struct {
-	Resources          corev1.ResourceRequirements `json:"resources,omitempty"`
-	Image              *string                     `json:"image,omitempty"`
-	Tolerations        []corev1.Toleration         `json:"tolerations,omitempty"`
-	NodeSelector       map[string]string           `json:"nodeSelector,omitempty"`
-	ExternalProxy      *string                     `json:"externalProxy,omitempty"`
-	ControllerFamilies []string                    `json:"controllerFamilies,omitempty"`
-	DefaultRouteFamily *string                     `json:"defaultRouteFamily,omitempty"`
+	Resources     corev1.ResourceRequirements `json:"resources,omitempty"`
+	Image         *string                     `json:"image,omitempty"`
+	Tolerations   []corev1.Toleration         `json:"tolerations,omitempty"`
+	NodeSelector  map[string]string           `json:"nodeSelector,omitempty"`
+	ExternalProxy *string                     `json:"externalProxy,omitempty"`
+	// Supported controller families, for example: "chyt", "jupyt", "livy".
+	ControllerFamilies []string `json:"controllerFamilies,omitempty"`
+	// The family that will receive requests for domains that are not explicitly specified in http_controller_mappings.
+	// For example, "chyt" (with `ControllerFamilies` set to {"chyt", "jupyt"} would mean
+	// that requests to "foo.<domain>" will be processed by chyt controller.
+	DefaultRouteFamily *string `json:"defaultRouteFamily,omitempty"`
 }
 
 type YQLAgentSpec struct {

diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -29433,10 +29433,14 @@ spec:
               strawberry:
                 properties:
                   controllerFamilies:
+                    description: 'Supported controller families, for example: "chyt",
+                      "jupyt", "livy".'
                     items:
                       type: string
                     type: array
                   defaultRouteFamily:
+                    description: The family that will receive requests for domains
+                      that are not explicitly specif
                     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_                                                                                                     |  |  |  |
-| `defaultRouteFamily` _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_ | Supported controller families, for example: "chyt", "jupyt", "livy". |  |  |
+| `defaultRouteFamily` _string_ | The family that will receive requests for domains that are not explicitly specified in http_controller_mappings.<br />For example, "chyt" (with `ControllerFamilies` set to {"chyt", "jupyt"} would mean<br />that requests to "foo.<domain>" will be processed by chyt controller. |  |  |
 
 
 #### StructuredLoggerSpec