Skip to content

Commit

Permalink
#456 - Renames qa to test and updates some other variables as part of…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
jonespm authored Feb 15, 2024
1 parent 582957e commit 7b0462a
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 24 deletions.
6 changes: 3 additions & 3 deletions scripts/push-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions scripts/push-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions scripts/push-qa.sh

This file was deleted.

8 changes: 8 additions & 0 deletions scripts/push-test.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/*`.
Expand Down
2 changes: 1 addition & 1 deletion service/base/web-autoscaler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: web
spec:
scaleTargetRef:
apiVersion: v1
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
name: officehours-web-dev
minReplicas: 1
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ labels:
- includeSelectors: true
pairs:
org: umich
variant: qa
nameSuffix: -qa
variant: test
nameSuffix: -test
resources:
- ../../base
patches:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- op: replace
path: /spec/scaleTargetRef/name
value: officehours-web-qa
value: officehours-web-test

0 comments on commit 7b0462a

Please sign in to comment.