Adding scheme field for probes

Change-Id: I4dbcac825f319c6c202018f59a45de9ecbb377cc
This commit is contained in:
Andrey Pavlov 2017-02-15 20:45:39 +04:00 committed by Sergey Reshetnyak
parent 706e7fcb20
commit 18414f5f35
4 changed files with 7 additions and 4 deletions

View File

@ -17,4 +17,4 @@ import pbr.version
version_info = pbr.version.VersionInfo("fuel_ccp")
__version__ = version_info.version_string()
dsl_version = "0.6.0"
dsl_version = "0.7.0"

View File

@ -133,7 +133,8 @@ def serialize_liveness_probe(liveness):
cont_spec["livenessProbe"] = {
"httpGet": {
"path": liveness["path"],
"port": liveness["port"]
"port": liveness["port"],
"scheme": liveness.get("scheme", "http").upper()
},
"timeoutSeconds": liveness.get("timeout", 1),
"initialDelaySeconds": liveness.get("initialDelay", 10)

View File

@ -132,7 +132,8 @@ class TestDeploy(base.TestCase):
"livenessProbe": {
"httpGet": {
"path": "_status",
"port": 8080
"port": 8080,
"scheme": "HTTP"
},
"timeoutSeconds": 1,
"initialDelaySeconds": 7

View File

@ -153,7 +153,8 @@ PROBE_SCHEMA_HTTP = {
"port": PORT_SCHEMA,
"path": NOT_EMPTY_STRING_SCHEMA,
"initialDelay": TIMEOUT_SCHEMA,
"timeout": TIMEOUT_SCHEMA
"timeout": TIMEOUT_SCHEMA,
"scheme": {"enum": ["http", "https"]},
}
}