From d9fed067634bbe9c513af585ec966fc216470bdb Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 24 Jun 2021 19:57:39 +0200
Subject: [PATCH] export app passwords
---
openappstack/__main__.py | 37 +++++++++++++++++++++++++++++++------
openappstack/cluster.py | 20 ++++++++++----------
2 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/openappstack/__main__.py b/openappstack/__main__.py
index 54170f7b8..4d00e2304 100755
--- a/openappstack/__main__.py
+++ b/openappstack/__main__.py
@@ -402,23 +402,48 @@ def test(clus, args):
command = ['taiko']
if args.observe:
command.append('--observe')
- command.append('taiko-tests.js')
+ command.append('apps.js')
# Set env vars
- username = clus.get_password_from_kubernetes(
+ sso_username = clus.get_password_from_kubernetes(
'oas-single-sign-on-variables',
'userbackend_admin_username',
'flux-system'
)
- password = clus.get_password_from_kubernetes(
+ sso_password = clus.get_password_from_kubernetes(
'oas-single-sign-on-variables',
'userbackend_admin_password',
'flux-system'
)
- os.environ['DOMAIN'] = clus.domain
- os.environ["SSO_USERNAME"] = username
- os.environ["SSO_USER_PW"] = password
+ nextcloud_password = clus.get_password_from_kubernetes(
+ 'oas-nextcloud-variables',
+ 'nextcloud_password',
+ 'flux-system'
+ )
+ rocketchat_password = clus.get_password_from_kubernetes(
+ 'oas-rocketchat-variables',
+ 'rocketchat_admin_password',
+ 'flux-system'
+ )
+ wordpress_password = clus.get_password_from_kubernetes(
+ 'oas-wordpress-variables',
+ 'wordpress_admin_password',
+ 'flux-system'
+ )
+ grafana_password = clus.get_password_from_kubernetes(
+ 'oas-kube-prometheus-stack-variables',
+ 'grafana_admin_password',
+ 'flux-system'
+ )
+
os.environ["TAIKO_TESTS"] = args.apps
+ os.environ['DOMAIN'] = clus.domain
+ os.environ["SSO_USERNAME"] = sso_username
+ os.environ["SSO_PASSWORD"] = sso_password
+ os.environ["NEXTCLOUD_PASSWORD"] = nextcloud_password
+ os.environ["ROCKETCHAT_PASSWORD"] = rocketchat_password
+ os.environ["WORDPRESS_PASSWORD"] = wordpress_password
+ os.environ["GRAFANA_PASSWORD"] = grafana_password
log.info('Running taiko command %s', command)
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index fc4d474ee..1005f985b 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -273,18 +273,18 @@ KUBECONFIG={secret_dir}/kube_config_cluster.yml
'onlyoffice_postgresql_password',
'onlyoffice_rabbitmq_password'],
'oas-rocketchat-variables': [
- 'rocketchat_admin_password',
- 'mongodb_root_password',
- 'mongodb_password' ],
+ 'rocketchat_admin_password',
+ 'mongodb_root_password',
+ 'mongodb_password' ],
'oas-single-sign-on-variables': [
- 'userbackend_admin_username',
- 'userbackend_admin_password',
- 'userbackend_postgres_password',
- 'hydra_system_secret' ],
+ 'userbackend_admin_username',
+ 'userbackend_admin_password',
+ 'userbackend_postgres_password',
+ 'hydra_system_secret' ],
'oas-wordpress-variables': [
- 'wordpress_admin_password',
- 'wordpress_mariadb_password',
- 'wordpress_mariadb_root_password' ]
+ 'wordpress_admin_password',
+ 'wordpress_mariadb_password',
+ 'wordpress_mariadb_root_password' ]
}
}
--
GitLab