Merge pull request #557 from uc-cdis/feat/jwt-bootstrap

Add pushSecret for JWT

Author: jawadqur

helm/fence/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.71
+version: 0.1.72
 
 # 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/fence/README.md

@@ -1,6 +1,6 @@
 # fence
 
-![Version: 0.1.71](https://img.shields.io/badge/Version-0.1.71-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.72](https://img.shields.io/badge/Version-0.1.71-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 Fence
 

helm/fence/templates/jwt-keys.yaml

@@ -6,4 +6,29 @@ metadata:
 type: Opaque
 data:
     jwt_private_key.pem: {{ include "getOrCreatePrivateKey" . }}
+{{- end }}
+---
+{{- if and $.Values.global.externalSecrets.deploy (or $.Values.global.externalSecrets.pushSecret .Values.externalSecrets.pushSecret) }}
+apiVersion: external-secrets.io/v1alpha1
+kind: PushSecret
+metadata:
+  name: fence-jwt-keys
+spec:
+  updatePolicy: IfNotExists
+  refreshInterval: 2m
+  secretStoreRefs:
+    {{- if ne .Values.global.externalSecrets.clusterSecretStoreRef "" }}
+    - name: {{ .Values.global.externalSecrets.clusterSecretStoreRef }}
+      kind: ClusterSecretStore
+    {{- else }}
+    - name: {{include "common.SecretStore" .}}
+      kind: SecretStore
+    {{- end }}
+  selector:
+    secret:
+      name: fence-jwt-keys
+  data:
+    - match:
+        remoteRef:
+          remoteKey: {{include "fence-jwt-keys" .}}
 {{- end }}

helm/gen3/Chart.yaml

@@ -64,7 +64,7 @@ dependencies:
     repository: "file://../frontend-framework"
     condition: frontend-framework.enabled
   - name: fence
-    version: 0.1.71
+    version: 0.1.72
     repository: "file://../fence"
     condition: fence.enabled
   - name: funnel
@@ -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.18
+version: 0.3.19
 
 # 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.18](https://img.shields.io/badge/Version-0.3.18-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.19](https://img.shields.io/badge/Version-0.3.18-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
 
@@ -33,7 +33,7 @@ Helm chart to deploy Gen3 Data Commons
 | file://../dicom-server | dicom-server | 0.1.27 |
 | file://../embedding-management-service | embedding-management-service | 0.1.4 |
 | file://../etl | etl | 0.1.22 |
-| file://../fence | fence | 0.1.71 |
+| file://../fence | fence | 0.1.72 |
 | file://../frontend-framework | frontend-framework | 0.1.22 |
 | file://../funnel | funnel | 0.1.13 |
 | file://../gen3-analysis | gen3-analysis | 0.1.9 |