Feature/eval me

.github/workflows/cicd.yml

@@ -47,7 +47,7 @@ on:
 
 jobs:
   context:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       commit_hash: ${{ steps.context.outputs.commit_hash }}
@@ -62,18 +62,18 @@ jobs:
           release_name: ${{ env.RELEASE_NAME }}
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     needs: context
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.6
+          python-version: '3.10'
 
       # This repo can't use the standard pycodestyle / license checker because
       # of code contributed from other institutions
@@ -107,19 +107,20 @@ jobs:
       #    fi
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-$(echo ${{ hashFiles('Dockerfile') }} | head -c 16)
           restore-keys: |
             ${{ runner.os }}-buildx-
 
       - name: Build App Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
+          context: .
           target: app-container
           tags: ${{ needs.context.outputs.image_tag }}
           push: false
@@ -128,7 +129,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Build Test Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           target: app-test-container
           tags: app-test-container
@@ -151,7 +152,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          python -m pip install --upgrade pip coverage coveralls==2.2.0
+          python -m pip install --upgrade pip coverage coveralls==3.3.1
           coverage combine
           coveralls
 
@@ -170,11 +171,11 @@ jobs:
     outputs:
       context: ${{ steps.context.outputs.context }}
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Deployment Pipeline
         if: >-
@@ -195,19 +196,19 @@ jobs:
           commit_hash: ${{ needs.context.outputs.commit_hash }}
           git_repo_branch: ${{ needs.context.outputs.git_repo_branch }}
           gh_auth_token: ${{ secrets.GH_AUTH_TOKEN }}
-          app_instance: eval
+          app_instance: dev
 
       - name: 'Surface context from executed build step'
         id: context
         shell: bash
-        run: echo "::set-output name=context::$(< ${CONTEXT_FILENAME})"
+        run: echo "context=$(< ${CONTEXT_FILENAME})" >> $GITHUB_OUTPUT
 
   housekeeping:
     if: github.event_name == 'push'
 
     needs: [context, build, deploy]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: House Keeping

.gitignore

@@ -30,6 +30,9 @@ spotseeker_web
 # IDE files
 .idea/
 
+# vscode files
+.vscode/
+
 # pipenv
 Pipfile
 Pipfile.lock

Dockerfile

@@ -1,9 +1,9 @@
-ARG DJANGO_CONTAINER_VERSION=1.3.8
+ARG DJANGO_CONTAINER_VERSION=2.0.8
 
-FROM gcr.io/uwit-mci-axdd/django-container:${DJANGO_CONTAINER_VERSION} as app-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} AS app-container
 
 USER root
-RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y
+RUN apt-get update && apt-get install libpq-dev -y
 USER acait
 
 ADD --chown=acait:acait setup.py /app/
@@ -18,7 +18,7 @@ COPY --chown=acait:acait docker/test_settings.py project/test_settings.py
 ADD --chown=acait:acait docker/app_start.sh /scripts
 RUN chmod u+x /scripts/app_start.sh
 
-FROM gcr.io/uwit-mci-axdd/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} AS app-test-container
 
 COPY --from=0 /app/ /app/
 COPY --from=0 /static/ /static/

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - "${PORT:-8000}:8000"
     environment:
       ENV: localdev
-      AUTH_MODULE: ${AUTH_MODULE:-all_ok}
+      SPOTSEEKER_OAUTH_ENABLED: ${SPOTSEEKER_OAUTH_ENABLED}
       SPOTSEEKER_AUTH_ADMINS: ${SPOTSEEKER_AUTH_ADMINS}
       SPOTSEEKER_WEB_SERVER_HOST: ${SPOTSEEKER_WEB_SERVER_HOST}
       SPOTSEEKER_WEB_OAUTH_KEY: ${SPOTSEEKER_WEB_OAUTH_KEY}

docker/app_start.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-if [ "$ENV" = "localdev" ]
-then
+if [ "$ENV" = "localdev" ]; then
 
-  python manage.py migrate
-  python manage.py loaddata uw.json
-  python manage.py loaddata dummy_oauth.json
+	python manage.py migrate
+	python manage.py loaddata uw.json
 
 fi

docker/dev-values.yml

