Skip to content

Commit 3e469eb

Browse files
committed
chore: sync config/*.go and values.schema.json to vCluster version v0.23.0-rc.6
1 parent 95e1a9b commit 3e469eb

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

config/config.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"errors"
77
"fmt"
8+
"os"
89
"reflect"
910
"regexp"
1011
"strings"
@@ -333,6 +334,10 @@ func ValidateStoreAndDistroChanges(currentStoreType, previousStoreType StoreType
333334
}
334335

335336
func (c *Config) IsProFeatureEnabled() bool {
337+
if os.Getenv("SKIP_VALIDATE_PRO_FEATURES") == "true" {
338+
return false
339+
}
340+
336341
if len(c.Networking.ResolveDNS) > 0 {
337342
return true
338343
}
@@ -1464,10 +1469,6 @@ type ControlPlaneAdvanced struct {
14641469

14651470
// GlobalMetadata is metadata that will be added to all resources deployed by Helm.
14661471
GlobalMetadata ControlPlaneGlobalMetadata `json:"globalMetadata,omitempty"`
1467-
1468-
// ReuseNamespace allows reusing the same namespace to create multiple vClusters.
1469-
// This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
1470-
ReuseNamespace bool `json:"reuseNamespace,omitempty"`
14711472
}
14721473

14731474
type ControlPlaneHeadlessService struct {
@@ -1974,6 +1975,10 @@ type Experimental struct {
19741975

19751976
// SleepMode holds the native sleep mode configuration for Pro clusters
19761977
SleepMode *SleepMode `json:"sleepMode,omitempty"`
1978+
1979+
// ReuseNamespace allows reusing the same namespace to create multiple vClusters.
1980+
// This flag is deprecated, as this scenario will be removed entirely in upcoming releases.
1981+
ReuseNamespace bool `json:"reuseNamespace,omitempty"`
19771982
}
19781983

19791984
func (e Experimental) JSONSchemaExtend(base *jsonschema.Schema) {

config/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,6 @@ controlPlane:
397397
globalMetadata:
398398
annotations: {}
399399

400-
reuseNamespace: false
401-
402400
integrations:
403401
metricsServer:
404402
enabled: false
@@ -574,5 +572,7 @@ experimental:
574572
role:
575573
extraRules: []
576574

575+
reuseNamespace: false
576+
577577
telemetry:
578578
enabled: true

values.schema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,6 @@
237237
"globalMetadata": {
238238
"$ref": "#/$defs/ControlPlaneGlobalMetadata",
239239
"description": "GlobalMetadata is metadata that will be added to all resources deployed by Helm."
240-
},
241-
"reuseNamespace": {
242-
"type": "boolean",
243-
"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."
244240
}
245241
},
246242
"additionalProperties": false,
@@ -1344,6 +1340,10 @@
13441340
"sleepMode": {
13451341
"$ref": "#/$defs/SleepMode",
13461342
"description": "SleepMode holds the native sleep mode configuration for Pro clusters"
1343+
},
1344+
"reuseNamespace": {
1345+
"type": "boolean",
1346+
"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."
13471347
}
13481348
},
13491349
"additionalProperties": false,

0 commit comments

Comments
 (0)