Initial docs for installing on GKE (#172)

* Initial docs for installing on GKE * More updates * Small knits * More small knits * More small knits * Add extra comma * Update turbcli config * Review fixes, remove annotation setting for GCP account update init-gke script, remove .Values.gcp.serviceAccount * Update README.md with readme-generator-for-helm Signed-off-by: wajihyassine <wajihyassine@users.noreply.github.com> * Fix global PVC name * Small indentation change * Remove create gcp SA script * Increase persistence size * Review comments from jkppr * Small nit * Small nit fix pt 2 * Update docs/installing-on-gke.md pointing to Timesketch user guide Co-authored-by: Janosch <99879757+jkppr@users.noreply.github.com> * small nit * Update processing disks section --------- Signed-off-by: wajihyassine <wajihyassine@users.noreply.github.com> Co-authored-by: wajihyassine <wajihyassine@users.noreply.github.com> Co-authored-by: Janosch <99879757+jkppr@users.noreply.github.com>
google · Dec 20, 2024 · ec61992 · ec61992
1 parent d193fd1
commit ec61992
Show file tree

Hide file tree

Showing 8 changed files with 495 additions and 99 deletions.
diff --git a/charts/turbinia/Chart.yaml b/charts/turbinia/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: turbinia
-version: 1.1.3
+version: 1.2.0
 description: A Helm chart for Turbinia Kubernetes deployments.
 keywords:
 - turbinia

diff --git a/charts/turbinia/README.md b/charts/turbinia/README.md
@@ -422,7 +422,6 @@ kubectl delete pvc -l release=my-release
 | `serviceAccount.create`           | Specifies whether a service account should be created                                                                                                                                                                | `true`                                                                                       |
 | `serviceAccount.annotations`      | Annotations to add to the service account                                                                                                                                                                            | `{}`                                                                                         |
 | `serviceAccount.name`             | The name of the Kubernetes service account to use                                                                                                                                                                    | `turbinia`                                                                                   |
-| `serviceAccount.gcpName`          | The name of the GCP service account to annotate. Applied only if `.Values.gcp.enabled` is set to `true`                                                                                                              | `turbinia`                                                                                   |
 | `service.type`                    | Turbinia service type                                                                                                                                                                                                | `ClusterIP`                                                                                  |
 | `service.port`                    | Turbinia api service port                                                                                                                                                                                            | `8000`                                                                                       |
 | `metrics.enabled`                 | Enables metrics scraping                                                                                                                                                                                             | `true`                                                                                       |

diff --git a/charts/turbinia/templates/_helpers.tpl b/charts/turbinia/templates/_helpers.tpl
@@ -61,7 +61,7 @@ Return the proper persistence volume claim name
 {{- define "turbinia.pvc.name" -}}
 {{- $pvcName := .Values.persistence.name -}}
 {{- if and .Values.global .Values.global.existingPVC -}}
-{{- .Values.global.existingPVC -}}
+{{- printf "%s-%s" .Values.global.existingPVC "claim" }}
 {{- else -}}
 {{- printf "%s-%s-claim" .Release.Name $pvcName }}
 {{- end -}}

diff --git a/charts/turbinia/templates/serviceaccount.yaml b/charts/turbinia/templates/serviceaccount.yaml
@@ -7,9 +7,9 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "turbinia.labels" . | nindent 4 }}
-  {{- if .Values.gcp.enabled }}
+  {{- if .Values.serviceAccount.annotations }}
   annotations:
-    iam.gke.io/gcp-service-account: {{ .Values.serviceAccount.gcpName }}@{{ .Values.gcp.projectID }}.iam.gserviceaccount.com
+  {{ toYaml .Values.serviceAccount.annotations | indent 4 }}
   {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/turbinia/tools/create-gcp-sa.sh b/charts/turbinia/tools/create-gcp-sa.sh
diff --git a/charts/turbinia/values.yaml b/charts/turbinia/values.yaml
@@ -321,9 +321,6 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   ##
   name: "turbinia"
-  ## @param serviceAccount.gcpName The name of the GCP service account to annotate. Applied only if `.Values.gcp.enabled` is set to `true`
-  ##
-  gcpName: "turbinia"
 ## Turbinia service parameters
 ##
 service: