Merge branch 'master' into feature/scientific_model_update

README.md

@@ -229,7 +229,6 @@ Create the various configurations:
 ```console
 $ cd app-config/openshift
 
-$ oc process -f routes.yaml --param HOST='test-cara.web.cern.ch' | oc create -f -
 $ oc process -f configmap.yaml | oc create -f -
 $ oc process -f services.yaml | oc create -f -
 $ oc process -f imagestreams.yaml | oc create -f -
@@ -287,11 +286,10 @@ $ cd app-config/openshift
 
 $ oc process -f configmap.yaml | oc replace -f -
 $ oc process -f services.yaml | oc replace -f -
-$ oc process -f routes.yaml --param HOST='test-cara.web.cern.ch' | oc replace -f -
 $ oc process -f imagestreams.yaml | oc replace -f -
 $ oc process -f buildconfig.yaml --param GIT_BRANCH='live/test-cara' | oc replace -f -
 $ oc process -f deploymentconfig.yaml --param PROJECT_NAME='cara-test' | oc replace -f -
 ```
 
-Be aware that if you change/replace the **route** of the PROD instance,
-it will lose the annotation to be exposed outside CERN (not committed in this repo).
+Be aware that if you create/recreate the environment you must manually create a **route** in OpenShift, 
+specifying the respective annotation to be exposed outside CERN.

app-config/openshift/config-fetch.py

@@ -36,7 +36,6 @@ def fetch_config(output_directory: pathlib.Path):
     output_directory.mkdir(exist_ok=True, parents=True)
 
     for component, name in [
-            ('routes', None),
             ('configmap', 'auth-service'),
             ('services', None),
             ('imagestreams', None),

app-config/openshift/config-generate.py

@@ -28,7 +28,6 @@ def generate_config(output_directory: pathlib.Path, project_name: str, hostname:
             print(f'Running: {" ".join(cmd)}')
             subprocess.run(cmd, stdout=fh, check=True)
 
-    oc_process('routes', context={'HOST': hostname})
     oc_process('configmap')
     oc_process('services')
     oc_process('imagestreams')