feat: Workshop consent form WIP

.github/workflows/catalog-ui-pr.yaml

@@ -73,7 +73,6 @@ jobs:
           context: catalog/ui
           file: catalog/ui/Dockerfile
           build-args: |
-            STATUS_PAGE_ID=m7thn7y0z176
             MONITOR_ENABLED=false
             TRACKING_ENABLED=false
             OPTIONAL_FLAGS=default

.github/workflows/catalog-ui-publish.yaml

@@ -37,8 +37,14 @@ jobs:
               "${{ secrets.REGISTRY_URI }}/${{ secrets.GPTE_REGISTRY_REPOSITORY }}/${{ env.IMAGE_NAME }}:${VERSION%.*}"
               "${{ secrets.REGISTRY_URI }}/${{ secrets.GPTE_REGISTRY_REPOSITORY }}/${{ env.IMAGE_NAME }}:${VERSION}"
             )
-            # Set IMAGE_TAGS output for use in next step
+            IMAGE_TAGS_PARTNERS=(
+              '${{ secrets.REGISTRY_URI }}/${{ secrets.GPTE_REGISTRY_REPOSITORY }}/${{ env.IMAGE_NAME }}-partners:latest'
+              "${{ secrets.REGISTRY_URI }}/${{ secrets.GPTE_REGISTRY_REPOSITORY }}/${{ env.IMAGE_NAME }}-partners:${VERSION%.*}"
+              "${{ secrets.REGISTRY_URI }}/${{ secrets.GPTE_REGISTRY_REPOSITORY }}/${{ env.IMAGE_NAME }}-partners:${VERSION}"
+            )
+            # Set IMAGE_TAGS and IMAGE_TAGS_PARTNERS output for use in next step
             ( IFS=$','; echo "::set-output name=IMAGE_TAGS::${IMAGE_TAGS[*]}" )
+            ( IFS=$','; echo "::set-output name=IMAGE_TAGS_PARTNERS::${IMAGE_TAGS_PARTNERS[*]}" )
           fi
 
       - name: Set up buildx
@@ -69,7 +75,6 @@ jobs:
           context: catalog/ui
           file: catalog/ui/Dockerfile
           build-args: |
-            STATUS_PAGE_ID=05mhm9ljgsqq
             MONITOR_ENABLED=true
             TRACKING_ENABLED=true
             OPTIONAL_FLAGS=default

admin/requirements.txt

@@ -1,7 +1,7 @@
 SQLAlchemy-Utils==0.41.1
 SQLAlchemy==2.0.21
 asyncpg==0.28.0
-fastapi==0.103.2
+fastapi==0.109.1
 greenlet==3.0.0
 kubernetes-asyncio==28.2.0
 psycopg2==2.9.9

agnosticv-operator/requirements.txt

@@ -1,6 +1,6 @@
 aiofiles==23.1.0
-aiohttp==3.8.4
+aiohttp==3.9.2
 aioshutil==1.3
-GitPython==3.1.37
-jinja2==3.1.2
+GitPython==3.1.41
+jinja2==3.1.3
 pytimeparse==1.1.8

catalog-manager/helm/values.yaml

@@ -28,10 +28,10 @@ serviceAccount:
 resources:
   limits:
     cpu: "1"
-    memory: 256Mi
+    memory: 512Mi
   requests:
     cpu: 100m
-    memory: 256Mi
+    memory: 368Mi
 
 nodeSelector: {}
 

catalog-manager/requirements.txt

@@ -1,3 +1,3 @@
-aiohttp==3.8.6
+aiohttp==3.9.2
 psycopg2==2.9.5
 retrying==1.3.4

catalog/api/requirements.txt

@@ -32,15 +32,15 @@ pyasn1-modules==0.2.8
 pycparser==2.20
 python-dateutil==2.8.1
 PyYAML==5.4.1
-redis==3.5.3
-requests==2.25.1
+redis==4.4.4
+requests==2.31.0
 requests-oauthlib==1.3.0
 requestsexceptions==1.4.0
 retrying==1.3.3
 rsa==4.7.2
 simple-salesforce==1.11.4
 six==1.15.0
 stevedore==3.3.0
-urllib3==1.26.5
+urllib3==1.26.18
 websocket-client==0.58.0
 Werkzeug==1.0.1

catalog/helm/values.yaml

@@ -6,7 +6,7 @@ namespace:
   name:
 
 # Interface name to filter which catalog namespaces to present to the user
-#interfaceName:
+interfaceName:
 
 api:
   name: # default use chart name + '-api'
@@ -15,7 +15,7 @@ api:
     threads: 1
   image:
     #override:
-    tag: v0.12.5
+    tag: v0.12.7
     repository: quay.io/redhat-gpte/babylon-catalog-api
     pullPolicy: IfNotPresent
   imagePullSecrets: []
@@ -34,7 +34,7 @@ ui:
   name: # default use chart name + '-ui'
   image:
     #override:
-    tag: v0.30.15
+    tag: v0.30.25
     repository: quay.io/redhat-gpte/babylon-catalog-ui
     pullPolicy: IfNotPresent
   replicaCount: 1

catalog/ui/Dockerfile

@@ -10,7 +10,7 @@ RUN find ./previous -type f ! -newer ./timestamp -exec rm {} \;
 FROM registry.redhat.io/rhel9/nodejs-16-minimal:latest AS builder
 USER root 
 WORKDIR /build
-ARG STATUS_PAGE_ID
+
 ARG MONITOR_ENABLED
 ARG TRACKING_ENABLED
 ARG OPTIONAL_FLAGS