Skip to content

Commit

Permalink
OCP4 migration - application DB/DC
Browse files Browse the repository at this point in the history
  • Loading branch information
Young-Jin Chung committed Feb 11, 2021
1 parent b33c6fb commit d2dbbbb
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions .jenkins/.pipeline/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const name = "jenkins";

const phases = {
build: {
namespace: "txkggj-tools",
namespace: "d3d940-tools",
name: `${name}`,
phase: "build",
changeId: changeId,
Expand All @@ -16,7 +16,7 @@ const phases = {
tag: `build-${version}-${changeId}`,
},
dev: {
namespace: "txkggj-tools",
namespace: "d3d940-tools",
name: `${name}`,
phase: "dev",
changeId: changeId,
Expand All @@ -26,7 +26,7 @@ const phases = {
tag: `dev-${version}-${changeId}`,
},
prod: {
namespace: "txkggj-tools",
namespace: "d3d940-tools",
name: `${name}`,
phase: "prod",
changeId: changeId,
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/.pipeline/lib/deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = (settings) => {
SUFFIX: phases[phase].suffix,
VERSION: phases[phase].tag,
ENV_NAME: phases[phase].phase,
ROUTE_HOST: `${phases[phase].name}${phases[phase].suffix}-${phases[phase].namespace}.pathfinder.gov.bc.ca`,
ROUTE_HOST: `${phases[phase].name}${phases[phase].suffix}-${phases[phase].namespace}.apps.silver.devops.gov.bc.ca`,
},
}
)
Expand Down
18 changes: 9 additions & 9 deletions .pipeline/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const name = "hmcr";

const phases = {
build: {
namespace: "txkggj-tools",
namespace: "d3d940-tools",
name: `${name}`,
phase: "build",
changeId: changeId,
Expand All @@ -17,61 +17,61 @@ const phases = {
transient: true,
},
dev: {
namespace: "txkggj-dev",
namespace: "d3d940-dev",
name: `${name}`,
phase: "dev",
changeId: changeId,
suffix: `-dev-${changeId}`,
instance: `${name}-dev-${changeId}`,
version: `${version}-${changeId}`,
tag: `dev-${version}-${changeId}`,
host: `hmcr-${changeId}-txkggj-dev.pathfinder.gov.bc.ca`,
host: `hmcr-${changeId}-d3d940-dev.apps.silver.devops.gov.bc.ca`,
url_prefix: "dev-",
bceid_service: ".test",
oas_server: "devoas4",
dotnet_env: "Development",
transient: true,
},
test: {
namespace: "txkggj-test",
namespace: "d3d940-test",
name: `${name}`,
phase: "test",
changeId: changeId,
suffix: `-test`,
instance: `${name}-test`,
version: `${version}`,
tag: `test-${version}`,
host: `hmcr-txkggj-test.pathfinder.gov.bc.ca`,
host: `hmcr-d3d940-test.apps.silver.devops.gov.bc.ca`,
url_prefix: "tst-",
bceid_service: ".test",
oas_server: "prdoas5",
dotnet_env: "Staging",
},
uat: {
namespace: "txkggj-test",
namespace: "d3d940-test",
name: `${name}`,
phase: "uat",
changeId: changeId,
suffix: `-uat`,
instance: `${name}-uat`,
version: `${version}`,
tag: `uat-${version}`,
host: `hmcr-txkggj-uat.pathfinder.gov.bc.ca`,
host: `hmcr-d3d940-uat.apps.silver.devops.gov.bc.ca`,
url_prefix: "uat-",
bceid_service: ".test",
oas_server: "prdoas5",
dotnet_env: "UAT",
},
prod: {
namespace: "txkggj-prod",
namespace: "d3d940-prod",
name: `${name}`,
phase: "prod",
changeId: changeId,
suffix: `-prod`,
instance: `${name}-prod`,
version: `${version}`,
tag: `prod-${version}`,
host: `hmcr-txkggj-prod.pathfinder.gov.bc.ca`,
host: `hmcr-d3d940-prod.apps.silver.devops.gov.bc.ca`,
url_prefix: "",
bceid_service: "",
oas_server: "prdoas5",
Expand Down
18 changes: 9 additions & 9 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"jenkins": {
"path": ".jenkins",
"name": "jenkins",
"namespace": "txkggj-tools",
"namespace": "d3d940-tools",
"version": "1.0.0",
"environments": {
"build": {
"namespace": "txkggj-tools"
"namespace": "d3d940-tools"
},
"dev": {
"namespace": "txkggj-tools"
"namespace": "d3d940-tools"
},
"prod": {
"namespace": "txkggj-tools"
"namespace": "d3d940-tools"
}
},
"jenkinsJobName": "_jenkins",
Expand All @@ -30,16 +30,16 @@
"path": ".",
"environments": {
"build": {
"namespace": "txkggj-tools"
"namespace": "d3d940-tools"
},
"dev": {
"namespace": "txkggj-dev"
"namespace": "d3d940-dev"
},
"test": {
"namespace": "txkggj-test"
"namespace": "d3d940-test"
},
"prod": {
"namespace": "txkggj-prod"
"namespace": "d3d940-prod"
}
},
"jenkinsJobName": "hmr",
Expand All @@ -51,4 +51,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Use the following steps to configure the local development environment
# use port value from step 3
REACT_APP_API_HOST=http://localhost:<api-port>
REACT_APP_SSO_HOST=https://sso-dev.pathfinder.gov.bc.ca/auth
REACT_APP_SSO_HOST=https://dev.oidc.gov.bc.ca/auth
REACT_APP_SSO_CLIENT=<client-id>
REACT_APP_SSO_REALM=<realm-id>
Expand Down
4 changes: 2 additions & 2 deletions client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:13.7-alpine3.11 AS builder
FROM docker.io/node:13.7-alpine3.11 AS builder
LABEL maintainer="[email protected]"

COPY . ./src
Expand All @@ -7,7 +7,7 @@ RUN cd ./src && npm install --production && \
npm run build


FROM docker-registry.default.svc:5000/txkggj-tools/nginx-116-rhel8:1
FROM image-registry.openshift.image-registry.svc:5000/d3d940-tools/nginx-116-rhel8:1

COPY --from=builder /src/build/. /tmp/src
COPY --from=builder /src/nginx-start/. /tmp/src/nginx-start
Expand Down
2 changes: 1 addition & 1 deletion openshift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ type: Opaque
### Configure Pipeline-cli
The `.jenkins` and `.pipeline` directories contain the scripts genereated by the BCDK tool in order to use pipeline-cli against your OpenShift namespaces. The scripts in the `.jenkins` and `.pipeline` directories in this repository are configured to run against the official HMCR OpenShift namespaces (`txkggj-`).
The `.jenkins` and `.pipeline` directories contain the scripts genereated by the BCDK tool in order to use pipeline-cli against your OpenShift namespaces. The scripts in the `.jenkins` and `.pipeline` directories in this repository are configured to run against the official HMCR OpenShift namespaces (`d3d940-`).

You will need to configure the scripts in the `.jenkins` and `.pipeline` directories to work with your OpenShift namespaces. There are two ways to do this:

Expand Down
2 changes: 1 addition & 1 deletion openshift/api-deploy-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ objects:
spec:
initContainers: # check if logdb is ready, and only continue when true
- name: check-logdb-ready
image: docker-registry.default.svc:5000/txkggj-tools/postgresql-10-rhel8:1
image: image-registry.openshift.image-registry.svc:5000/d3d940-tools/postgresql-10-rhel8:1
command:
[
"sh",
Expand Down
2 changes: 1 addition & 1 deletion openshift/hangfire-deploy-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ objects:
spec:
initContainers: # check if logdb is ready, and only continue when true
- name: check-logdb-ready
image: docker-registry.default.svc:5000/txkggj-tools/postgresql-10-rhel8:1
image: image-registry.openshift.image-registry.svc:5000/d3d940-tools/postgresql-10-rhel8:1
command:
[
"sh",
Expand Down
4 changes: 2 additions & 2 deletions openshift/postgresql-deploy-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ objects:
deploymentconfig: ${NAME}${SUFFIX}
spec:
containers:
- image: docker-registry.default.svc:5000/txkggj-tools/${IMAGE_STREAM_TAG}
- image: image-registry.openshift.image-registry.svc:5000/d3d940-tools/${IMAGE_STREAM_TAG}
imagePullPolicy: IfNotPresent
name: ${NAME}${SUFFIX}
env:
Expand Down Expand Up @@ -100,7 +100,7 @@ objects:
from:
kind: ImageStreamTag
name: ${IMAGE_STREAM_TAG}
namespace: txkggj-tools
namespace: d3d940-tools
type: ImageChange
- kind: PersistentVolumeClaim
apiVersion: v1
Expand Down
Binary file modified openshift/secrets/sso-secrets.yaml
Binary file not shown.

0 comments on commit d2dbbbb

Please sign in to comment.