Skip to content

Commit 7b0462a

Browse files
jonespmjonespm
authored
#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
1 parent 582957e commit 7b0462a

File tree

12 files changed

+27
-24
lines changed

12 files changed

+27
-24
lines changed

‎scripts/push-dev.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ set -e
33

44
# Login with `oc login ...` before running.
55
oc project officehours-dev
6-
docker login -u `oc whoami` -p `oc whoami -t` docker-registry.webplatformsunpublished.umich.edu
7-
docker build --platform linux/amd64 -t docker-registry.webplatformsunpublished.umich.edu/officehours-dev/officehours .
8-
docker push docker-registry.webplatformsunpublished.umich.edu/officehours-dev/officehours
6+
docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu
7+
docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours-dev/officehours .
8+
docker push registry.aws.web.umich.edu/officehours-dev/officehours

‎scripts/push-prod.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ set -e
33

44
# Login with `oc login ...` before running.
55
oc project officehours
6-
docker login -u `oc whoami` -p `oc whoami -t` docker-registry.webplatformsunpublished.umich.edu
7-
docker build --platform linux/amd64 -t docker-registry.webplatformsunpublished.umich.edu/officehours/officehours .
8-
docker push docker-registry.webplatformsunpublished.umich.edu/officehours/officehours
6+
docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu
7+
docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours/officehours .
8+
docker push registry.aws.web.umich.edu/officehours/officehours

‎scripts/push-qa.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎scripts/push-test.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Login with `oc login ...` before running.
5+
oc project officehours-test
6+
docker login -u `oc whoami` -p `oc whoami -t` registry.aws.web.umich.edu
7+
docker build --platform linux/amd64 -t registry.aws.web.umich.edu/officehours-test/officehours .
8+
docker push registry.aws.web.umich.edu/officehours-test/officehours

‎service/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Resource configuration and secret consumption for OpenShift projects are managed
44
using [`kustomize`](https://kubectl.docs.kubernetes.io/guides/introduction/kustomize/).
55

6+
## Important note
7+
8+
`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.
9+
610
## Setup
711

812
1. Populate `service/secrets/*`.

‎service/base/web-autoscaler.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: web
55
spec:
66
scaleTargetRef:
7-
apiVersion: v1
7+
apiVersion: apps.openshift.io/v1
88
kind: DeploymentConfig
99
name: officehours-web-dev
1010
minReplicas: 1

service/overlays/qa/build.yaml renamed to service/overlays/test/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- op: replace
22
path: /spec/output/to/name
3-
value: image-registry.openshift-image-registry.svc:5000/officehours-qa/officehours:latest
3+
value: image-registry.openshift-image-registry.svc:5000/officehours-test/officehours:latest
44
- op: replace
55
path: /spec/source/git/ref
66
value: master

service/overlays/qa/deployment.yaml renamed to service/overlays/test/deployment.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
- op: replace
22
path: /spec/template/spec/containers/0/image
3-
value: docker-registry.default.svc:5000/officehours-qa/officehours:latest
3+
value: image-registry.openshift-image-registry.svc:5000/officehours-test/officehours:latest
44
- op: replace
55
path: /spec/selector/variant
6-
value: qa
6+
value: test
77
- op: replace
88
path: /spec/template/metadata/labels/variant
9-
value: qa
9+
value: test
1010
- op: replace
1111
path: /spec/triggers/0/imageChangeParams/from/namespace
12-
value: officehours-qa
13-
12+
value: officehours-test

service/overlays/qa/hostname.yaml renamed to service/overlays/test/hostname.yaml

File renamed without changes.

service/overlays/qa/kustomization.yaml renamed to service/overlays/test/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ labels:
44
- includeSelectors: true
55
pairs:
66
org: umich
7-
variant: qa
8-
nameSuffix: -qa
7+
variant: test
8+
nameSuffix: -test
99
resources:
1010
- ../../base
1111
patches:

0 commit comments

Comments
 (0)