Revert deprecation of useInsecureCookies in #310

ytsaurus · Jul 30, 2024 · d0c6e3f · d0c6e3f
1 parent 8092e2c
commit d0c6e3f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -480,9 +480,9 @@ type UISpec struct {
 	ServiceType  corev1.ServiceType `json:"serviceType,omitempty"`
 	HttpNodePort *int32             `json:"httpNodePort,omitempty"`
 	// If defined allows insecure (over http) authentication.
-	// Deprecated: use `secure` instead.
+	//+kubebuilder:default:=true
 	//+optional
-	UseInsecureCookies *bool `json:"useInsecureCookies"`
+	UseInsecureCookies bool `json:"useInsecureCookies"`
 	// Use secure connection to the cluster's http-proxies.
 	//+kubebuilder:default:=false
 	//+optional

diff --git a/api/v1/ytsaurus_webhook.go b/api/v1/ytsaurus_webhook.go
@@ -401,22 +401,17 @@ func (r *Ytsaurus) validateYQLAgents(*Ytsaurus) field.ErrorList {
 func (r *Ytsaurus) validateUi(*Ytsaurus) field.ErrorList {
 	var allErrors field.ErrorList
 
-	if r.Spec.UI != nil {
-		if r.Spec.UI.UseInsecureCookies != nil && !*r.Spec.UI.UseInsecureCookies && !r.Spec.UI.Secure {
-			allErrors = append(allErrors, field.Invalid(field.NewPath("spec", "ui", "useInsecureCookies"), r.Spec.UI.UseInsecureCookies, "useInsecureCookies is deprecated, use secure instead"))
-		}
-		if r.Spec.UI.Secure {
-			for i, hp := range r.Spec.HTTPProxies {
-				if hp.Role != consts.DefaultHTTPProxyRole {
-					continue
-				}
-				if hp.Transport.HTTPSSecret == nil {
-					allErrors = append(allErrors, field.Required(
-						field.NewPath("spec", "httpProxies").Index(i).Child("transport", "httpsSecret"),
-						fmt.Sprintf("configured HTTPS for proxy with `%s` role is required for ui.secure", consts.DefaultHTTPProxyRole)))
-				}
-				break
+	if r.Spec.UI != nil && r.Spec.UI.Secure {
+		for i, hp := range r.Spec.HTTPProxies {
+			if hp.Role != consts.DefaultHTTPProxyRole {
+				continue
+			}
+			if hp.Transport.HTTPSSecret == nil {
+				allErrors = append(allErrors, field.Required(
+					field.NewPath("spec", "httpProxies").Index(i).Child("transport", "httpsSecret"),
+					fmt.Sprintf("configured HTTPS for proxy with `%s` role is required for ui.secure", consts.DefaultHTTPProxyRole)))
 			}
+			break
 		}
 	}
 

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
@@ -34566,6 +34566,7 @@ spec:
                     default: lavander
                     type: string
                   useInsecureCookies:
+                    default: true
                     description: If defined allows insecure (over http) authentication.
                     type: boolean
                 type: object

diff --git a/docs/api.md b/docs/api.md
@@ -1541,7 +1541,7 @@ _Appears in:_
 | `image` _string_ |  |  |  |
 | `serviceType` _[ServiceType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#servicetype-v1-core)_ |  | NodePort |  |
 | `httpNodePort` _integer_ |  |  |  |
-| `useInsecureCookies` _boolean_ | If defined allows insecure (over http) authentication.<br />Deprecated: use `secure` instead. |  |  |
+| `useInsecureCookies` _boolean_ | If defined allows insecure (over http) authentication. | true |  |
 | `secure` _boolean_ | Use secure connection to the cluster's http-proxies. | false |  |
 | `resources` _[ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#resourcerequirements-v1-core)_ |  |  |  |
 | `instanceCount` _integer_ |  |  |  |

diff --git a/pkg/components/ui.go b/pkg/components/ui.go
@@ -168,7 +168,7 @@ func (u *UI) syncComponents(ctx context.Context) (err error) {
 		},
 	}
 
-	if !ytsaurusResource.Spec.UI.Secure {
+	if ytsaurusResource.Spec.UI.UseInsecureCookies {
 		env = append(env, corev1.EnvVar{
 			Name:  "YT_AUTH_ALLOW_INSECURE",
 			Value: "1",

diff --git a/ytop-chart/templates/ytsaurus-crd.yaml b/ytop-chart/templates/ytsaurus-crd.yaml
@@ -34353,6 +34353,7 @@ spec:
                     default: lavander
                     type: string
                   useInsecureCookies:
+                    default: true
                     description: If defined allows insecure (over http) authentication.
                     type: boolean
                 type: object