From a73f8ec5de7979ab7bac0a00e46dbf44828f7a14 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 13 Jan 2022 16:36:01 +0100 Subject: [PATCH 1/2] Changed routes.yaml file name and respective reference in README --- README.md | 5 ++--- app-config/openshift/{routes.yaml => routes.example.yaml} | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename app-config/openshift/{routes.yaml => routes.example.yaml} (100%) diff --git a/README.md b/README.md index aa67fda1..a990202d 100644 --- a/README.md +++ b/README.md @@ -287,11 +287,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. \ No newline at end of file diff --git a/app-config/openshift/routes.yaml b/app-config/openshift/routes.example.yaml similarity index 100% rename from app-config/openshift/routes.yaml rename to app-config/openshift/routes.example.yaml From 008efd3467a30fe384a15528959ff6c32a37d83e Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 13 Jan 2022 17:38:02 +0100 Subject: [PATCH 2/2] Updated config-fetch and config-generate for routes.yaml --- README.md | 1 - app-config/openshift/config-fetch.py | 1 - app-config/openshift/config-generate.py | 1 - 3 files changed, 3 deletions(-) diff --git a/README.md b/README.md index a990202d..832d39f2 100644 --- a/README.md +++ b/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 - diff --git a/app-config/openshift/config-fetch.py b/app-config/openshift/config-fetch.py index 973d0c11..c596c31c 100644 --- a/app-config/openshift/config-fetch.py +++ b/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), diff --git a/app-config/openshift/config-generate.py b/app-config/openshift/config-generate.py index aedb2267..3a33db5b 100644 --- a/app-config/openshift/config-generate.py +++ b/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')