Merge branch 'main' into re-register

Author: marcelovilla

.github/workflows/publish-docker-image.yaml

@@ -10,8 +10,8 @@ on:
       - self-registration/**
 
 env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  REGISTRY: quay.io
+  IMAGE_NAME: nebari/nebari-self-registration
 
 jobs:
   push:
@@ -20,18 +20,23 @@ jobs:
       packages: write
       contents: read
     steps:
-      - uses: actions/checkout@v3
-      - name: Set lower case image name
+      - name: "Checkout Repository 🛎️"
+        uses: actions/checkout@v3
+      - name: "Login to Quay Container Registry 🔐"
+        uses: docker/login-action@v2
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_TOKEN }}
+      - name: "Set lower case image name"
         run: echo "IMAGE_LC=${IMAGE_NAME,,}" >>${GITHUB_ENV}
-      - name: Set the timestamp for version
+      - name: "Set the timestamp for version"
         run: echo "VERSION=$(date +'%Y%m%d-%H%M')" >> ${GITHUB_ENV}
-      - name: Build image
+      - name: "Build image"
         run: docker build self-registration --file self-registration/Dockerfile --tag $IMAGE_LC --label "runnumber=${GITHUB_RUN_ID}"
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login $REGISTRY -u $ --password-stdin
       - name: Push image
         run: |
-          IMAGE_ID=ghcr.io/$IMAGE_LC
+          IMAGE_ID=$REGISTRY/$IMAGE_LC
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')

README.md

@@ -41,6 +41,10 @@ Configuration options include:
 > **NOTE:** The `registration_group` must have been created in the Nebari realm in Keycloak prior to deploying the extension.
 
 #### Example Nebari Config File
+
+> [!NOTE]
+> The configuration options for the plugin were recently updated. Previously, `self_registration.coupons` accepted a list of coupon codes and there were shared options for all the specified coupons (e.g., `approved_domains`, `account_expiration_days`, etc...). Now, the field takes a map of coupon codes, where each coupon accepts individual configuration options (as outlined below). Please make sure to update the configuration values when updating to newer versions of the plugin after `0.0.14`.
+
 ```yaml
 provider: aws
 namespace: dev

self-registration/Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.12
+FROM python:3.12@sha256:05855f5bf06f5a004b0c1a8aaac73a9d9ea54390fc289d3e80ef52c4f90d5585
 
 WORKDIR /app
 
 COPY ./requirements.txt /tmp/requirements.txt
 
-# need to pre-install cython < 3 to avoid pyyaml >= 5.4.1 incompatibility https://github.com/yaml/pyyaml/issues/601
+# need to pre-install cython < 3 to avoid pyyaml >= 5.4.1 incompatibility: https://github.com/yaml/pyyaml/issues/601
 RUN echo "cython<3" > /tmp/constraint.txt
 
 RUN PIP_CONSTRAINT=/tmp/constraint.txt pip install --no-cache-dir --upgrade -r /tmp/requirements.txt
@@ -15,4 +15,4 @@ COPY ./app /app
 RUN useradd -m www
 USER www
 
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

self-registration/requirements.txt

@@ -1,6 +1,7 @@
 fastapi==0.104.1
 uvicorn==0.24.0.post1
 jinja2==3.1.2
+setuptools==69.0.3
 python-keycloak==3.3.0
 pyyaml==5.4.1
 python-multipart==0.0.6

src/nebari_plugin_self_registration/__about__.py

@@ -1 +1 @@
-__version__ = "0.0.12"
+__version__ = "0.0.15"

src/nebari_plugin_self_registration/terraform/modules/self-registration/chart/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.16
+version: 0.0.17
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.12"
+appVersion: "0.0.15"

src/nebari_plugin_self_registration/terraform/modules/self-registration/chart/values.yaml

@@ -4,10 +4,10 @@
 
 replicaCount: 1
 image:
-  repository: ghcr.io/metrostar/nebari-self-registration
+  repository: quay.io/nebari/nebari-self-registration
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "20240515-1204"
+  tag: "20241025-1410"
 
 imagePullSecrets: []
 nameOverride: ""