Skip to content

Commit 1739a19

Browse files
idaeusiceidaeusice
authored
Merge pull request #833 from bcgov/bcwat-815-819-sidebar-population-enhancement
bcwat-815-819-sidebar-population-enhancement
2 parents 42cafd0 + bf42bb4 commit 1739a19

File tree

21 files changed

+1178481
-181370
lines changed

21 files changed

+1178481
-181370
lines changed

‎.github/workflows/.airflow-deployer.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,14 @@ jobs:
157157
--set-string secrets.api.secretKey="${{ secrets.airflow_api_secret_key }}" \
158158
--set-string secrets.api.jwtKey="${{ secrets.airflow_api_jwt_key }}" \
159159
--set-string secrets.sendgridApiKey="${{ secrets.airflow_sendgrid_api_key }}" \
160-
--set migrations.databaseAlias=${{ inputs.db_name }}-crunchy \
161-
--set migrations.databaseUser=${{ inputs.db_user }} \
160+
--set-string "apiServer.extraInitContainers[0].image=ghcr.io/bcgov/nr-bcwat/migrations:${{ steps.vars.outputs.tag }}" \
161+
--set-string "apiServer.extraInitContainers[0].env[0].valueFrom.secretKeyRef.name=${{ inputs.db_name }}-crunchy-pguser-${{ inputs.db_user }}" \
162+
--set-string "apiServer.extraInitContainers[0].env[1].valueFrom.secretKeyRef.name=${{ inputs.db_name }}-crunchy-pguser-${{ inputs.db_user }}" \
163+
--set-string "apiServer.extraInitContainers[0].env[2].valueFrom.secretKeyRef.name=${{ inputs.db_name }}-crunchy-pguser-${{ inputs.db_user }}" \
162164
--set-string webserver.podAnnotations."rollout-timestamp"="$(date +%s)" \
163165
--set-string scheduler.podAnnotations."rollout-timestamp"="$(date +%s)" \
164-
--set-string triggerer.podAnnotations."rollout-timestamp"="$(date +%s)"
166+
--set-string triggerer.podAnnotations."rollout-timestamp"="$(date +%s)" \
167+
--debug 2>&1
165168
166169
# Helm release history (match the release name used above)
167170
helm history airflow

‎charts/openshift/airflow/values.dev.yaml‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,25 @@ apiServer:
8383
value: "21600"
8484
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
8585
value: "60"
86-
resources:
87-
limits:
88-
memory: 2G
89-
requests:
90-
memory: 2G
9186
extraInitContainers:
9287
- name: flyway-migrations
93-
image: "ghcr.io/bcgov/nr-bcwat/migrations:{{ .Values.images.airflow.tag }}"
88+
image: "~"
9489
imagePullPolicy: Always
9590
env:
9691
- name: FLYWAY_URL
9792
valueFrom:
9893
secretKeyRef:
99-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
94+
name: "~"
10095
key: jdbc-uri
10196
- name: FLYWAY_USER
10297
valueFrom:
10398
secretKeyRef:
104-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
99+
name: "~"
105100
key: user
106101
- name: FLYWAY_PASSWORD
107102
valueFrom:
108103
secretKeyRef:
109-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
104+
name: "~"
110105
key: password
111106
- name: FLYWAY_BASELINE_ON_MIGRATE
112107
value: "true"
@@ -116,11 +111,6 @@ apiServer:
116111
value: "10"
117112
- name: FLYWAY_GROUP
118113
value: "true"
119-
resources:
120-
requests:
121-
memory: 1G
122-
limits:
123-
memory: 1G
124114
waitForMigrations:
125115
enabled: true
126116

@@ -143,15 +133,11 @@ scheduler:
143133
value: "21600"
144134
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
145135
value: "60"
146-
resources:
147-
limits:
148-
memory: 2G
149-
requests:
150-
memory: 2G
151136
waitForMigrations:
152137
enabled: true
153138

154139
migrateDatabaseJob:
140+
useHelmHooks: false
155141
env:
156142
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
157143
value: "False"
@@ -170,14 +156,10 @@ migrateDatabaseJob:
170156
secretKeyRef:
171157
name: airflow-migrate-db-conn
172158
key: connection
173-
resources:
174-
requests:
175-
memory: 1G
176-
limits:
177-
memory: 1G
178159
ttlSecondsAfterFinished: 180
179160

