Update ClowdEnv with new features (#55)

* Update ClowdEnv with new features - Deploy prometheus - Deploy unleash - Use strimzi - Delete db image (I believe this is deprecated) * Fix 'namespace prepare' for debugging, increase reconcile timeout * Disable tls on strimzi until apps are ready Co-authored-by: Brandon Squizzato <[email protected]>
RedHatInsights · Jun 3, 2021 · 668898f · 668898f
1 parent 93453b9
commit 668898f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/bonfire/bonfire.py b/bonfire/bonfire.py
@@ -10,7 +10,7 @@
 from wait_for import TimedOutError
 
 import bonfire.config as conf
-from bonfire.qontract import get_apps_for_env, sub_refs
+from bonfire.qontract import get_apps_for_env, sub_refs, get_secret_names_in_namespace
 from bonfire.openshift import (
     apply_config,
     get_all_namespaces,
@@ -142,7 +142,8 @@ def _wait_on_namespace_resources(namespace, timeout, db_only=False):
 
 
 def _prepare_namespace(namespace):
-    add_base_resources(namespace)
+    base_secret_names = get_secret_names_in_namespace(conf.BASE_NAMESPACE_NAME)
+    add_base_resources(namespace, base_secret_names)
 
 
 _ns_reserve_options = [

diff --git a/bonfire/config.py b/bonfire/config.py
@@ -50,7 +50,7 @@ def _get_config_path():
 BASE_NAMESPACE_NAME = os.getenv("BASE_NAMESPACE_NAME", "ephemeral-base")
 RESERVABLE_NAMESPACE_REGEX = re.compile(os.getenv("RESERVABLE_NAMESPACE_REGEX", r"ephemeral-\d+"))
 EPHEMERAL_ENV_NAME = os.getenv("EPHEMERAL_ENV_NAME", "insights-ephemeral")
-RECONCILE_TIMEOUT = os.getenv("RECONCILE_TIMEOUT", 180)
+RECONCILE_TIMEOUT = os.getenv("RECONCILE_TIMEOUT", 300)
 ENV_NAME_FORMAT = os.getenv("ENV_NAME_FORMAT", "env-{namespace}")
 
 

diff --git a/bonfire/resources/ephemeral-clowdenvironment.yaml b/bonfire/resources/ephemeral-clowdenvironment.yaml
@@ -22,17 +22,18 @@ objects:
         port: 8000
         mode: operator
       featureFlags:
-        mode: none
+        mode: local
       metrics:
         port: 9000
-        mode: operator
         path: "/metrics"
+        prometheus:
+          deploy: true
+        mode: operator
       kafka:
-        namespace: default
-        clusterName: my-cluster
-        mode: local
+        mode: operator
+        # disable tls/auth for now until core apps are ready
+        enableLegacyStrimzi: true
       db:
-        image: "registry.redhat.io/rhel8/postgresql-12:1-36"
         mode: local
       logging:
         mode: none