Testing the portal cached build changes in helm

.secrets.baseline

@@ -153,14 +153,14 @@
         "filename": "helm/portal/values.yaml",
         "hashed_secret": "08eeb737b239bdb7362a875b90e22c10b8826b20",
         "is_verified": false,
-        "line_number": 518
+        "line_number": 514
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "helm/portal/values.yaml",
         "hashed_secret": "eb9739c6625f06b4ab73035223366dda6262ae77",
         "is_verified": false,
-        "line_number": 520
+        "line_number": 516
       }
     ],
     "helm/revproxy/nginx/helpers.js": [
@@ -173,5 +173,5 @@
       }
     ]
   },
-  "generated_at": "2025-12-04T22:48:57Z"
+  "generated_at": "2026-02-24T16:29:05Z"
 }

helm/gen3/Chart.yaml

@@ -104,7 +104,7 @@ dependencies:
     repository: "file://../peregrine"
     condition: peregrine.enabled
   - name: portal
-    version: 0.1.55
+    version: 0.1.56
     repository: "file://../portal"
     condition: portal.enabled
   - name: requestor
@@ -193,7 +193,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.3.9
+version: 0.3.10
 
 # 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

helm/gen3/README.md

@@ -1,6 +1,6 @@
 # gen3
 
-![Version: 0.3.9](https://img.shields.io/badge/Version-0.3.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.3.10](https://img.shields.io/badge/Version-0.3.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 Helm chart to deploy Gen3 Data Commons
 
@@ -51,7 +51,7 @@ Helm chart to deploy Gen3 Data Commons
 | file://../ohif-viewer | ohif-viewer | 0.1.10 |
 | file://../orthanc | orthanc | 0.1.11 |
 | file://../peregrine | peregrine | 0.1.39 |
-| file://../portal | portal | 0.1.55 |
+| file://../portal | portal | 0.1.56 |
 | file://../requestor | requestor | 0.1.31 |
 | file://../revproxy | revproxy | 0.1.53 |
 | file://../sheepdog | sheepdog | 0.1.39 |

helm/portal/Chart.yaml

@@ -15,7 +15,7 @@ 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.1.55
+version: 0.1.56
 
 # 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

helm/portal/README.md

@@ -1,6 +1,6 @@
 # portal
 
-![Version: 0.1.55](https://img.shields.io/badge/Version-0.1.55-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
+![Version: 0.1.56](https://img.shields.io/badge/Version-0.1.56-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
 
 A Helm chart for gen3 data-portal
 
@@ -88,13 +88,34 @@ A Helm chart for gen3 data-portal
 | image.tag | string | `"master"` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Docker image pull secrets. |
 | metricsEnabled | bool | `nil` | Whether Metrics are enabled. |
-| mountpointCacheBucketName | string | `""` |  |
-| mountpointCacheEnabled | bool | `false` | Whether to enable the v2 portal where it is built in s3 using mountpoint. Requires mountpoint to be enabled in the cluster. |
 | nameOverride | string | `""` | Override the name of the chart. |
 | nodeSelector | map | `{}` | Node selector to apply to the pod |
 | partOf | string | `"Front-End"` | Label to help organize pods and their use. Any value is valid, but use "_" or "-" to divide words. |
 | podAnnotations | map | `{}` | Annotations to add to the pod |
 | podSecurityContext | map | `{}` | Security context to apply to the pod |
+| portalBuild.enabled | bool | `false` |  |
+| portalBuild.extraction.stripComponents | bool | `true` |  |
+| portalBuild.hotReapply | bool | `false` |  |
+| portalBuild.images.alpine | string | `"alpine:3.20"` |  |
+| portalBuild.images.builder | string | `"quay.io/cdis/data-portal:master"` |  |
+| portalBuild.images.kubectl | string | `"bitnami/kubectl:latest"` |  |
+| portalBuild.images.nginx | string | `"nginx:alpine"` |  |
+| portalBuild.job.lockTtlSeconds | int | `1800` |  |
+| portalBuild.job.ttlSecondsAfterFinished | int | `600` |  |
+| portalBuild.rbac.enabled | bool | `true` |  |
+| portalBuild.s3csi.bucketName | string | `""` |  |
+| portalBuild.s3csi.cache.emptyDirSizeLimit | string | `"500Mi"` |  |
+| portalBuild.s3csi.createPV | bool | `false` |  |
+| portalBuild.s3csi.enabled | bool | `true` |  |
+| portalBuild.s3csi.kmsKeyArn | string | `""` |  |
+| portalBuild.s3csi.mountOptions[0] | string | `"allow-delete"` |  |
+| portalBuild.s3csi.mountOptions[1] | string | `"region us-east-1"` |  |
+| portalBuild.s3csi.pvName | string | `"webpack-pv"` |  |
+| portalBuild.s3csi.pvcName | string | `"webpack-pvc"` |  |
+| portalBuild.s3csi.size | string | `"1Gi"` |  |
+| portalBuild.s3csi.volumeHandle | string | `""` |  |
+| portalBuild.serviceAccount.annotations."eks.amazonaws.com/role-arn" | string | `""` |  |
+| portalBuild.serviceAccount.name | string | `""` |  |
 | release | string | `"production"` | Valid options are "production" or "dev". If invalid option is set- the value will default to "dev". |
 | replicaCount | int | `1` | Number of replicas for the deployment. |
 | resources | map | `{"requests":{"memory":"4096Mi"}}` | Resource requests and limits for the containers in the pod |

helm/portal/templates/crossplane.yaml

@@ -1,4 +1,4 @@
-{{- if and (.Values.global.crossplane.enabled) (.Values.mountpointCacheEnabled) }}
+{{- if and (.Values.global.crossplane.enabled) (.Values.portalBuild.enabled) }}
 apiVersion: iam.aws.crossplane.io/v1beta1
 kind: Role
 metadata:
@@ -47,14 +47,14 @@ spec:
             "Effect":"Allow",
             "Action":["s3:List*","s3:Get*"],
             "Resource":[
-              "arn:aws:s3:::{{ .Values.global.environment }}-{{ .Release.Namespace }}-portal-bucket/*",
-              "arn:aws:s3:::{{ .Values.global.environment }}-{{ .Release.Namespace }}-portal-bucket"
+              "arn:aws:s3:::{{ .Values.portalBuild.s3csi.bucketName | default (printf "%s-%s-portal-bucket" .Values.global.environment .Release.Namespace) }}/*",
+              "arn:aws:s3:::{{ .Values.portalBuild.s3csi.bucketName | default (printf "%s-%s-portal-bucket" .Values.global.environment .Release.Namespace) }}"
             ]
           },
           {
             "Effect":"Allow",
             "Action":["s3:PutObject","s3:GetObject","s3:DeleteObject"],
-            "Resource":"arn:aws:s3:::{{ .Values.global.environment }}-{{ .Release.Namespace }}-portal-bucket/*"
+            "Resource":"arn:aws:s3:::{{ .Values.portalBuild.s3csi.bucketName | default (printf "%s-%s-portal-bucket" .Values.global.environment .Release.Namespace) }}/*"
           }
         ]
       }
