diff --git a/Dockerfile b/Dockerfile index a474fe667..5703d8d28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG DJANGO_CONTAINER_VERSION=1.4.2 FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-prewebpack-container USER root -RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y +RUN apt-get update && apt-get install -y postgresql-client libpq-dev USER acait ADD --chown=acait:acait . /app/ @@ -11,7 +11,7 @@ ADD --chown=acait:acait docker/app_start.sh /scripts RUN chmod u+x /scripts/app_start.sh RUN /app/bin/pip install -r requirements.txt -RUN /app/bin/pip install mysqlclient +RUN /app/bin/pip install psycopg2 FROM node:16.3-stretch AS node-bundler diff --git a/docker/dev-values.yml b/docker/dev-values.yml index 9c202df83..2bada3faf 100644 --- a/docker/dev-values.yml +++ b/docker/dev-values.yml @@ -29,10 +29,10 @@ externalService: enabled: true name: dev-my-uw-db type: ClusterIP - serviceAddress: 172.18.0.19 - servicePort: 3306 + serviceAddress: 172.18.1.210 + servicePort: 5432 database: - engine: mysql + engine: postgres name: myuw_dev hostname: dev-my-uw-db secretName: dev.my.uw.edu-sql-secrets diff --git a/docker/prod-values.yml b/docker/prod-values.yml index 4100c79fd..af705a190 100644 --- a/docker/prod-values.yml +++ b/docker/prod-values.yml @@ -61,10 +61,10 @@ externalService: enabled: true name: my-uw-db type: ClusterIP - serviceAddress: 172.18.0.19 - servicePort: 3306 + serviceAddress: 172.18.1.210 + servicePort: 5432 database: - engine: mysql + engine: postgres name: myuw hostname: my-uw-db secretName: my.uw.edu-sql-secrets @@ -178,49 +178,49 @@ cronjob: cpu: 25m memory: 32Mi - name: course-cleanup - schedule: "21 20 * * 5" + schedule: "1 3 21,26,30 3,6,8,12 *" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "course"] resources: limits: - cpu: 75m - memory: 768Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m memory: 128Mi - name: seenreg-cleanup - schedule: "1 23 * * 5" + schedule: "1 4 21,26,30 3,6,8,12 *" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "seenreg"] resources: limits: - cpu: 75m - memory: 768Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m memory: 128Mi - name: notice-cleanup - schedule: "1 21 * * 5" + schedule: "1 5 * * 0" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "notice"] resources: limits: - cpu: 75m - memory: 1024Mi + cpu: 50m + memory: 768Mi requests: cpu: 25m - memory: 512Mi + memory: 256Mi - name: linkvisit-cleanup - schedule: "1 22 * * 5" + schedule: "1 6 * * 0" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "linkvisit"] resources: limits: - cpu: 100m - memory: 1280Mi + cpu: 50m + memory: 768Mi requests: cpu: 25m - memory: 512Mi + memory: 256Mi environmentVariables: - name: AUTH value: SAML diff --git a/docker/test-values.yml b/docker/test-values.yml index 68622d3b5..180f955df 100644 --- a/docker/test-values.yml +++ b/docker/test-values.yml @@ -51,10 +51,10 @@ externalService: enabled: true name: test-my-uw-db type: ClusterIP - serviceAddress: 172.18.0.19 - servicePort: 3306 + serviceAddress: 172.18.1.210 + servicePort: 5432 database: - engine: mysql + engine: postgres name: myuw_test hostname: test-my-uw-db secretName: test.my.uw.edu-sql-secrets @@ -114,49 +114,49 @@ cronjob: cpu: 25m memory: 32Mi - name: course-cleanup - schedule: "1 3 * 1,4,7,9 1" + schedule: "1 3 21,26,30 3,6,8,12 *" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "course"] resources: limits: - cpu: 75m - memory: 128Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m - memory: 32Mi + memory: 128Mi - name: seenreg-cleanup - schedule: "1 3 * 1,4,7,9 2" + schedule: "1 4 21,26,30 3,6,8,12 *" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "seenreg"] resources: limits: - cpu: 75m - memory: 128Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m - memory: 32Mi + memory: 128Mi - name: notice-cleanup - schedule: "1 3 * * 3" + schedule: "1 5 * * 0" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "notice"] resources: limits: - cpu: 75m - memory: 128Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m - memory: 32Mi + memory: 256Mi - name: linkvisit-cleanup - schedule: "1 3 * * 4" + schedule: "1 6 * * 0" command: ["/scripts/management_command.sh"] args: ["db_cleanup", "linkvisit"] resources: limits: - cpu: 75m - memory: 128Mi + cpu: 50m + memory: 512Mi requests: cpu: 25m - memory: 32Mi + memory: 256Mi environmentVariables: - name: AUTH value: SAML diff --git a/docker/vue-values.yml b/docker/vue-values.yml index ba11fbc29..2eb1e48d5 100644 --- a/docker/vue-values.yml +++ b/docker/vue-values.yml @@ -29,10 +29,10 @@ externalService: enabled: true name: vue-my-uw-db type: ClusterIP - serviceAddress: 172.18.0.19 - servicePort: 3306 + serviceAddress: 172.18.1.210 + servicePort: 5432 database: - engine: mysql + engine: postgres name: myuw_test hostname: vue-my-uw-db secretName: vue.my.uw.edu-sql-secrets diff --git a/myuw/management/commands/db_cleanup.py b/myuw/management/commands/db_cleanup.py index 44747b6cc..58b6e6496 100644 --- a/myuw/management/commands/db_cleanup.py +++ b/myuw/management/commands/db_cleanup.py @@ -96,7 +96,7 @@ def notice_read(self): # clean up after 180 days timer = Timer() queryf = "DELETE FROM myuw_mobile_usernotices WHERE id IN ({})" - cut_off_dt = self.get_cut_off_date(90) + cut_off_dt = self.get_cut_off_date() qset = UserNotices.objects.filter(first_viewed__lt=cut_off_dt) if qset.exists(): ids_to_delete = qset.values_list('id', flat=True) @@ -131,7 +131,7 @@ def link_visited(self): # clean up after 180 days timer = Timer() queryf = "DELETE FROM myuw_visitedlinknew WHERE id IN ({})" - cut_off_dt = self.get_cut_off_date(90) + cut_off_dt = self.get_cut_off_date() qset = VisitedLinkNew.objects.filter(visit_date__lt=cut_off_dt) if qset.exists(): ids_to_delete = qset.values_list('id', flat=True)