diff --git a/charts/model-engine/templates/service_account.yaml b/charts/model-engine/templates/service_account.yaml index c226505f..dcf93135 100644 --- a/charts/model-engine/templates/service_account.yaml +++ b/charts/model-engine/templates/service_account.yaml @@ -10,12 +10,19 @@ metadata: namespace: {{- printf " %s" $namespace }} labels: {{- $labels | nindent 4 }} - {{- with $annotations }} + {{- if or $annotations .Values.azure .Values.gcp }} annotations: + {{- with $annotations }} {{- toYaml . | nindent 4 }} + {{- end }} {{- if $.Values.azure }} azure.workload.identity/client-id: {{ $.Values.azure.client_id }} {{- end }} + {{- if $.Values.gcp }} + {{- if $.Values.gcp.iam_service_account }} + iam.gke.io/gcp-service-account: {{ $.Values.gcp.iam_service_account }} + {{- end }} + {{- end }} {{- end }} {{- if $.Values.azure }} imagePullSecrets: diff --git a/charts/model-engine/templates/service_account_inference.yaml b/charts/model-engine/templates/service_account_inference.yaml index 712f9df5..4907a05d 100644 --- a/charts/model-engine/templates/service_account_inference.yaml +++ b/charts/model-engine/templates/service_account_inference.yaml @@ -20,6 +20,13 @@ metadata: azure.workload.identity/client-id: {{ $.Values.azure.client_id }} {{- end }} {{- end }} + {{- if $.Values.gcp }} + {{- if $.Values.gcp.inference_service_account }} + iam.gke.io/gcp-service-account: {{ $.Values.gcp.inference_service_account }} + {{- else if $.Values.gcp.iam_service_account }} + iam.gke.io/gcp-service-account: {{ $.Values.gcp.iam_service_account }} + {{- end }} + {{- end }} {{- end }} {{- if $.Values.azure }} imagePullSecrets: