From 1e05f29e3d40e0b32eb79498a1d0bc77f32a762d Mon Sep 17 00:00:00 2001
From: farida azmy <farida.azmy.ext@orange.com>
Date: Sun, 3 Oct 2021 13:22:55 +0200
Subject: [PATCH] [HOLMES] Update chart with service account

Add service account to requirements, values and deployment/statefulset

Issue-ID: OOM-2849
Signed-off-by: farida azmy <farida.azmy.ext@orange.com>
Change-Id: I9b92b925576c3f85d5dbd0a02a6c454eddd9961d
---
 kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml   | 3 +++
 .../holmes/components/holmes-engine-mgmt/templates/deployment.yaml  | 1 +
 kubernetes/holmes/components/holmes-engine-mgmt/values.yaml         | 6 ++++++
 kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml     | 3 +++
 .../holmes/components/holmes-rule-mgmt/templates/deployment.yaml    | 1 +
 kubernetes/holmes/components/holmes-rule-mgmt/values.yaml           | 6 ++++++
 6 files changed, 20 insertions(+)

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
index 9366bd1e2b..ab839d0a5c 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/requirements.yaml
@@ -22,3 +22,6 @@ dependencies:
   - name: certInitializer
     version: ~8.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index fae06da475..45c268c6b6 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -115,6 +115,7 @@ spec:
           value: {{ .Values.config.pgConfig.dbHost }}
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
       - name: {{ include "common.fullname" . }}-config
         configMap:
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index bbdc3e09cd..1bdf35da21 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -128,3 +128,9 @@ resources:
       cpu: 250m
       memory: 1Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: holmes-engine-mgmt
+  roles:
+    - read
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
index 9366bd1e2b..ab839d0a5c 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/requirements.yaml
@@ -22,3 +22,6 @@ dependencies:
   - name: certInitializer
     version: ~8.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index e03c6cbb9c..d757b75d68 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -114,6 +114,7 @@ spec:
           value: {{ .Values.config.pgConfig.dbHost }}
         - name: DB_PORT
           value: "{{ .Values.config.pgConfig.dbPort }}"
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:  {{ include "common.certInitializer.volumes" . | nindent 6 }}
       - name: {{ include "common.fullname" . }}-config
         configMap:
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 4f4849a5a4..6261b4ebd7 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -132,3 +132,9 @@ resources:
       cpu: 500m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: holmes-rule-mgmt
+  roles:
+    - read
-- 
2.16.6