feat: add proxyPort UI option

go-faster · Mar 8, 2024 · b1099af · b1099af
1 parent 5b4a9d7
commit b1099af
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -399,6 +399,10 @@ type UISpec struct {
 	Description *string `json:"description,omitempty"`
 	Group       *string `json:"group,omitempty"`
 
+	// This is a temporary solution to allow UI to connect to proxies directly when resolving heavy proxies.
+	//+optional
+	ProxyPort *int `json:"proxyPort,omitempty"`
+
 	Tolerations         []corev1.Toleration `json:"tolerations,omitempty"`
 	Affinity            *corev1.Affinity    `json:"affinity,omitempty"`
 	NodeSelector        map[string]string   `json:"nodeSelector,omitempty"`

diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -34635,6 +34635,10 @@ spec:
                     type: object
                   odinBaseUrl:
                     type: string
+                  proxyPort:
+                    description: This is a temporary solution to allow UI to connect
+                      to proxies directly when res
+                    type: integer
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.

diff --git a/pkg/ytconfig/generator.go b/pkg/ytconfig/generator.go
@@ -775,6 +775,10 @@ func (g *Generator) GetUIClustersConfig() ([]byte, error) {
 	c.Proxy = g.GetHTTPProxiesAddress(consts.DefaultHTTPProxyRole)
 	c.PrimaryMaster.CellTag = g.ytsaurus.Spec.PrimaryMasters.CellTag
 
+	if port := g.ytsaurus.Spec.UI.ProxyPort; port != nil {
+		c.ProxyPort = *port
+	}
+
 	c.Theme = g.ytsaurus.Spec.UI.Theme
 	c.Environment = g.ytsaurus.Spec.UI.Environment
 	if g.ytsaurus.Spec.UI.Group != nil {

diff --git a/pkg/ytconfig/ui.go b/pkg/ytconfig/ui.go
@@ -14,6 +14,7 @@ type UICluster struct {
 	ID             string               `yson:"id"`
 	Name           string               `yson:"name"`
 	Proxy          string               `yson:"proxy"`
+	ProxyPort      int                  `yson:"proxyPort,omitempty"`
 	Secure         bool                 `yson:"secure"`
 	Authentication UIAuthenticationType `yson:"authentication"`
 	Group          string               `yson:"group"`

diff --git a/ytop-chart/files/cluster.ytsaurus.tech_ytsaurus.yaml b/ytop-chart/files/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -34635,6 +34635,10 @@ spec:
                     type: object
                   odinBaseUrl:
                     type: string
+                  proxyPort:
+                    description: This is a temporary solution to allow UI to connect
+                      to proxies directly when res
+                    type: integer
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.