Skip to content

Commit

Permalink
update chart/values.yaml and values.schema.json based on config.go ch…
Browse files Browse the repository at this point in the history
…anges
  • Loading branch information
deniseschannon committed Apr 16, 2024
1 parent f129530 commit f5b0b24
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
21 changes: 10 additions & 11 deletions chart/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"hostPathMapper": {
"$ref": "#/$defs/HostPathMapper",
"description": "HostPathMapper defines if vCluster should rewrite host paths.",
"description": "HostPathMapper defines if vCluster should rewrite host paths. This is a Pro feature since central is a Pro feature and we don't recommend using HostPathMapper without central.",
"pro": true
},
"ingress": {
Expand Down Expand Up @@ -517,7 +517,7 @@
},
"embedded": {
"type": "boolean",
"description": "Embedded defines if vCluster will start the embedded coredns service within the control-plane and not as a separate deployment. This is a PRO feature.",
"description": "Embedded defines if vCluster will start the embedded coredns service within the control-plane and not as a separate deployment. This is a Pro feature.",
"pro": true
},
"service": {
Expand Down Expand Up @@ -913,7 +913,7 @@
"properties": {
"embedded": {
"$ref": "#/$defs/EtcdEmbedded",
"description": "Embedded defines to use embedded etcd as a storage backend for the virtual cluster",
"description": "Embedded defines to use embedded etcd as a storage backend for the virtual cluster. This is a Pro feature.",
"pro": true
},
"deploy": {
Expand Down Expand Up @@ -1054,8 +1054,7 @@
"properties": {
"enabled": {
"type": "boolean",
"description": "Enabled defines if the embedded etcd should be used.",
"pro": true
"description": "Enabled defines if the embedded etcd should be used."
},
"migrateFromDeployedEtcd": {
"type": "boolean",
Expand Down Expand Up @@ -1085,7 +1084,7 @@
},
"isolatedControlPlane": {
"$ref": "#/$defs/ExperimentalIsolatedControlPlane",
"description": "IsolatedControlPlane is a feature to run the vCluster control plane in a different Kubernetes cluster than the workloads themselves.",
"description": "IsolatedControlPlane is a feature to run the vCluster control plane in a different Kubernetes cluster than the workloads themselves. This is a Pro feature.",
"pro": true
},
"virtualClusterKubeConfig": {
Expand All @@ -1097,7 +1096,7 @@
"$ref": "#/$defs/DenyRule"
},
"type": "array",
"description": "DenyProxyRequests denies certain requests in the vCluster proxy.",
"description": "DenyProxyRequests denies certain requests in the vCluster proxy. This is a Pro feature.",
"pro": true
}
},
Expand Down Expand Up @@ -1280,12 +1279,12 @@
"properties": {
"disableSync": {
"type": "boolean",
"description": "DisableSync will not sync any resources and disable most control plane functionality.",
"description": "DisableSync will not sync any resources and disable most control plane functionality. This is a Pro feature.",
"pro": true
},
"rewriteKubernetesService": {
"type": "boolean",
"description": "RewriteKubernetesService will rewrite the Kubernetes service to point to the vCluster service if disableSync is enabled",
"description": "RewriteKubernetesService will rewrite the Kubernetes service to point to the vCluster service if disableSync is enabled. This is a Pro feature.",
"pro": true
},
"targetNamespace": {
Expand Down Expand Up @@ -1799,7 +1798,7 @@
"$ref": "#/$defs/ResolveDNS"
},
"type": "array",
"description": "ResolveDNS allows to define extra DNS rules. This only works if embedded coredns is configured.",
"description": "ResolveDNS allows to define extra DNS rules. This only works if embedded coredns is configured. This is a Pro feature since embedded coredns is a Pro feature.",
"pro": true
},
"advanced": {
Expand Down Expand Up @@ -2214,7 +2213,7 @@
},
"centralAdmission": {
"$ref": "#/$defs/CentralAdmission",
"description": "CentralAdmission defines what validating or mutating webhooks should be enforced within the virtual cluster.",
"description": "CentralAdmission defines what validating or mutating webhooks should be enforced within the virtual cluster. This is a Pro feature.",
"pro": true
}
},
Expand Down
14 changes: 7 additions & 7 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ controlPlane:
caFile: ""
# Etcd defines that etcd should be used as the backend for the virtual cluster
etcd:
# Embedded defines to use embedded etcd as a storage backend for the virtual cluster
# Embedded defines to use embedded etcd as a storage backend for the virtual cluster. This is a Pro feature.
embedded:
# Enabled defines if the embedded etcd should be used.
enabled: false
Expand Down Expand Up @@ -408,7 +408,7 @@ controlPlane:
coredns:
# Enabled defines if coredns is enabled
enabled: true
# Embedded defines if vCluster will start the embedded coredns service within the control-plane and not as a separate deployment. This is a PRO feature.
# Embedded defines if vCluster will start the embedded coredns service within the control-plane and not as a separate deployment. This is a Pro feature.
embedded: false
# OverwriteManifests can be used to overwrite the coredns manifests used to deploy coredns
overwriteManifests: ""
Expand Down Expand Up @@ -665,7 +665,7 @@ networking:
# FromHost defines the services that should get synced from the host to the virtual cluster.
fromHost: []

# ResolveDNS allows to define extra DNS rules. This only works if embedded coredns is configured.
# ResolveDNS allows to define extra DNS rules. This only works if embedded coredns is configured. This is a Pro feature since embedded coredns is a Pro feature.
resolveDNS: []

# Advanced holds advanced network options.
Expand Down Expand Up @@ -759,7 +759,7 @@ policies:
- 172.16.0.0/12
- 192.168.0.0/16

# CentralAdmission defines what validating or mutating webhooks should be enforced within the virtual cluster.
# CentralAdmission defines what validating or mutating webhooks should be enforced within the virtual cluster. This is a Pro feature.
centralAdmission:
# ValidatingWebhooks are validating webhooks that should be enforced in the virtual cluster
validatingWebhooks: []
Expand Down Expand Up @@ -796,16 +796,16 @@ experimental:

# SyncSettings are advanced settings for the syncer controller.
syncSettings:
# DisableSync will not sync any resources and disable most control plane functionality.
# DisableSync will not sync any resources and disable most control plane functionality. This is a Pro feature.
disableSync: false
# RewriteKubernetesService will rewrite the Kubernetes service to point to the vCluster service if disableSync is enabled
# RewriteKubernetesService will rewrite the Kubernetes service to point to the vCluster service if disableSync is enabled. This is a Pro feature.
rewriteKubernetesService: false
# TargetNamespace is the namespace where the workloads should get synced to.
targetNamespace: ""
# SetOwner specifies if vCluster should set an owner reference on the synced objects to the vCluster service. This allows for easy garbage collection.
setOwner: true

# IsolatedControlPlane is a feature to run the vCluster control plane in a different Kubernetes cluster than the workloads themselves.
# IsolatedControlPlane is a feature to run the vCluster control plane in a different Kubernetes cluster than the workloads themselves. This is a Pro feature.
isolatedControlPlane:
# Headless states that Helm should deploy the vCluster in headless mode for the isolated control plane.
headless: false
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,6 @@ func addTierToJSONSchema(base *jsonschema.Schema, t reflect.Type) {
if central.Extras == nil {
central.Extras = map[string]interface{}{}
}
central.Extras["tier"] = "pro"
central.Extras["pro"] = true
}
}

0 comments on commit f5b0b24

Please sign in to comment.