180161
createUserJob:
162+
useHelmHooks: false
181163
env:
182164
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
183165
value: "False"
@@ -196,11 +178,6 @@ createUserJob:
196178
secretKeyRef:
197179
name: airflow-migrate-db-conn
198180
key: connection
199-
resources:
200-
requests:
201-
memory: 1G
202-
limits:
203-
memory: 1G
204181
ttlSecondsAfterFinished: 180
205182

206183
triggerer:
@@ -217,11 +194,6 @@ triggerer:
217194
enabled: false
218195
waitForMigrations:
219196
enabled: true
220-
resources:
221-
limits:
222-
memory: 1.5G
223-
requests:
224-
memory: 1.5G
225197

226198
postgresql:
227199
enabled: false

‎charts/openshift/airflow/values.prod.yaml‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,25 @@ apiServer:
8383
value: "21600"
8484
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
8585
value: "60"
86-
resources:
87-
limits:
88-
memory: 2G
89-
requests:
90-
memory: 2G
9186
extraInitContainers:
9287
- name: flyway-migrations
93-
image: "ghcr.io/bcgov/nr-bcwat/migrations:{{ .Values.images.airflow.tag }}"
88+
image: "~"
9489
imagePullPolicy: Always
9590
env:
9691
- name: FLYWAY_URL
9792
valueFrom:
9893
secretKeyRef:
99-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
94+
name: "~"
10095
key: jdbc-uri
10196
- name: FLYWAY_USER
10297
valueFrom:
10398
secretKeyRef:
104-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
99+
name: "~"
105100
key: user
106101
- name: FLYWAY_PASSWORD
107102
valueFrom:
108103
secretKeyRef:
109-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
104+
name: "~"
110105
key: password
111106
- name: FLYWAY_BASELINE_ON_MIGRATE
112107
value: "true"
@@ -116,11 +111,6 @@ apiServer:
116111
value: "10"
117112
- name: FLYWAY_GROUP
118113
value: "true"
119-
resources:
120-
requests:
121-
memory: 1G
122-
limits:
123-
memory: 1G
124114
waitForMigrations:
125115
enabled: true
126116

@@ -134,15 +124,11 @@ scheduler:
134124
value: "21600"
135125
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
136126
value: "60"
137-
resources:
138-
limits:
139-
memory: 2G
140-
requests:
141-
memory: 2G
142127
waitForMigrations:
143128
enabled: true
144129

145130
migrateDatabaseJob:
131+
useHelmHooks: false
146132
env:
147133
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
148134
value: "False"
@@ -161,14 +147,10 @@ migrateDatabaseJob:
161147
secretKeyRef:
162148
name: airflow-migrate-db-conn
163149
key: connection
164-
resources:
165-
requests:
166-
memory: 1G
167-
limits:
168-
memory: 1G
169150
ttlSecondsAfterFinished: 180
170151

171152
createUserJob:
153+
useHelmHooks: false
172154
env:
173155
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
174156
value: "False"
@@ -187,11 +169,6 @@ createUserJob:
187169
secretKeyRef:
188170
name: airflow-migrate-db-conn
189171
key: connection
190-
resources:
191-
requests:
192-
memory: 1G
193-
limits:
194-
memory: 1G
195172
ttlSecondsAfterFinished: 180
196173

197174
redis:
@@ -207,11 +184,6 @@ triggerer:
207184
value: "21600"
208185
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
209186
value: "60"
210-
resources:
211-
limits:
212-
memory: 1.5G
213-
requests:
214-
memory: 1.5G
215187
persistence:
216188
enabled: false
217189
waitForMigrations:

