From 7b0462ada7ad75bef5660135d4029fb362a2f03e Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Thu, 15 Feb 2024 14:41:40 -0500 Subject: [PATCH] #456 - Renames qa to test and updates some other variables as part of ROSA migration (#457) * Fixes #456 - Renames qa to test anad updates some other variables as part of ROSA * Some more updates switching over qa to test. QA domain name is still there as test hasn't been created yet * Have to leave these hostnames as qa for now until we get the test hostname and switch over. * Updated version for autoscaler Updated deployment location --- scripts/push-dev.sh | 6 +++--- scripts/push-prod.sh | 6 +++--- scripts/push-qa.sh | 8 -------- scripts/push-test.sh | 8 ++++++++ service/README.md | 4 ++++ service/base/web-autoscaler.yaml | 2 +- service/overlays/{qa => test}/build.yaml | 2 +- service/overlays/{qa => test}/deployment.yaml | 9 ++++----- service/overlays/{qa => test}/hostname.yaml | 0 service/overlays/{qa => test}/kustomization.yaml | 4 ++-- service/overlays/{qa => test}/tls.yaml | 0 service/overlays/{qa => test}/web-autoscaler.yaml | 2 +- 12 files changed, 27 insertions(+), 24 deletions(-) delete mode 100755 scripts/push-qa.sh create mode 100755 scripts/push-test.sh rename service/overlays/{qa => test}/build.yaml (84%) rename service/overlays/{qa => test}/deployment.yaml (61%) rename service/overlays/{qa => test}/hostname.yaml (100%) rename service/overlays/{qa => test}/kustomization.yaml (96%) rename service/overlays/{qa => test}/tls.yaml (100%) rename service/overlays/{qa => test}/web-autoscaler.yaml (61%) diff --git a/scripts/push-dev.sh b/scripts/push-dev.sh index e092b11c..65c384ff 100755 --- a/scripts/push-dev.sh +++ b/scripts/push-dev.sh @@ -3,6 +3,6 @@ set -e # Login with `oc login ...` before running. oc project officehours-dev -docker login -u `oc whoami` -p `oc whoami -t` docker-registry.webplatformsunpublished.umich.edu -docker build --platform linux/amd64 -t docker-registry.webplatformsunpublished.umich.edu/officehours-dev/officehours . -docker push docker-registry.webplatformsunpublished.umich.edu/officehours-dev/officehours +docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu +docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours-dev/officehours . +docker push registry.aws.web.umich.edu/officehours-dev/officehours diff --git a/scripts/push-prod.sh b/scripts/push-prod.sh index 338f5ef2..d9b5902e 100755 --- a/scripts/push-prod.sh +++ b/scripts/push-prod.sh @@ -3,6 +3,6 @@ set -e # Login with `oc login ...` before running. oc project officehours -docker login -u `oc whoami` -p `oc whoami -t` docker-registry.webplatformsunpublished.umich.edu -docker build --platform linux/amd64 -t docker-registry.webplatformsunpublished.umich.edu/officehours/officehours . -docker push docker-registry.webplatformsunpublished.umich.edu/officehours/officehours +docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu +docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours/officehours . +docker push registry.aws.web.umich.edu/officehours/officehours diff --git a/scripts/push-qa.sh b/scripts/push-qa.sh deleted file mode 100755 index 3c687fb4..00000000 --- a/scripts/push-qa.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -# Login with `oc login ...` before running. -oc project officehours-qa -docker login -u `oc whoami` -p `oc whoami -t` docker-registry.webplatformsunpublished.umich.edu -docker build --platform linux/amd64 -t docker-registry.webplatformsunpublished.umich.edu/officehours-qa/officehours . -docker push docker-registry.webplatformsunpublished.umich.edu/officehours-qa/officehours diff --git a/scripts/push-test.sh b/scripts/push-test.sh new file mode 100755 index 00000000..fe789e63 --- /dev/null +++ b/scripts/push-test.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e + +# Login with `oc login ...` before running. +oc project officehours-test +docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu +docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours-test/officehours . +docker push registry.aws.web.umich.edu/officehours-test/officehours diff --git a/service/README.md b/service/README.md index 7e6f6175..c4cd444d 100644 --- a/service/README.md +++ b/service/README.md @@ -3,6 +3,10 @@ Resource configuration and secret consumption for OpenShift projects are managed using [`kustomize`](https://kubectl.docs.kubernetes.io/guides/introduction/kustomize/). +## Important note + +`officehours-qa` was renamed to `officehours-test` during the migration process to ROSA. Not everything has been renamed yet, including the domain names and some of the directory names here. Just know that these instances are currently identical. + ## Setup 1. Populate `service/secrets/*`. diff --git a/service/base/web-autoscaler.yaml b/service/base/web-autoscaler.yaml index 307add78..4d9b82b8 100644 --- a/service/base/web-autoscaler.yaml +++ b/service/base/web-autoscaler.yaml @@ -4,7 +4,7 @@ metadata: name: web spec: scaleTargetRef: - apiVersion: v1 + apiVersion: apps.openshift.io/v1 kind: DeploymentConfig name: officehours-web-dev minReplicas: 1 diff --git a/service/overlays/qa/build.yaml b/service/overlays/test/build.yaml similarity index 84% rename from service/overlays/qa/build.yaml rename to service/overlays/test/build.yaml index 80fefac2..3024416e 100644 --- a/service/overlays/qa/build.yaml +++ b/service/overlays/test/build.yaml @@ -1,6 +1,6 @@ - op: replace path: /spec/output/to/name - value: image-registry.openshift-image-registry.svc:5000/officehours-qa/officehours:latest + value: image-registry.openshift-image-registry.svc:5000/officehours-test/officehours:latest - op: replace path: /spec/source/git/ref value: master diff --git a/service/overlays/qa/deployment.yaml b/service/overlays/test/deployment.yaml similarity index 61% rename from service/overlays/qa/deployment.yaml rename to service/overlays/test/deployment.yaml index c3f0a66b..58fd2494 100644 --- a/service/overlays/qa/deployment.yaml +++ b/service/overlays/test/deployment.yaml @@ -1,13 +1,12 @@ - op: replace path: /spec/template/spec/containers/0/image - value: docker-registry.default.svc:5000/officehours-qa/officehours:latest + value: image-registry.openshift-image-registry.svc:5000/officehours-test/officehours:latest - op: replace path: /spec/selector/variant - value: qa + value: test - op: replace path: /spec/template/metadata/labels/variant - value: qa + value: test - op: replace path: /spec/triggers/0/imageChangeParams/from/namespace - value: officehours-qa - + value: officehours-test diff --git a/service/overlays/qa/hostname.yaml b/service/overlays/test/hostname.yaml similarity index 100% rename from service/overlays/qa/hostname.yaml rename to service/overlays/test/hostname.yaml diff --git a/service/overlays/qa/kustomization.yaml b/service/overlays/test/kustomization.yaml similarity index 96% rename from service/overlays/qa/kustomization.yaml rename to service/overlays/test/kustomization.yaml index 69a8a1ff..209185ec 100644 --- a/service/overlays/qa/kustomization.yaml +++ b/service/overlays/test/kustomization.yaml @@ -4,8 +4,8 @@ labels: - includeSelectors: true pairs: org: umich - variant: qa -nameSuffix: -qa + variant: test +nameSuffix: -test resources: - ../../base patches: diff --git a/service/overlays/qa/tls.yaml b/service/overlays/test/tls.yaml similarity index 100% rename from service/overlays/qa/tls.yaml rename to service/overlays/test/tls.yaml diff --git a/service/overlays/qa/web-autoscaler.yaml b/service/overlays/test/web-autoscaler.yaml similarity index 61% rename from service/overlays/qa/web-autoscaler.yaml rename to service/overlays/test/web-autoscaler.yaml index 5589a228..f05d9ec1 100644 --- a/service/overlays/qa/web-autoscaler.yaml +++ b/service/overlays/test/web-autoscaler.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/scaleTargetRef/name - value: officehours-web-qa + value: officehours-web-test