Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

proposal for multiple configmaps #112 #113

Closed
wants to merge 21 commits into from
Closed

proposal for multiple configmaps #112 #113

Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
32b0dcb
proposal for multiple configmaps #112
Aug 28, 2020
c933e1c
fix newlines
Aug 28, 2020
6b410fb
Add docs and add integration tests
Aug 28, 2020
c3ccfaa
Remove unused file
Aug 28, 2020
fa81466
Update docs/v3_spec.md
skogie Sep 1, 2020
348cf0b
add configMap volumes for user-defined configMaps
Sep 3, 2020
69b1b9a
put user-defined configMaps first and comment function
Sep 3, 2020
384d6fd
Merge branch 'proposal-multiple-config-maps' of github.com:skogie/fia…
Sep 3, 2020
205c01f
add new configMaps when making volume mounts
Sep 3, 2020
8fc2c98
more efficient appending of configmaps
Sep 7, 2020
55c390e
Update documentation and fix tests
Nov 16, 2020
29ef2f6
fix codestyle
Nov 17, 2020
cf61a1c
fix some integration tests
Nov 17, 2020
7ec5ed4
remove -
Nov 25, 2020
dd94a02
update copyright
skogie Nov 26, 2020
5aec742
update copyright
skogie Nov 26, 2020
e591c6c
update copyright
skogie Nov 26, 2020
171d068
update copyright
skogie Nov 26, 2020
8d2ddf8
update copyright
skogie Nov 26, 2020
cbe3fdc
Merge branch 'master' of github.com:fiaas/fiaas-deploy-daemon into pr…
Mar 1, 2021
f0b6b1e
Merge branch 'master' of github.com:fiaas/fiaas-deploy-daemon into pr…
Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions fiaas_deploy_daemon/deployer/kubernetes/deployment/deployer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ def delete(self, app_spec):

def _make_volumes(self, app_spec):
volumes = []
if app_spec.config_maps:
for config_map in app_spec.config_maps:
volumes.insert(0, Volume(name="{}-config".format(config_map),
configMap=ConfigMapVolumeSource(name=config_map, optional=True)))
volumes.append(Volume(name="{}-config".format(app_spec.name),
configMap=ConfigMapVolumeSource(name=app_spec.name, optional=True)))
if self._use_in_memory_emptydirs:
Expand Down Expand Up @@ -246,13 +250,17 @@ def _build_fiaas_env(config):


def _add_config_maps(app_spec):
"""
adds the configMaps to envFrom. Inserts user-defined configMaps first so the default configMap takes precedence in
case of key-collisions
"""
config_maps = [EnvFromSource(configMapRef=ConfigMapEnvSource(name=app_spec.name, optional=True))]
skogie marked this conversation as resolved.
Show resolved Hide resolved
if app_spec.config_maps:
for config_map in app_spec.config_maps:
config_maps.append(EnvFromSource(configMapRef=ConfigMapEnvSource(name=config_map, optional=True)))
return config_maps
config_maps.insert(0, EnvFromSource(configMapRef=ConfigMapEnvSource(name=config_map, optional=True)))
skogie marked this conversation as resolved.
Show resolved Hide resolved
return config_maps


def _build_global_env(global_env):
"""
global_env key/value are added as is and with the key prefix FIAAS_
Expand Down