@@ -75,12 +75,12 @@ spec:
 apiVersion: s3.aws.crossplane.io/v1beta1
 kind: Bucket
 metadata:
-  name: "{{ .Values.global.environment }}-{{ .Release.Namespace }}-portal-bucket"
+  name: "{{ .Values.portalBuild.s3csi.bucketName | default (printf "%s-%s-portal-bucket" .Values.global.environment .Release.Namespace) }}"
 spec:
   providerConfigRef:
     name: provider-aws
   forProvider:
-    bucketName: "{{ .Values.global.environment }}-{{ .Release.Namespace }}-portal-bucket"
+    bucketName: "{{ .Values.portalBuild.s3csi.bucketName | default (printf "%s-%s-portal-bucket" .Values.global.environment .Release.Namespace) }}"
     acl: private
     forceDestroy: false
     locationConstraint: {{ .Values.global.aws.region }}
@@ -94,8 +94,13 @@ spec:
     serverSideEncryptionConfiguration:
       rules:
         - applyServerSideEncryptionByDefault:
+            {{- if .Values.portalBuild.s3csi.kmsKeyId }}
+            sseAlgorithm: aws:kms
+            kmsMasterKeyID: {{ .Values.portalBuild.s3csi.kmsKeyId }}
+            {{- else if .Values.global.crossplane.s3.kmsKeyId }}
             sseAlgorithm: aws:kms
-            {{- if .Values.global.crossplane.s3.kmsKeyId }}
             kmsMasterKeyID: {{ .Values.global.crossplane.s3.kmsKeyId }}
+            {{- else }}
+            sseAlgorithm: AES256
             {{- end }}
 {{- end}}