Merge pull request opendatahub-io#245 from DharmitD/mariadb-sa

Add non-default SAs to MariaDB and Minio

Author: openshift-merge-robot

config/internal/mariadb/deployment.yaml.tmpl

@@ -26,6 +26,7 @@ spec:
         component: data-science-pipelines
         dspa: {{.Name}}
     spec:
+      serviceAccountName: ds-pipelines-mariadb-sa-{{.Name}}
       containers:
         - name: mariadb
           image: {{.MariaDB.Image}}

config/internal/mariadb/sa.yaml.tmpl renamed to config/internal/mariadb/mariadb-sa.yaml.tmpl

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: mariadb-{{.Name}}
+  name: ds-pipelines-mariadb-sa-{{.Name}}
   namespace: {{.Namespace}}
   labels:
     app: mariadb-{{.Name}}

config/internal/minio/deployment.yaml.tmpl

@@ -22,6 +22,7 @@ spec:
         component: data-science-pipelines
         dspa: {{.Name}}
     spec:
+      serviceAccountName: ds-pipelines-minio-sa-{{.Name}}
       containers:
         - args:
             - server

config/internal/minio/minio-sa.yaml.tmpl

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: ds-pipelines-minio-sa-{{.Name}}
+  namespace: {{.Namespace}}
+  labels:
+    app: minio-{{.Name}}
+    component: data-science-pipelines

controllers/database.go

@@ -31,8 +31,8 @@ const dbSecret = "mariadb/secret.yaml.tmpl"
 var dbTemplates = []string{
 	"mariadb/deployment.yaml.tmpl",
 	"mariadb/pvc.yaml.tmpl",
-	"mariadb/sa.yaml.tmpl",
 	"mariadb/service.yaml.tmpl",
+	"mariadb/mariadb-sa.yaml.tmpl",
 	dbSecret,
 }
 

controllers/storage.go

@@ -34,6 +34,7 @@ var storageTemplates = []string{
 	"minio/deployment.yaml.tmpl",
 	"minio/pvc.yaml.tmpl",
 	"minio/service.yaml.tmpl",
+	"minio/minio-sa.yaml.tmpl",
 	storageSecret,
 }