Skip to content

Commit 52b177b

Browse files
authored
Merge pull request #2658 from bcgov/DESENG-847-use-deployments-not-deploymentconfigs
Finish upgrading DeploymentConfigs -> Deployments cross-app
2 parents c31f0ec + 418e3a8 commit 52b177b

11 files changed

Lines changed: 20 additions & 14 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Issue #: https://citz-gdx.atlassian.net/browse/DESENG-XXX
44

55
**User Guide update ticket (if applicable):**
66

7-
- [ ] Yes, a user guide update ticket has been created. _(Link to ticket)_
8-
- [ ] No, a user guide update ticket is not required.
7+
- - [ ] Yes, a user guide update ticket has been created. _(Link to ticket)_
8+
- - [ ] No, a user guide update ticket is not required.
99

1010
**Common component changes:**
1111

12-
- [ ] Yes, I have updated CONTRIBUTING.md and the docblocks to document any changes to the common components.
13-
- [ ] No, there are no changes to the common components.
12+
- - [ ] Yes, I have updated CONTRIBUTING.md and the docblocks to document any changes to the common components.
13+
- - [ ] No, there are no changes to the common components.

.github/workflows/analytics-api-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ jobs:
7474
- name: Rollout
7575
shell: bash
7676
run: |
77-
oc rollout status dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
77+
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w

.github/workflows/met-api-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ jobs:
7474
- name: Rollout
7575
shell: bash
7676
run: |
77-
oc rollout status dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
77+
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w

.github/workflows/met-cron-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ jobs:
7575
- name: Rollout
7676
shell: bash
7777
run: |
78-
oc rollout status dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
78+
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w

.github/workflows/met-web-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ jobs:
8686
- name: Rollout
8787
shell: bash
8888
run: |
89-
oc rollout status dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
89+
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w

.github/workflows/notify-api-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ jobs:
7474
- name: Rollout
7575
shell: bash
7676
run: |
77-
oc rollout status dc/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
77+
oc rollout status deployment/${{ env.APP_NAME }} -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w

CHANGELOG.MD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## August 22, 2025
2+
3+
- **Bugfix** Finish upgrading DeploymentConfigs -> Deployments cross-app [🎟️ DESENG-847](https://citz-gdx.atlassian.net/browse/DESENG-847)
4+
- Completed the replacement of all deprecated DeploymentConfigs with Deployments across the application.
5+
- Updated Helm charts and deployment scripts to reflect the changes.
6+
17
## August 19, 2025
28

39
- **Feature** Restricted options for values in manual CD runs

openshift/analytics-api/templates/hpa.yaml

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

openshift/api/templates/hpa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app-group: met-app
88
spec:
99
scaleTargetRef:
10-
kind: DeploymentConfig
10+
kind: Deployment
1111
name: {{ .Values.app.name }}
1212
apiVersion: apps.openshift.io/v1
1313
minReplicas: {{ .Values.deployment.minReplicas }}

openshift/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ oc tag met-web:latest met-web:$1
88
oc tag met-analytics:latest met-analytics:$1
99
oc tag dagster-etl:latest dagster-etl:$1
1010

11-
oc rollout status dc/met-api -n $2-$1 -w
12-
oc rollout status dc/met-web -n $2-$1 -w
11+
oc rollout status deployment/met-api -n $2-$1 -w
12+
oc rollout status deployment/met-web -n $2-$1 -w

0 commit comments

Comments
 (0)