Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Label pruner job for deletion, bump dev crunchydb pvc size #3773

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Label pruner job for deletion, bump dev crunchydb pvc size #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
shell: bash
run: |
oc login "${{ secrets.OPENSHIFT_CLUSTER }}" --token="${{ secrets.OC4_DEV_TOKEN }}"
EPHEMERAL_STORAGE=True BUCKET=gpdqha DATA_SIZE=1Gi WAL_SIZE=1Gi bash openshift/scripts/oc_provision_crunchy.sh ${SUFFIX} apply
EPHEMERAL_STORAGE=True BUCKET=gpdqha DATA_SIZE=5Gi WAL_SIZE=5Gi bash openshift/scripts/oc_provision_crunchy.sh ${SUFFIX} apply

build-web-image:
# Declared ahead of build-api-image ; it runs slightly slower than the api build, and putting
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
run: |
oc login "${{ secrets.OPENSHIFT_CLUSTER }}" --token="${{ secrets.OC4_DEV_TOKEN }}"
PROJ_DEV="e1e498-dev" bash openshift/scripts/oc_provision_grass_curing_cronjob.sh ${SUFFIX} apply

- name: RDPS SFMS cronjob
shell: bash
run: |
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"GDPS",
"grib",
"gribs",
"hourlies",
"HRDPS",
"ndarray",
"numba",
Expand Down
1 change: 1 addition & 0 deletions openshift/scripts/oc_provision_hourly_prune_cronjob.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ SCHEDULE="${SCHEDULE:-0 2 * * *}"
# Process template
OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/prune_hourlies_cronjob.yaml \
-p SUFFIX=${SUFFIX} \
-p APP_LABEL=${APP_NAME}-${SUFFIX} \
-p SCHEDULE=\"${SCHEDULE}\" \
${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"

Expand Down
4 changes: 3 additions & 1 deletion openshift/templates/prune_hourlies_cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ parameters:
description: "The TAG name for this environment, e.g., dev, test, prod"
required: true
value: "prod"
- name: APP_LABEL
required: true
objects:
- kind: CronJob
apiVersion: batch/v1
Expand All @@ -35,7 +37,7 @@ objects:
metadata:
labels:
cronjob: prune-hourlies-${NAME}-${SUFFIX}
app: prune-hourlies-${NAME}-${SUFFIX}
app: ${APP_LABEL}
spec:
template:
spec:
Expand Down
Loading