Adding scheme field for probes
Change-Id: I4dbcac825f319c6c202018f59a45de9ecbb377cc
This commit is contained in:
parent
706e7fcb20
commit
18414f5f35
|
@ -17,4 +17,4 @@ import pbr.version
|
||||||
|
|
||||||
version_info = pbr.version.VersionInfo("fuel_ccp")
|
version_info = pbr.version.VersionInfo("fuel_ccp")
|
||||||
__version__ = version_info.version_string()
|
__version__ = version_info.version_string()
|
||||||
dsl_version = "0.6.0"
|
dsl_version = "0.7.0"
|
||||||
|
|
|
@ -133,7 +133,8 @@ def serialize_liveness_probe(liveness):
|
||||||
cont_spec["livenessProbe"] = {
|
cont_spec["livenessProbe"] = {
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
"path": liveness["path"],
|
"path": liveness["path"],
|
||||||
"port": liveness["port"]
|
"port": liveness["port"],
|
||||||
|
"scheme": liveness.get("scheme", "http").upper()
|
||||||
},
|
},
|
||||||
"timeoutSeconds": liveness.get("timeout", 1),
|
"timeoutSeconds": liveness.get("timeout", 1),
|
||||||
"initialDelaySeconds": liveness.get("initialDelay", 10)
|
"initialDelaySeconds": liveness.get("initialDelay", 10)
|
||||||
|
|
|
@ -132,7 +132,8 @@ class TestDeploy(base.TestCase):
|
||||||
"livenessProbe": {
|
"livenessProbe": {
|
||||||
"httpGet": {
|
"httpGet": {
|
||||||
"path": "_status",
|
"path": "_status",
|
||||||
"port": 8080
|
"port": 8080,
|
||||||
|
"scheme": "HTTP"
|
||||||
},
|
},
|
||||||
"timeoutSeconds": 1,
|
"timeoutSeconds": 1,
|
||||||
"initialDelaySeconds": 7
|
"initialDelaySeconds": 7
|
||||||
|
|
|
@ -153,7 +153,8 @@ PROBE_SCHEMA_HTTP = {
|
||||||
"port": PORT_SCHEMA,
|
"port": PORT_SCHEMA,
|
||||||
"path": NOT_EMPTY_STRING_SCHEMA,
|
"path": NOT_EMPTY_STRING_SCHEMA,
|
||||||
"initialDelay": TIMEOUT_SCHEMA,
|
"initialDelay": TIMEOUT_SCHEMA,
|
||||||
"timeout": TIMEOUT_SCHEMA
|
"timeout": TIMEOUT_SCHEMA,
|
||||||
|
"scheme": {"enum": ["http", "https"]},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue