x
/
fuel-ccp
Code Issues Proposed changes

Adding CCP_POD_NAME env variable 

This variable will be consumed by entrypoint script
to provide pod_name jinja variable
Also dls version was bumped to 0.4.0

Change-Id: I8fc2f026e2f79355c5b80429e3ab7ee854c30639
This commit is contained in:
Andrey Pavlov 2016-12-22 16:41:55 +03:00
parent 5356ee1c65
commit 025b1d69af
3 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_ccp/__init__.py
View File

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

22
fuel_ccp/templates.py
View File

@ -89,14 +89,24 @@ def serialize_volume_mounts(container, for_job=None):
def serialize_env_variables(container):
env = [{
"name": "CCP_NODE_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "spec.nodeName"
env = [
{
"name": "CCP_NODE_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "spec.nodeName"
}
}
},
{
"name": "CCP_POD_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.name"
}
}
}
}]
]
if container.get('env'):
env.extend(container['env'])
return env

44
fuel_ccp/tests/test_templates.py
View File

@ -65,26 +65,36 @@ class TestDeploy(base.TestCase):
"timeoutSeconds": 1,
"initialDelaySeconds": 10
},
"env": [{
"name": "CCP_NODE_NAME",
'valueFrom': {
'fieldRef': {
'fieldPath': 'spec.nodeName'
}
}
},
"env": [
{
"name": "env_foo",
"valueFrom": {
"valueField": {
"valuePath": "metadata.name"
"name": "CCP_NODE_NAME",
'valueFrom': {
'fieldRef': {
'fieldPath': 'spec.nodeName'
}
}
}
},
},
{
"name": "CM_VERSION",
"value": 1
}],
"name": "CCP_POD_NAME",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.name"
}
}
},
{
"name": "env_foo",
"valueFrom": {
"valueField": {
"valuePath": "metadata.name"
}
}
},
{
"name": "CM_VERSION",
"value": 1
}
],
"securityContext": {
"privileged": False
}