From baf617c20444a7e10a88e568188443c0c7d217d1 Mon Sep 17 00:00:00 2001 From: Jeff Kelly Date: Tue, 24 Dec 2019 11:46:18 -0800 Subject: [PATCH 1/2] ops fix for 2 docker repo routes --- .../ops-fixes/99-sample-docker-route.yaml | 37 +++++++++++++++++++ .../ops-fixes/lab-jk-docker-route.env | 3 ++ .../ops-fixes/prd-bcr-docker-route.env | 3 ++ .../prd-bcrentities-docker-route.env | 3 ++ .../artifactory-ha/ops-fixes/readme.md | 16 ++++++++ 5 files changed, 62 insertions(+) create mode 100644 apps/artifactory/artifactory-ha/ops-fixes/99-sample-docker-route.yaml create mode 100644 apps/artifactory/artifactory-ha/ops-fixes/lab-jk-docker-route.env create mode 100644 apps/artifactory/artifactory-ha/ops-fixes/prd-bcr-docker-route.env create mode 100644 apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env create mode 100644 apps/artifactory/artifactory-ha/ops-fixes/readme.md diff --git a/apps/artifactory/artifactory-ha/ops-fixes/99-sample-docker-route.yaml b/apps/artifactory/artifactory-ha/ops-fixes/99-sample-docker-route.yaml new file mode 100644 index 000000000..d710ed798 --- /dev/null +++ b/apps/artifactory/artifactory-ha/ops-fixes/99-sample-docker-route.yaml @@ -0,0 +1,37 @@ +apiVersion: v1 +kind: Template +metadata: + name: ${ARTIFACTORY_NAME}-route-template + annotations: + description: "Template for artifactory docker routes" +objects: +- apiVersion: route.openshift.io/v1 + kind: Route + metadata: + labels: + app: ${ARTIFACTORY_NAME} + name: "${DOCKER_REPO}" + spec: + host: "${DOCKER_REPO}.${ARTIFACTORY_DNS_NAME}" + port: + targetPort: http + tls: + insecureEdgeTerminationPolicy: Redirect + termination: edge + to: + kind: Service + name: ${ARTIFACTORY_NAME} + weight: 100 + wildcardPolicy: None +parameters: +- description: Artifactory name + name: ARTIFACTORY_NAME + value: "artifactory" + required: true +- description: Artifactory DNS Suffix + name: ARTIFACTORY_DNS_NAME + value: "artifacts.developer.gov.bc.ca" + required: true +- description: Docker repository name + name: DOCKER_REPO + require: true diff --git a/apps/artifactory/artifactory-ha/ops-fixes/lab-jk-docker-route.env b/apps/artifactory/artifactory-ha/ops-fixes/lab-jk-docker-route.env new file mode 100644 index 000000000..21ce47868 --- /dev/null +++ b/apps/artifactory/artifactory-ha/ops-fixes/lab-jk-docker-route.env @@ -0,0 +1,3 @@ +ARTIFACTORY_NAME=artifactory +ARTIFACTORY_DNS_NAME=artifacts.lab.pathfinder.gov.bc.ca +DOCKER_REPO=jk-docker-local diff --git a/apps/artifactory/artifactory-ha/ops-fixes/prd-bcr-docker-route.env b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcr-docker-route.env new file mode 100644 index 000000000..a2840b696 --- /dev/null +++ b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcr-docker-route.env @@ -0,0 +1,3 @@ +ARTIFACTORY_NAME=artifactory +ARTIFACTORY_DNS_NAME=artifacts.developer.gov.bc.ca +DOCKER_REPO=bcr-docker-local diff --git a/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env new file mode 100644 index 000000000..8dafab13f --- /dev/null +++ b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env @@ -0,0 +1,3 @@ +ARTIFACTORY_NAME=artifactory +ARTIFACTORY_DNS_NAME=artifacts.developer.gov.bc.ca +DOCKER_REPO=prd-bcrentities-docker-local diff --git a/apps/artifactory/artifactory-ha/ops-fixes/readme.md b/apps/artifactory/artifactory-ha/ops-fixes/readme.md new file mode 100644 index 000000000..7c71db98c --- /dev/null +++ b/apps/artifactory/artifactory-ha/ops-fixes/readme.md @@ -0,0 +1,16 @@ +# Ops Fixes + +## Docker route issue + +Operator has a bug that is stopping it from creating the required docker repo routes. + +99-sample-docker-route.yaml - a template to manually create a docker route +*.env - parameter files for the manually created routes, can track our manual fixes to replace later with automation generated routes. + +Sample route fix: + +``` bash +login to cluster +oc project devops-artifactory +oc process -f 99-sample-docker-route.yaml --param-file=prd-bcrentities-docker-route.env | oc apply -f - +``` From c8b777be4b0a7b3304a39ceea0528a2ccba2fe1a Mon Sep 17 00:00:00 2001 From: Jeff Kelly Date: Tue, 24 Dec 2019 11:57:11 -0800 Subject: [PATCH 2/2] fix docker route name --- .../artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env index 8dafab13f..1c18450ad 100644 --- a/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env +++ b/apps/artifactory/artifactory-ha/ops-fixes/prd-bcrentities-docker-route.env @@ -1,3 +1,3 @@ ARTIFACTORY_NAME=artifactory ARTIFACTORY_DNS_NAME=artifacts.developer.gov.bc.ca -DOCKER_REPO=prd-bcrentities-docker-local +DOCKER_REPO=bcrentities-docker-local