From 72513551b8489de68d2e1f20284b2f0962f6e514 Mon Sep 17 00:00:00 2001
From: farida azmy <farida.azmy.ext@orange.com>
Date: Tue, 12 Oct 2021 18:55:21 +0200
Subject: [PATCH] [MULTICLOUD] Update chart with service account

Add service account to requirements, values and deployment/statefulset

Issue-ID: OOM-2862
Signed-off-by: farida azmy <farida.azmy.ext@orange.com>
Change-Id: Ia20fb51256e20e6582a2b9e0d89159742992fea4
---
 kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml | 3 +++
 .../components/multicloud-fcaps/templates/deployment.yaml           | 2 +-
 kubernetes/multicloud/components/multicloud-fcaps/values.yaml       | 6 ++++++
 kubernetes/multicloud/components/multicloud-k8s/requirements.yaml   | 3 +++
 .../multicloud/components/multicloud-k8s/templates/deployment.yaml  | 2 +-
 kubernetes/multicloud/components/multicloud-k8s/values.yaml         | 6 ++++++
 kubernetes/multicloud/components/multicloud-pike/requirements.yaml  | 3 +++
 .../multicloud/components/multicloud-pike/templates/deployment.yaml | 2 +-
 kubernetes/multicloud/components/multicloud-pike/values.yaml        | 6 ++++++
 .../multicloud/components/multicloud-prometheus/requirements.yaml   | 3 +++
 .../components/multicloud-prometheus/templates/deployment.yaml      | 1 +
 kubernetes/multicloud/components/multicloud-prometheus/values.yaml  | 6 ++++++
 .../multicloud/components/multicloud-starlingx/requirements.yaml    | 3 +++
 .../components/multicloud-starlingx/templates/deployment.yaml       | 2 +-
 kubernetes/multicloud/components/multicloud-starlingx/values.yaml   | 6 ++++++
 kubernetes/multicloud/components/multicloud-vio/requirements.yaml   | 3 +++
 .../multicloud/components/multicloud-vio/templates/deployment.yaml  | 1 +
 kubernetes/multicloud/components/multicloud-vio/values.yaml         | 6 ++++++
 .../multicloud/components/multicloud-windriver/requirements.yaml    | 3 +++
 .../components/multicloud-windriver/templates/deployment.yaml       | 2 +-
 kubernetes/multicloud/components/multicloud-windriver/values.yaml   | 6 ++++++
 kubernetes/multicloud/requirements.yaml                             | 3 +++
 kubernetes/multicloud/templates/deployment.yaml                     | 1 +
 kubernetes/multicloud/values.yaml                                   | 6 ++++++
 24 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
index c2d6f85118..27373df61e 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
@@ -21,3 +21,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index 99d2314a07..b438bf0066 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -100,7 +100,7 @@ spec:
      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.rabbitmq }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        name: rabbit-mq
-
+     serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: fcaps-log
        emptyDir: {}
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index af222eb40b..39ddbae5b7 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -89,3 +89,9 @@ resources:
 
 # rabbit-mq image resource
 rabbitmq: rabbitmq:alpine
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-fcaps
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
index 434abf9ab5..eebca63b29 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
@@ -29,3 +29,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 9f50d35784..e63be9c81c 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -85,7 +85,7 @@ spec:
           subPath: config.json
         - mountPath: /data
           name: artifact-data
-
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: localtime
         hostPath:
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 0126594693..1c7c8fa489 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -133,3 +133,9 @@ resources:
       cpu: 10m
       memory: 100Mi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-k8s
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
index c2d6f85118..27373df61e 100644
--- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
@@ -21,3 +21,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index dd2e3beec5..d12e663236 100644
--- a/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -99,7 +99,7 @@ spec:
          name: pike-log
        - mountPath: /usr/share/filebeat/data
          name: pike-data-filebeat
-
+     serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: pike-log
        emptyDir: {}
diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index edd86097bc..5ef87f46b6 100644
--- a/kubernetes/multicloud/components/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -86,3 +86,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-pike
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index 09630f0989..eb40843bf1 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -27,3 +27,6 @@ dependencies:
   - name: prometheus-grafana
     version: ~9.x-0
     repository: 'file://components/prometheus-grafana'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
index 3a5c8edb5f..74941292fd 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
@@ -105,6 +105,7 @@ spec:
       affinity:
 {{ toYaml .Values.affinity | indent 8 }}
       {{- end }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: {{ include "common.fullname" . }}-config
           configMap:
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
index fa949c0c75..757041ce43 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
@@ -100,3 +100,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-prometheus
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
index c2d6f85118..27373df61e 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
@@ -21,3 +21,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index 5413327d0b..7c39bb7006 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -111,7 +111,7 @@ spec:
           subPath: config.json
         - mountPath: /data
           name: artifact-data
-
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: starlingx-log
         emptyDir: {}
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index aa471027f1..69e4d943bd 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -88,3 +88,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-starlingx
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
index c2d6f85118..27373df61e 100644
--- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
@@ -21,3 +21,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
index 520f86a7d1..5548359b12 100644
--- a/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
@@ -94,6 +94,7 @@ spec:
          name: vio-log
        - mountPath: /usr/share/filebeat/data
          name: vio-data-filebeat
+     serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: vio-log
        emptyDir: {}
diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/kubernetes/multicloud/components/multicloud-vio/values.yaml
index 1a5af2ca48..5b218f1e75 100644
--- a/kubernetes/multicloud/components/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/values.yaml
@@ -85,3 +85,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-vio
+  roles:
+    - read
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
index c2d6f85118..27373df61e 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
@@ -21,3 +21,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~9.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index 2ed0b13249..f46e45017d 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -120,7 +120,7 @@ spec:
           subPath: config.json
         - mountPath: /data
           name: artifact-data
-
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: windriver-log
         emptyDir: {}
diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index f7e01df87d..d520a783b7 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -97,3 +97,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud-windriver
+  roles:
+    - read
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index 2af2eb92ae..84099b2171 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -49,3 +49,6 @@ dependencies:
     version: ~9.x-0
     repository: 'file://components/multicloud-windriver'
     condition: multicloud-windriver.enabled
+  - name: serviceAccount
+    version: ~9.x-0
+    repository: '@local'
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index a5b8297e2f..34fe6224bc 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -100,6 +100,7 @@ spec:
          name: framework-log
        - mountPath: /usr/share/filebeat/data
          name: framework-data-filebeat
+     serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
      volumes:
      - name: framework-log
        emptyDir: {}
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 251ab022bf..90e72be044 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -108,3 +108,9 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud
+  roles:
+    - read
-- 
2.16.6