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

csc: Add ability to update CSC defaults during upgrade/downgrade #2513

Merged
merged 7 commits into from
May 6, 2020
Merged

csc: Add ability to update CSC defaults during upgrade/downgrade #2513

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc751ab
salt: render utility should import csc defaults
Ebaneck Apr 30, 2020
020387c
kubernetes: create empty service configuration configmaps
Ebaneck Apr 30, 2020
272b69c
charts: render the prometheus-operator charts with default service co…
Ebaneck Apr 30, 2020
e21326e
charts: re-render the dex charts to use default service configurations
Ebaneck Apr 30, 2020
17e8285
salt: implement merge strategy to make `csc` update-able
Ebaneck Apr 30, 2020
a0ceca9
csc: add default csc configurations as YAML files
Ebaneck May 4, 2020
e12ce23
test: refactor csc tests to handle empty csc ConfigMaps
Ebaneck May 4, 2020
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
27 changes: 20 additions & 7 deletions charts/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#!jinja | metalk8s_kubernetes

{{%- from "metalk8s/repo/macro.sls" import build_image_name with context %}}
{csc_defaults}
{configlines}

{{% raw %}}
Expand Down Expand Up @@ -212,15 +213,27 @@ def main():
doc=doc
)
)
if args.service_configs:
import_csc_yaml = '\n'.join(
("{{% import_yaml 'metalk8s/addons/{0}/config/{1}.yaml' as "
"{1}_defaults with context %}}").format(
args.name, service_config[0]
) for service_config in args.service_configs
)

config = '\n'.join(
("{{%- set {} = salt.metalk8s_service_configuration"
".get_service_conf('{}', '{}') %}}").format(
service_config[0], args.namespace, service_config[1]
) for service_config in args.service_configs
) if args.service_configs else ''
config = '\n'.join(
("{{%- set {0} = salt.metalk8s_service_configuration"
".get_service_conf('{1}', '{2}', {0}_defaults) %}}").format(
service_config[0], args.namespace, service_config[1]
) for service_config in args.service_configs
)
else:
import_csc_yaml = ''
config = ''
Ebaneck marked this conversation as resolved.
Show resolved Hide resolved

sys.stdout.write(START_BLOCK.format(configlines=config).lstrip())
sys.stdout.write(START_BLOCK.format(
csc_defaults=import_csc_yaml, configlines=config).lstrip()
)
sys.stdout.write('\n')

stream = io.StringIO()
Expand Down