Support Google Workload Identity Federation

ref DEV-1689
authgear · Aug 30, 2024 · d7ce9e0 · d7ce9e0
2 parents a2b632a + 038d933
commit d7ce9e0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/.cr-index/index.yaml b/.cr-index/index.yaml
@@ -1,6 +1,16 @@
 apiVersion: v1
 entries:
   authgear:
+  - apiVersion: v2
+    appVersion: 0.1.0
+    created: "2024-08-30T17:35:46.525425+08:00"
+    description: A Helm chart for Authgear
+    digest: 5dfa6fe75a82de8bfd1741319787fce8e03a3822ee58a942c2d6e0d5b6344c37
+    name: authgear
+    type: application
+    urls:
+    - https://github.com/authgear/helm-charts/releases/download/authgear-10.13.0/authgear-10.13.0.tgz
+    version: 10.13.0
   - apiVersion: v2
     appVersion: 0.1.0
     created: "2024-08-22T18:03:49.211938+08:00"
@@ -1061,4 +1071,4 @@ entries:
     urls:
     - https://github.com/authgear/helm-charts/releases/download/authgear-0.1.0/authgear-0.1.0.tgz
     version: 0.1.0
-generated: "2024-08-22T18:04:09.920146+08:00"
+generated: "2024-08-30T17:36:05.970595+08:00"
diff --git a/.cr-release-packages/authgear-10.13.0.tgz b/.cr-release-packages/authgear-10.13.0.tgz
diff --git a/authgear/Chart.yaml b/authgear/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 type: application
 name: authgear
 description: A Helm chart for Authgear
-version: 10.12.1
+version: 10.13.0
 appVersion: 0.1.0
diff --git a/authgear/templates/authgear-images-server.yaml b/authgear/templates/authgear-images-server.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.authgear.imagesServer.objectStore.type "GCP_GCS" }}
+{{- if .Values.authgear.imagesServer.objectStore.gcpGCS.credentialsJSONContent }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -25,13 +25,15 @@ spec:
       labels:
         {{- include "authgear.imagesSelectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{ include "authgear.nameMain" . | quote }}
+      {{- if .Values.authgear.imagesServer.serviceAccountName }}
+      serviceAccountName: {{ .Values.authgear.imagesServer.serviceAccountName | quote }}
+      {{- end }}
       volumes:
       {{- if .Values.authgear.appCustomResources.path }}
       - name: custom-resources
         {{- toYaml .Values.authgear.appCustomResources.volume | nindent 8 }}
       {{- end }}
-      {{- if eq .Values.authgear.imagesServer.objectStore.type "GCP_GCS" }}
+      {{- if .Values.authgear.imagesServer.objectStore.gcpGCS.credentialsJSONContent }}
       - name: gcp-credentials
         configMap:
           name: {{ include "authgear.nameImages" . | quote }}
@@ -68,7 +70,7 @@ spec:
         - name: custom-resources
           mountPath: {{ .Values.authgear.appCustomResources.path | quote }}
         {{- end }}
-        {{- if eq .Values.authgear.imagesServer.objectStore.type "GCP_GCS" }}
+        {{- if .Values.authgear.imagesServer.objectStore.gcpGCS.credentialsJSONContent }}
         - name: gcp-credentials
           mountPath: /var/authgear/images/gcp
         {{- end }}
@@ -122,8 +124,10 @@ spec:
           value: {{ .Values.authgear.imagesServer.objectStore.gcpGCS.bucketName | quote }}
         - name: IMAGES_OBJECT_STORE_GCP_GCS_SERVICE_ACCOUNT
           value: {{ .Values.authgear.imagesServer.objectStore.gcpGCS.serviceAccount | quote }}
+          {{- if .Values.authgear.imagesServer.objectStore.gcpGCS.credentialsJSONContent }}
         - name: IMAGES_OBJECT_STORE_GCP_GCS_CREDENTIALS_JSON_PATH
           value: /var/authgear/images/gcp/credentials.json
+          {{- end }}
         {{- end }}
         {{- if eq .Values.authgear.imagesServer.objectStore.type "AZURE_BLOB_STORAGE" }}
         - name: IMAGES_OBJECT_STORE_AZURE_BLOB_STORAGE_STORAGE_ACCOUNT

diff --git a/authgear/values.yaml b/authgear/values.yaml
@@ -293,6 +293,7 @@ authgear:
         container: ""
         accessKey: ""
 
+    serviceAccountName: ""
     nodeSelector: {}
     nodeName: ""
     affinity: {}