Merge pull request #711 from leejones/add-fetch-credentials-setting-for-vtadmin

Add fetchCredentials setting for VTAdmin

Author: frouioui

deploy/crds/planetscale.com_vitessclusters.yaml

@@ -3102,6 +3102,8 @@ spec:
                     type: array
                   extraVolumes:
                     x-kubernetes-preserve-unknown-fields: true
+                  fetchCredentials:
+                    type: string
                   initContainers:
                     x-kubernetes-preserve-unknown-fields: true
                   rbac:

docs/api.md

@@ -8528,6 +8528,21 @@ Kubernetes core/v1.ResourceRequirements
 </tr>
 <tr>
 <td>
+<code>fetchCredentials</code><br>
+<em>
+string
+</em>
+</td>
+<td>
+<p>FetchCredentials controls whether or not the browser includes credentials
+(e.g. cookies, auth headers) when vtadmin-web sends requests to
+vtadmin-api. For possible values, see
+<a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials">https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials</a>.</p>
+<p>Default: omit.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>readOnly</code><br>
 <em>
 bool

docs/api/index.html

@@ -8530,6 +8530,21 @@ <h3 id="planetscale.com/v2.VtAdminSpec">VtAdminSpec
 </tr>
 <tr>
 <td>
+<code>fetchCredentials</code><br>
+<em>
+string
+</em>
+</td>
+<td>
+<p>FetchCredentials controls whether or not the browser includes credentials
+(e.g. cookies, auth headers) when vtadmin-web sends requests to
+vtadmin-api. For possible values, see
+<a href="https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials">https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials</a>.</p>
+<p>Default: omit.</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>readOnly</code><br>
 <em>
 bool

pkg/apis/planetscale/v2/defaults.go

@@ -67,9 +67,10 @@ const (
 	defaultVtctldCPUMillis   = 100
 	defaultVtctldMemoryBytes = 128 * Mi
 
-	defaultVtadminReplicas    = 1
-	defaultVtadminCPUMillis   = 100
-	defaultVtadminMemoryBytes = 128 * Mi
+	defaultVtadminReplicas         = 1
+	defaultVtadminCPUMillis        = 100
+	defaultVtadminMemoryBytes      = 128 * Mi
+	defaultVtadminFetchCredentials = "omit"
 
 	defaultVtorcReplicas    = 0
 	defaultVtorcCPUMillis   = 100

pkg/apis/planetscale/v2/vitesscluster_defaults.go

@@ -130,6 +130,9 @@ func DefaultVtAdmin(dashboard **VtAdminSpec) {
 			corev1.ResourceMemory: *resource.NewQuantity(defaultVtadminMemoryBytes, resource.BinarySI),
 		}
 	}
+	if (*dashboard).FetchCredentials == "" {
+		(*dashboard).FetchCredentials = defaultVtadminFetchCredentials
+	}
 	DefaultServiceOverrides(&(*dashboard).Service)
 }
 

pkg/apis/planetscale/v2/vitesscluster_types.go

@@ -479,6 +479,14 @@ type VtAdminSpec struct {
 	// APIResources determines the compute resources reserved for each vtadmin-api replica.
 	APIResources corev1.ResourceRequirements `json:"apiResources,omitempty"`
 
+	// FetchCredentials controls whether or not the browser includes credentials
+	// (e.g. cookies, auth headers) when vtadmin-web sends requests to
+	// vtadmin-api. For possible values, see
+	// https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch#including_credentials.
+	//
+	// Default: omit.
+	FetchCredentials string `json:"fetchCredentials,omitempty"`
+
 	// ReadOnly specifies whether the web UI should be read-only
 	// or should it allow users to take actions
 	//

pkg/controller/vitesscluster/reconcile_vtadmin.go

@@ -342,18 +342,18 @@ func (r *ReconcileVitessCluster) createWebConfigSecret(ctx context.Context, vt *
 	configKey := vtadmin.WebConfigFileName
 	configVal := fmt.Sprintf(`window.env = {
      'VITE_VTADMIN_API_ADDRESS': "%s",
-     'VITE_FETCH_CREDENTIALS': "omit",
+     'VITE_FETCH_CREDENTIALS': "%s",
      'VITE_ENABLE_EXPERIMENTAL_TABLET_DEBUG_VARS': false,
      'VITE_BUGSNAG_API_KEY': "",
      'VITE_DOCUMENT_TITLE': "",
      'VITE_READONLY_MODE': %s,
      'REACT_APP_VTADMIN_API_ADDRESS': "%s",
-     'REACT_APP_FETCH_CREDENTIALS': "omit",
+     'REACT_APP_FETCH_CREDENTIALS': "%s",
      'REACT_APP_ENABLE_EXPERIMENTAL_TABLET_DEBUG_VARS': false,
      'REACT_APP_BUGSNAG_API_KEY': "",
      'REACT_APP_DOCUMENT_TITLE': "",
      'REACT_APP_READONLY_MODE': %s,
- };`, apiAddress, convertReadOnlyFieldToString(vt.Spec.VtAdmin.ReadOnly), apiAddress, convertReadOnlyFieldToString(vt.Spec.VtAdmin.ReadOnly))
+ };`, apiAddress, vt.Spec.VtAdmin.FetchCredentials, convertReadOnlyFieldToString(vt.Spec.VtAdmin.ReadOnly), apiAddress, vt.Spec.VtAdmin.FetchCredentials, convertReadOnlyFieldToString(vt.Spec.VtAdmin.ReadOnly))
 	secretName := vtadmin.WebConfigSecretName(vt.Name, cell.Name)
 
 	// Create or update the secret

test/endtoend/operator/operator-latest.yaml

@@ -4984,6 +4984,8 @@ spec:
                       type: array
                     extraVolumes:
                       x-kubernetes-preserve-unknown-fields: true
+                    fetchCredentials:
+                      type: string
                     initContainers:
                       x-kubernetes-preserve-unknown-fields: true
                     rbac: