From ba21e518029325b694a16df1ed43a8c722cdb8df Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Fri, 29 Jan 2021 23:16:51 +0500
Subject: [PATCH] Update ipfs chart to use common service account
 implementation

---
 test/ipfs/1.0.1/templates/deployment.yaml     |  2 +-
 test/ipfs/1.0.1/templates/serviceaccount.yaml | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/ipfs/1.0.1/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
index 0dd9a846df..f12fca07c9 100644
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
       name: {{ template "common.names.fullname" . }}
       labels: {{ include "common.labels.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{ include "ipfs.serviceAccountName" . | quote }}
+      serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }}
       initContainers:
         - name: init-init
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
diff --git a/test/ipfs/1.0.1/templates/serviceaccount.yaml b/test/ipfs/1.0.1/templates/serviceaccount.yaml
index 05d1db5bbe..811923611e 100644
--- a/test/ipfs/1.0.1/templates/serviceaccount.yaml
+++ b/test/ipfs/1.0.1/templates/serviceaccount.yaml
@@ -1,9 +1 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ipfs.serviceAccountName" . | quote }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels:
-    app: {{ template "ipfs.name" . }}
-    chart: {{ template "ipfs.chart" . }}
-    release: "{{ .Release.Name }}"
+{{- include "common.serviceaccount" . -}}