Add support for directDownload to UI Spec (#257)

api/v1/ytsaurus_types.go

@@ -493,6 +493,10 @@ type UISpec struct {
 	Theme       string  `json:"theme,omitempty"`
 	Description *string `json:"description,omitempty"`
 	Group       *string `json:"group,omitempty"`
+	// When this is set to false, UI will use backend for downloading instead of proxy.
+	// If this is set to true or omitted, UI use proxies, which is a default behaviour.
+	//+optional
+	DirectDownload *bool `json:"directDownload,omitempty"`
 }
 
 type QueryTrackerSpec struct {

config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml

@@ -34137,6 +34137,10 @@ spec:
                 properties:
                   description:
                     type: string
+                  directDownload:
+                    description: When this is set to false, UI will use backend for
+                      downloading instead of proxy.
+                    type: boolean
                   environment:
                     default: testing
                     type: string

docs/api.md

@@ -1534,6 +1534,7 @@ _Appears in:_
 | `theme` _string_ |  | lavander |  |
 | `description` _string_ |  |  |  |
 | `group` _string_ |  |  |  |
+| `directDownload` _boolean_ | When this is set to false, UI will use backend for downloading instead of proxy.<br />If this is set to true or omitted, UI use proxies, which is a default behaviour. |  |  |
 
 
 #### UpdateFlow

pkg/ytconfig/canondata/TestGetUICustomConfigWithSettings/test.canondata

@@ -0,0 +1,3 @@
+{
+    odinBaseUrl="http://odin-webservice.odin.svc.cluster.local";
+}

pkg/ytconfig/generator.go

@@ -699,13 +699,24 @@ func (g *Generator) GetUIClustersConfig() ([]byte, error) {
 	})
 }
 
+func (g *Generator) GetUICustomSettings() *UICustomSettings {
+	directDownload := g.ytsaurus.Spec.UI.DirectDownload
+	if directDownload == nil {
+		return nil
+	}
+	return &UICustomSettings{
+		DirectDownload: directDownload,
+	}
+}
+
 func (g *Generator) GetUICustomConfig() ([]byte, error) {
 	if g.ytsaurus.Spec.UI == nil {
 		return []byte{}, nil
 	}
 
 	c := UICustom{
 		OdinBaseUrl: g.ytsaurus.Spec.UI.OdinBaseUrl,
+		Settings:    g.GetUICustomSettings(),
 	}
 
 	return marshallYsonConfig(c)

pkg/ytconfig/generator_test.go

@@ -380,6 +380,13 @@ func TestGetUICustomConfig(t *testing.T) {
 	canonize.Assert(t, cfg)
 }
 
+func TestGetUICustomConfigWithSettings(t *testing.T) {
+	g := NewGenerator(withUICustomSettings(getYtsaurus()), testClusterDomain)
+	cfg, err := g.GetUICustomConfig()
+	require.NoError(t, err)
+	canonize.Assert(t, cfg)
+}
+
 func TestGetYQLAgentConfig(t *testing.T) {
 	ytsaurus := getYtsaurusWithEverything()
 	g := NewGenerator(ytsaurus, testClusterDomain)
@@ -615,6 +622,15 @@ func withUICustom(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 	return ytsaurus
 }
 
+func withUICustomSettings(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
+	odinUrl := "http://odin-webservice.odin.svc.cluster.local"
+	ytsaurus.Spec.UI = &ytv1.UISpec{
+		OdinBaseUrl:    &odinUrl,
+		DirectDownload: nil,
+	}
+	return ytsaurus
+}
+
 func withMasterCaches(ytsaurus *ytv1.Ytsaurus) *ytv1.Ytsaurus {
 	ytsaurus.Spec.MasterCaches = &ytv1.MasterCachesSpec{InstanceSpec: testBasicInstanceSpec}
 	ytsaurus.Spec.MasterCaches.InstanceSpec.MonitoringPort = ptr.Int32(consts.MasterCachesMonitoringPort)

pkg/ytconfig/ui.go

@@ -36,6 +36,11 @@ func getUIClusterCarcass() UICluster {
 	}
 }
 
+type UICustomSettings struct {
+	DirectDownload *bool `yson:"directDownload,omitempty"`
+}
+
 type UICustom struct {
-	OdinBaseUrl *string `yson:"odinBaseUrl,omitempty"`
+	OdinBaseUrl *string           `yson:"odinBaseUrl,omitempty"`
+	Settings    *UICustomSettings `yson:"uiSettings,omitempty"`
 }

ytop-chart/templates/ytsaurus-crd.yaml

@@ -33926,6 +33926,10 @@ spec:
                 properties:
                   description:
                     type: string
+                  directDownload:
+                    description: When this is set to false, UI will use backend for
+                      downloading instead of proxy.
+                    type: boolean
                   environment:
                     default: testing
                     type: string