From e273f78d8b8b5eb418535e2c837fe908faa95f2d Mon Sep 17 00:00:00 2001
From: farida azmy <farida.azmy.ext@orange.com>
Date: Sat, 2 Oct 2021 16:04:52 +0200
Subject: [CONTRIB] Update chart with service account

Add service account to requirements, values and deployment/statefulset

Issue-ID: OOM-2848
Signed-off-by: farida azmy <farida.azmy.ext@orange.com>
Change-Id: Ide9dc7237dfe87c71a868274f5f102b7b17ac9e5
---
 .../components/awx/components/awx-postgres/requirements.yaml        | 3 +++
 .../awx/components/awx-postgres/templates/deployment.yaml           | 1 +
 .../contrib/components/awx/components/awx-postgres/values.yaml      | 6 ++++++
 kubernetes/contrib/components/awx/requirements.yaml                 | 3 +++
 kubernetes/contrib/components/awx/templates/statefulset.yaml        | 2 +-
 kubernetes/contrib/components/awx/values.yaml                       | 6 ++++++
 6 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'kubernetes/contrib/components/awx')

diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
index d6f5f56197..b7c4d1e7f8 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
@@ -19,3 +19,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~8.x-0
     repository: '@local'
+  - name: serviceAccount
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml
index c0c6b914fb..3b4dad55ec 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml
@@ -74,6 +74,7 @@ spec:
       affinity:
 {{ toYaml .Values.affinity | indent 10 }}
       {{- end }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: localtime
           hostPath:
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
index a7234caceb..4cf03b2482 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
@@ -80,3 +80,9 @@ service:
   externalPort: 5432
 
 resources: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: awx-postgres
+  roles:
+    - read
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index b015bd1216..222db3890e 100755
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
@@ -22,3 +22,6 @@ dependencies:
   - name: awx-postgres
     version: ~8.x-0
     repository: 'file://components/awx-postgres'
+  - name: serviceAccount
+    version: ~8.x-0
+    repository: '@local'
diff --git a/kubernetes/contrib/components/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/templates/statefulset.yaml
index 1f2c093742..9910aa4634 100644
--- a/kubernetes/contrib/components/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/components/awx/templates/statefulset.yaml
@@ -180,7 +180,7 @@ spec:
             cpu: 500m
             memory: 1Gi
       serviceAccount: {{ include "common.fullname" . }}
-      serviceAccountName: {{ include "common.fullname" . }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - configMap:
           defaultMode: 420
diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 02642fd3fd..0a247c5743 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -109,3 +109,9 @@ service:
       externalPort: 5672
 
 resources: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: awx
+  roles:
+    - read
-- 
cgit 1.2.3-korg