Reuse Namespace should be in experimental section

(cherry picked from commit 27a9c95)
loft-sh · Feb 21, 2025 · cf73ab6 · cf73ab6
1 parent 75c2a9b
commit cf73ab6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -237,10 +237,6 @@
         "globalMetadata": {
           "$ref": "#/$defs/ControlPlaneGlobalMetadata",
           "description": "GlobalMetadata is metadata that will be added to all resources deployed by Helm."
-        },
-        "reuseNamespace": {
-          "type": "boolean",
-          "description": "ReuseNamespace allows reusing the same namespace to create multiple vClusters.\nThis flag is deprecated, as this scenario will be removed entirely in upcoming releases."
         }
       },
       "additionalProperties": false,
@@ -1344,6 +1340,10 @@
         "sleepMode": {
           "$ref": "#/$defs/SleepMode",
           "description": "SleepMode holds the native sleep mode configuration for Pro clusters"
+        },
+        "reuseNamespace": {
+          "type": "boolean",
+          "description": "ReuseNamespace allows reusing the same namespace to create multiple vClusters.\nThis flag is deprecated, as this scenario will be removed entirely in upcoming releases."
         }
       },
       "additionalProperties": false,

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -721,9 +721,6 @@ controlPlane:
     # GlobalMetadata is metadata that will be added to all resources deployed by Helm.
     globalMetadata:
       annotations: {}
-    # ReuseNamespace allows reusing the same namespace to create multiple vClusters.
-    # This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
-    reuseNamespace: false
 
 # Integrations holds config for vCluster integrations with other operators or tools running on the host cluster
 integrations:
@@ -1034,6 +1031,10 @@ experimental:
       extraRules: []
     role:
       extraRules: []
+
+  # ReuseNamespace allows reusing the same namespace to create multiple vClusters.
+  # This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
+  reuseNamespace: false
 
 # Configuration related to telemetry gathered about vCluster usage.
 telemetry:

diff --git a/config/config.go b/config/config.go
@@ -1464,10 +1464,6 @@ type ControlPlaneAdvanced struct {
 
 	// GlobalMetadata is metadata that will be added to all resources deployed by Helm.
 	GlobalMetadata ControlPlaneGlobalMetadata `json:"globalMetadata,omitempty"`
-
-	// ReuseNamespace allows reusing the same namespace to create multiple vClusters.
-	// This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
-	ReuseNamespace bool `json:"reuseNamespace,omitempty"`
 }
 
 type ControlPlaneHeadlessService struct {
@@ -1974,6 +1970,10 @@ type Experimental struct {
 
 	// SleepMode holds the native sleep mode configuration for Pro clusters
 	SleepMode *SleepMode `json:"sleepMode,omitempty"`
+
+	// ReuseNamespace allows reusing the same namespace to create multiple vClusters.
+	// This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
+	ReuseNamespace bool `json:"reuseNamespace,omitempty"`
 }
 
 func (e Experimental) JSONSchemaExtend(base *jsonschema.Schema) {

diff --git a/config/values.yaml b/config/values.yaml
@@ -397,8 +397,6 @@ controlPlane:
     globalMetadata:
       annotations: {}
 
-    reuseNamespace: false
-
 integrations:
   metricsServer:
     enabled: false
@@ -574,5 +572,7 @@ experimental:
     role:
       extraRules: []
 
+  reuseNamespace: false
+
 telemetry:
   enabled: true