diff --git a/install/generate_secrets.py b/install/generate_secrets.py index 74d210c358935a825c55d4fe8e011690d805dde3..93f5702c779a42061d9b3e15b70d33a1310adf69 100644 --- a/install/generate_secrets.py +++ b/install/generate_secrets.py @@ -1,11 +1,14 @@ """ -Generates Kubernetes secrets based on a provided app name. +Generates Kubernetes secrets based on a provided app name. If the `templates` directory contains a secret called `oas-{app}-variables`, it will check if that secret already exists in the cluster, and if not: generate it. It does the same for an `oas-{app}-basic-auth` secret that will contain a password as well as a htpasswd encoded version of it. +See https://open.greenhost.net/openappstack/openappstack/-/issues/891 for the +context why we use this script and not a helm chart to generate secrets. + usage: python generate_secrets.py template_filename.j2 """ @@ -47,7 +50,7 @@ def get_templates_dir(): def create_variables_secret(app_name, env): """Checks if a variables secret for app_name already exists, generates it if necessary""" variables_filename = \ - os.path.join(get_templates_dir(), f"oas-{app_name}-variables.yaml") + os.path.join(get_templates_dir(), f"oas-{app_name}-variables.yaml.jinja") if os.path.exists(variables_filename): # Check if k8s secret already exists, if not, generate it with open(variables_filename) as template_file: @@ -66,7 +69,7 @@ def create_variables_secret(app_name, env): def create_basic_auth_secret(app_name, env): """Checks if a basic auth secret for app_name already exists, generates it if necessary""" basic_auth_filename = \ - os.path.join(get_templates_dir(), f"oas-{app_name}-basic-auth.yaml") + os.path.join(get_templates_dir(), f"oas-{app_name}-basic-auth.yaml.jinja") if os.path.exists(basic_auth_filename): with open(basic_auth_filename) as template_file: lines = template_file.read() diff --git a/install/templates/oas-alertmanager-basic-auth.yaml b/install/templates/oas-alertmanager-basic-auth.yaml.jinja similarity index 100% rename from install/templates/oas-alertmanager-basic-auth.yaml rename to install/templates/oas-alertmanager-basic-auth.yaml.jinja diff --git a/install/templates/oas-kube-prometheus-stack-basic-auth.yaml b/install/templates/oas-kube-prometheus-stack-basic-auth.yaml.jinja similarity index 100% rename from install/templates/oas-kube-prometheus-stack-basic-auth.yaml rename to install/templates/oas-kube-prometheus-stack-basic-auth.yaml.jinja diff --git a/install/templates/oas-kube-prometheus-stack-variables.yaml b/install/templates/oas-kube-prometheus-stack-variables.yaml.jinja similarity index 100% rename from install/templates/oas-kube-prometheus-stack-variables.yaml rename to install/templates/oas-kube-prometheus-stack-variables.yaml.jinja diff --git a/install/templates/oas-nextcloud-variables.yaml b/install/templates/oas-nextcloud-variables.yaml.jinja similarity index 100% rename from install/templates/oas-nextcloud-variables.yaml rename to install/templates/oas-nextcloud-variables.yaml.jinja diff --git a/install/templates/oas-oauth-variables.yaml b/install/templates/oas-oauth-variables.yaml.jinja similarity index 100% rename from install/templates/oas-oauth-variables.yaml rename to install/templates/oas-oauth-variables.yaml.jinja diff --git a/install/templates/oas-rocketchat-variables.yaml b/install/templates/oas-rocketchat-variables.yaml.jinja similarity index 100% rename from install/templates/oas-rocketchat-variables.yaml rename to install/templates/oas-rocketchat-variables.yaml.jinja diff --git a/install/templates/oas-single-sign-on-variables.yaml b/install/templates/oas-single-sign-on-variables.yaml.jinja similarity index 100% rename from install/templates/oas-single-sign-on-variables.yaml rename to install/templates/oas-single-sign-on-variables.yaml.jinja diff --git a/install/templates/oas-wekan-variables.yaml b/install/templates/oas-wekan-variables.yaml.jinja similarity index 100% rename from install/templates/oas-wekan-variables.yaml rename to install/templates/oas-wekan-variables.yaml.jinja diff --git a/install/templates/oas-wordpress-variables.yaml b/install/templates/oas-wordpress-variables.yaml.jinja similarity index 100% rename from install/templates/oas-wordpress-variables.yaml rename to install/templates/oas-wordpress-variables.yaml.jinja