‎charts/openshift/airflow/values.test.yaml‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,25 @@ apiServer:
8383
value: "21600"
8484
- name: AIRFLOW__API_AUTH__JWT_LEEWAY
8585
value: "60"
86-
resources:
87-
limits:
88-
memory: 2G
89-
requests:
90-
memory: 2G
9186
extraInitContainers:
9287
- name: flyway-migrations
93-
image: "ghcr.io/bcgov/nr-bcwat/migrations:{{ .Values.images.airflow.tag }}"
88+
image: "~"
9489
imagePullPolicy: Always
9590
env:
9691
- name: FLYWAY_URL
9792
valueFrom:
9893
secretKeyRef:
99-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
94+
name: "~"
10095
key: jdbc-uri
10196
- name: FLYWAY_USER
10297
valueFrom:
10398
secretKeyRef:
104-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
99+
name: "~"
105100
key: user
106101
- name: FLYWAY_PASSWORD
107102
valueFrom:
108103
secretKeyRef:
109-
name: "{{ .Values.migrations.databaseAlias }}-pguser-{{ .Values.migrations.databaseUser }}"
104+
name: "~"
110105
key: password
111106
- name: FLYWAY_BASELINE_ON_MIGRATE
112107
value: "true"
@@ -116,11 +111,6 @@ apiServer:
116111
value: "10"
117112
- name: FLYWAY_GROUP
118113
value: "true"
119-
resources:
120-
requests:
121-
memory: 1G
122-
limits:
123-
memory: 1G
124114
waitForMigrations:
125115
enabled: true
126116

@@ -130,15 +120,11 @@ scheduler:
130120
value: "False"
131121
- name: ENVIRONMENT
132122
value: TEST
133-
resources:
134-
limits:
135-
memory: 2G
136-
requests:
137-
memory: 2G
138123
waitForMigrations:
139124
enabled: true
140125

141126
migrateDatabaseJob:
127+
useHelmHooks: false
142128
env:
143129
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
144130
value: "False"
@@ -157,14 +143,10 @@ migrateDatabaseJob:
157143
secretKeyRef:
158144
name: airflow-migrate-db-conn
159145
key: connection
160-
resources:
161-
requests:
162-
memory: 1G
163-
limits:
164-
memory: 1G
165146
ttlSecondsAfterFinished: 180
166147

167148
createUserJob:
149+
useHelmHooks: false
168150
env:
169151
- name: AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION
170152
value: "False"
@@ -183,11 +165,6 @@ createUserJob:
183165
secretKeyRef:
184166
name: airflow-migrate-db-conn
185167
key: connection
186-
resources:
187-
requests:
188-
memory: 1G
189-
limits:
190-
memory: 1G
191168
ttlSecondsAfterFinished: 180
192169

193170
triggerer:
@@ -196,11 +173,6 @@ triggerer:
196173
value: "False"
197174
- name: ENVIRONMENT
198175
value: TEST
199-
resources:
200-
limits:
201-
memory: 1.5G
202-
requests:
203-
memory: 1.5G
204176
persistence:
205177
enabled: false
206178
waitForMigrations:

‎client/cypress/component/groundwater-level/GroundwaterLevel.cy.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import WaterPortal from "@/components/water-portal/WaterPortal.vue";
22
import { portalHandler } from '@/utils/reactor.js';
33
import groundWaterLevelStations from '../../fixtures/groundWaterLevelStations.json';
44

5-
const pointCount = groundWaterLevelStations.features.length;
5+
const pointCount = groundWaterLevelStations.features.length - 1;
66

77
describe('<GroundwaterLevel />', () => {
88
beforeEach(() => {
@@ -31,7 +31,7 @@ describe('<GroundwaterLevel />', () => {
3131
}
3232
});
3333
portalHandler.updateViewType('wells');
34-
cy.get('.map-points-list > div:nth-child(1) > .q-item').click();
34+
cy.get('.q-item').first().click();
3535
// details are displayed
3636
cy.get('.selected-point > pre:nth-child(1)').should('not.be.empty');
3737
cy.get('.q-btn > span > span').contains('View More').click();

‎client/cypress/component/groundwater/Groundwater.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('<GroundWaterQuality />', () => {
4545
.first()
4646
.click();
4747
cy.wait(1000);
48-
cy.get('.map-points-list > div:nth-child(1) > .q-item').click();
48+
cy.get('.q-item').first().click();
4949
// details are displayed
5050
cy.get('.selected-point').should('not.be.empty');
5151
// open report

‎client/cypress/component/surfacewater/SurfaceWater.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('<SurfaceWater />', () => {
3131
}
3232
});
3333
portalHandler.updateViewType('surface');
34-
cy.get('.map-points-list > div:nth-child(1) > .q-item').click();
34+
cy.get('.q-item').first().click();
3535
// details are displayed
3636
cy.get('.selected-point > pre:nth-child(1)').should('not.be.empty');
3737
// open report

0 commit comments

Comments
 (0)