This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 85483d6 Enhance Chart schema with better checking of optional values
(#699)
85483d6 is described below
commit 85483d62bc76aef07de42f83be73c2a4449e13de
Author: David Grove <[email protected]>
AuthorDate: Fri Nov 5 10:03:11 2021 -0400
Enhance Chart schema with better checking of optional values (#699)
Fixes #669.
Enhance JSON schema for values.yaml to not require values for aspects
of the chart that are disabled. For example, if zookeeper, kafka, or
couch are configured to be external then the chart shouldn't require
the corresponding imageName, imageTag, etc. values to be defined.
---
helm/openwhisk/values.schema.json | 111 +++++++++++++++++++++++---------------
1 file changed, 68 insertions(+), 43 deletions(-)
diff --git a/helm/openwhisk/values.schema.json
b/helm/openwhisk/values.schema.json
index 4f1d2ff..9820768 100644
--- a/helm/openwhisk/values.schema.json
+++ b/helm/openwhisk/values.schema.json
@@ -281,50 +281,69 @@
},
"zookeeper": {
- "allOf": [
- { "$ref": "#/definitions/podspec" },
- { "$comment": "Zookeeper's quorum protocol is designed to have an odd
number of replicas",
- "properties": { "replicaCount": { "not": { "multipleOf": 2 } } }
- },
- { "properties": {
- "port": { "type": "integer", "minimum": 0 },
- "serverPort": { "type": "integer", "minimum": 0 },
- "leaderElectionPort": { "type": "integer", "minimum": 0 },
- "config": {
- "type": "object",
- "properties": {
- "tickTime": { "type": "integer" },
- "initLimit": { "type": "integer" },
- "syncLimit": { "type": "integer" },
- "dataDir": { "type": "string" },
- "dataLogDir": { "type": "string" }
- },
- "required": ["tickTime", "initLimit", "syncLimit", "dataDir",
"dataLogDir"],
- "additionalProperties": false
- }
+ "type": "object",
+ "properties": { "external": { "type": "boolean" } },
+ "required": ["external"],
+ "if": { "properties": { "external": { "const": false } } },
+ "then": {
+ "allOf": [
+ { "$ref": "#/definitions/podspec" },
+ { "$comment": "Zookeeper's quorum protocol is designed to have an
odd number of replicas",
+ "properties": { "replicaCount": { "not": { "multipleOf": 2 } } }
},
- "required": ["port", "serverPort", "leaderElectionPort", "config"]
- }
- ]
+ { "properties": {
+ "port": { "type": "integer", "minimum": 0 },
+ "serverPort": { "type": "integer", "minimum": 0 },
+ "leaderElectionPort": { "type": "integer", "minimum": 0 },
+ "config": {
+ "type": "object",
+ "properties": {
+ "tickTime": { "type": "integer" },
+ "initLimit": { "type": "integer" },
+ "syncLimit": { "type": "integer" },
+ "dataDir": { "type": "string" },
+ "dataLogDir": { "type": "string" }
+ },
+ "required": ["tickTime", "initLimit", "syncLimit", "dataDir",
"dataLogDir"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["port", "serverPort", "leaderElectionPort", "config"]
+ }
+ ]
+ }
},
"kafka": {
- "allOf": [
- { "$ref": "#/definitions/podspec" },
- { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] }
- ]
+ "type": "object",
+ "properties": { "external": { "type": "boolean" } },
+ "required": ["external"],
+ "if": { "properties": { "external": { "const": false } } },
+ "then": {
+ "allOf": [
+ { "$ref": "#/definitions/podspec" },
+ { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] }
+ ]
+ },
+ "else": { "properties": { "connect_string": { "type": "string" } },
"required": ["connect_string"] }
},
"db": {
- "allOf": [
- { "$ref": "#/definitions/podspec" },
- { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] },
- { "$comment": "wipeAndInit implies replicaCount is 1 because initdb.sh
enables single node mode",
- "if": { "properties": { "wipeAndInit": { "const": true } } },
- "then": { "properties": { "replicaCount": { "const": 1 } } }
- },
- { "$ref": "#/definitions/optionalExternalHostCheck" }
- ]
+ "type": "object",
+ "properties": { "external": { "type": "boolean" } },
+ "required": ["external"],
+ "if": { "properties": { "external": { "const": false } } },
+ "then": {
+ "allOf": [
+ { "$ref": "#/definitions/podspec" },
+ { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] },
+ { "$comment": "wipeAndInit implies replicaCount is 1 because
initdb.sh enables single node mode",
+ "if": { "properties": { "wipeAndInit": { "const": true } } },
+ "then": { "properties": { "replicaCount": { "const": 1 } } }
+ },
+ { "$ref": "#/definitions/optionalExternalHostCheck" }
+ ]
+ }
},
"nginx": {
@@ -365,12 +384,18 @@
},
"redis": {
- "allOf": [
- { "$ref": "#/definitions/podspec" },
- { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] },
- { "properties": { "replicaCount": { "const": 1 } } },
- { "$ref": "#/definitions/optionalExternalHostCheck" }
- ]
+ "type": "object",
+ "properties": { "external": { "type": "boolean" } },
+ "required": ["external"],
+ "if": { "properties": { "external": { "const": false } } },
+ "then": {
+ "allOf": [
+ { "$ref": "#/definitions/podspec" },
+ { "properties": { "port": { "type": "integer", "minimum": 0 } },
"required": ["port"] },
+ { "properties": { "replicaCount": { "const": 1 } } },
+ { "$ref": "#/definitions/optionalExternalHostCheck" }
+ ]
+ }
},
"user_events": {