@@ -0,0 +1,156 @@
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 1
+ingress:
+  enabled: true
+  tls:
+    spotseeker:
+      secretName: dev.api.scout.uw.edu-ingress-cert
+      hosts:
+        - dev.api.scout.uw.edu
+  hosts:
+    spotseeker:
+      host: dev.api.scout.uw.edu
+      paths:
+        - "/"
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/client-body-buffer-size: "16K"
+    nginx.ingress.kubernetes.io/proxy-body-size: "20m"
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "500"
+    nginx.ingress.kubernetes.io/ssl-ciphers: "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256"
+lifecycle:
+  enabled: true
+  preStop:
+    enabled: true
+affinity:
+   podsSpanNodes: true
+readiness:
+  enabled: true
+securityPolicy:
+  enabled: true
+externalService:
+  enabled: true
+  name: spotseeker-dev-db-service
+  type: ClusterIP
+  serviceAddress: 172.18.0.4
+  servicePort: 5432
+database:
+  engine: postgres
+  name: api_dev
+  hostname: spotseeker-dev-db-service
+  secretName: dev.api.scout.uw.edu-sql-secrets
+repo: spotseeker
+instance: dev
+image:
+  repository: gcr.io/uwit-mci-axdd/spotseeker
+  tag: IMAGE_TAG
+memcached:
+  enabled: true
+  replicaCount: 1
+  updateStrategy:
+    type: RollingUpdate
+gcsCredentials:
+  mounted: true
+  secretName: dev.api.scout.uw.edu-gc-service-credentials
+cronjob:
+  enabled: false
+  jobs:
+    - name: sync-techloan
+      schedule: "0,15,30,45 * * * *"
+      command: ["/scripts/management_command.sh"]
+      args: ["sync_techloan"]
+daemon:
+  enabled: false  # cronjob is probably more appropriate
+  daemons:
+    - name: sync-techloan
+      replicaCount: 1
+      command: ["/scripts/management_daemon.sh"]
+      args: ["--delay", "300", "sync_techloan"]
+environmentVariables:
+  - name: AUTH_MODULE
+    value: oauth
+  - name: CLUSTER_CNAME
+    value: dev.api.scout.uw.edu
+  - name: ENV
+    value: dev
+  - name: WEBSERVER
+    value: nginx
+  - name: CACHE_MAX_ENTRIES
+    value: "1000"
+  - name: CACHE_TIMEOUT
+    value: "86400"
+externalSecrets:
+  enabled: true
+  secrets:
+    - name: dev.api.scout.uw.edu-secrets
+      externalKey: axdd/kv/data/scout/dev-api/secrets
+      data:
+        - name: django-secret
+          property: django-secret
+        - name: spotseeker-auth-admins
+          property: spotseeker-auth-admins
+        - name: storage-bucket-name
+          property: storage-bucket-name
+        - name: storage-project-id
+          property: storage-project-id
+        - name: spotseeker-techloan-url
+          property: spotseeker-techloan-url
+        - name: spotseeker-web-server-host
+          property: spotseeker-web-server-host
+        - name: spotseeker-web-oauth-key
+          property: spotseeker-web-oauth-key
+        - name: spotseeker-web-oauth-secret
+          property: spotseeker-web-oauth-secret
+        - name: spotseeker-web-oauth-user
+          property: spotseeker-web-oauth-user
+    - name: dev.api.scout.uw.edu-sql-secrets
+      externalKey: axdd/kv/data/scout/common/sql-secrets
+      data:
+        - name: username
+          property: username
+        - name: password
+          property: password
+    - name: dev.api.scout.uw.edu-gc-service-credentials
+      externalKey: axdd/kv/data/scout/common/gc-service-credentials
+      data:
+        - name: credentials.json
+          property: credentials.json
+environmentVariablesSecrets:
+  djangoSecret:
+    name: DJANGO_SECRET
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: django-secret
+  spotseekerAuthAdmins:
+    name: SPOTSEEKER_AUTH_ADMINS
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-auth-admins
+  storageBucketName:
+    name: STORAGE_BUCKET_NAME
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: storage-bucket-name
+  storageProjectId:
+    name: STORAGE_PROJECT_ID
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: storage-project-id
+  spotseekerTechloanUrl:
+    name: SPOTSEEKER_TECHLOAN_URL
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-techloan-url
+  spotseekerWebServerHost:
+    name: SPOTSEEKER_WEB_SERVER_HOST
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-web-server-host
+  spotseekerWebOauthKey:
+    name: SPOTSEEKER_WEB_OAUTH_KEY
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-web-oauth-key
+  spotseekerWebOauthSecret:
+    name: SPOTSEEKER_WEB_OAUTH_SECRET
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-web-oauth-secret
+  spotseekerWebOauthUser:
+    name: SPOTSEEKER_WEB_OAUTH_USER
+    secretName: dev.api.scout.uw.edu-secrets
+    secretKey: spotseeker-web-oauth-user

docker/prod-values.yml

@@ -71,8 +71,8 @@ daemon:
       command: ["/scripts/management_daemon.sh"]
       args: ["--delay", "300", "sync_techloan"]
 environmentVariables:
-  - name: AUTH_MODULE
-    value: oauth
+  - name: SPOTSEEKER_OAUTH_ENABLED
+    value: true
   - name: CLUSTER_CNAME
     value: api.scout.uw.edu
   - name: ENV