From 599b3ff986dc9e4028d4d9a77fdcc2dec373e72b Mon Sep 17 00:00:00 2001 From: Maarten de Waard <maarten@greenhost.nl> Date: Fri, 30 Jul 2021 14:27:32 +0000 Subject: [PATCH] Apply 4 suggestion(s) to 2 file(s) --- .gitlab/issue_templates/new_app.md | 6 +++--- openappstack/cluster.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/issue_templates/new_app.md b/.gitlab/issue_templates/new_app.md index 8676d2713..c077e9400 100644 --- a/.gitlab/issue_templates/new_app.md +++ b/.gitlab/issue_templates/new_app.md @@ -6,10 +6,10 @@ * [ ] Create new source if needed in `flux2/infrastructure/sources/APP.yaml` * [ ] Include `APP.yaml` in `flux2/infrastructure/sources/kustomization.yaml` * [ ] Add app secret: `charts/oas-secrets/templates/oas-APP-variables.yaml` -* Add kustomisations: - * [ ] `flux2/cluster/optional/wekan/APP.yaml` +* Add kustomizations: + * [ ] `flux2/cluster/optional/APP/APP.yaml` * [ ] `flux2/apps/APP/kustomization.yaml` - * [ ] Add pvc in `flux2/apps/APP/pvc.yaml` + * [ ] If needed, add PVCs in `flux2/apps/APP/pvc.yaml` * [ ] Add helmrelease in `flux2/apps/APP/release.yaml` ### Single sign-on diff --git a/openappstack/cluster.py b/openappstack/cluster.py index f0eb71572..0f39a5d35 100644 --- a/openappstack/cluster.py +++ b/openappstack/cluster.py @@ -227,8 +227,8 @@ KUBECONFIG={cluster_dir}/kube_config_cluster.yml } } - for namespace in all_secrets: - for app, app_secrets in all_secrets[namespace].items(): + for namespace, sec in all_secrets.items(): + for app, app_secrets in sec.items(): for app_secret in app_secrets: secret = self.get_password_from_kubernetes( app, -- GitLab