Adding helm support for deploying the operators

Author: ewoutp

manifests/templates/deployment-replication/deployment-replication.yaml

@@ -1,3 +1,4 @@
+{{ .DeploymentReplication.FilterStart }}
 
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -14,6 +15,7 @@ spec:
         name: {{ .DeploymentReplication.OperatorDeploymentName }}
         app: arango-deployment-replication-operator
     spec:
+      serviceAccountName: {{ .DeploymentReplication.Operator.ServiceAccountName }}
       containers:
       - name: operator
         imagePullPolicy: {{ .ImagePullPolicy }}
@@ -59,3 +61,5 @@ spec:
         operator: "Exists"
         effect: "NoExecute"
         tolerationSeconds: 5
+
+{{ .DeploymentReplication.FilterEnd }}

manifests/templates/deployment-replication/rbac.yaml

@@ -1,4 +1,6 @@
-{{- if .RBAC -}}
+{{ .DeploymentReplication.FilterStart }}
+{{ .RBACFilterStart }}
+
 ## Cluster role granting access to ArangoDeploymentReplication resources.
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -72,4 +74,5 @@ subjects:
   name: {{ .DeploymentReplication.Operator.ServiceAccountName }}
   namespace: {{ .DeploymentReplication.Operator.Namespace }}
 
-{{- end -}}
+{{ .RBACFilterEnd }}
+{{ .DeploymentReplication.FilterEnd }}

manifests/templates/deployment-replication/service.yaml

@@ -1,3 +1,5 @@
+{{ .DeploymentReplication.FilterStart }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +19,5 @@ spec:
     app: arango-deployment-replication-operator
     role: leader
   type: {{ .DeploymentReplication.Operator.ServiceType }}
+
+{{ .DeploymentReplication.FilterEnd }}

manifests/templates/deployment/deployment.yaml

@@ -1,3 +1,4 @@
+{{ .Deployment.FilterStart }}
 
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -14,6 +15,7 @@ spec:
         name: {{ .Deployment.OperatorDeploymentName }}
         app: arango-deployment-operator
     spec:
+      serviceAccountName: {{ .Deployment.Operator.ServiceAccountName }}
       containers:
       - name: operator
         imagePullPolicy: {{ .ImagePullPolicy }}
@@ -60,3 +62,5 @@ spec:
         operator: "Exists"
         effect: "NoExecute"
         tolerationSeconds: 5
+
+{{ .Deployment.FilterEnd }}

manifests/templates/deployment/rbac.yaml

@@ -1,4 +1,6 @@
-{{- if .RBAC -}}
+{{ .Deployment.FilterStart }}
+{{ .RBACFilterStart }}
+
 ## Cluster role granting access to ArangoDeployment resources.
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -72,4 +74,5 @@ subjects:
   name: {{ .Deployment.Operator.ServiceAccountName }}
   namespace: {{ .Deployment.Operator.Namespace }}
 
-{{- end -}}
+{{ .RBACFilterEnd }}
+{{ .Deployment.FilterEnd }}

manifests/templates/deployment/service.yaml

@@ -1,3 +1,5 @@
+{{ .Deployment.FilterStart }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +19,5 @@ spec:
     app: arango-deployment-operator
     role: leader
   type: {{ .Deployment.Operator.ServiceType }}
+
+{{ .Deployment.FilterEnd }}

manifests/templates/storage/deployment.yaml

@@ -1,3 +1,5 @@
+{{ .Storage.FilterStart }}
+
 ## Service accounts
 apiVersion: v1
 kind: ServiceAccount
@@ -68,3 +70,5 @@ spec:
         operator: "Exists"
         effect: "NoExecute"
         tolerationSeconds: 5
+
+{{ .Storage.FilterEnd }}

manifests/templates/storage/rbac.yaml

@@ -1,5 +1,6 @@
+{{ .Storage.FilterStart }}
+{{ .RBACFilterStart }}
 
-{{- if .RBAC -}}
 ## Cluster role granting access to ArangoLocalStorage resources.
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -81,4 +82,6 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Storage.Operator.ServiceAccountName }}
   namespace: {{ .Storage.Operator.Namespace }}
-{{- end -}}
+
+{{ .RBACFilterEnd }}
+{{ .Storage.FilterEnd }}

manifests/templates/storage/service.yaml

@@ -1,3 +1,5 @@
+{{ .Storage.FilterStart }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +19,5 @@ spec:
     app: arango-storage-operator
     role: leader
   type: {{ .Storage.Operator.ServiceType }}
+
+{{ .Storage.FilterEnd }}

manifests/templates/test/rbac.yaml

@@ -1,4 +1,4 @@
-{{- if .RBAC -}}
+{{ .RBACFilterStart }}
 
 ## Cluster role granting access to resources needed by the integration tests.
 apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -34,4 +34,4 @@ subjects:
   name: {{ .Test.ServiceAccountName }}
   namespace: {{ .Test.Namespace }}
 
-{{- end -}}
+{{ .RBACFilterEnd }}