feat: Adding ServiceAccountName for EventBus StatefulSet. Closes #957 (…

…#956) Signed-off-by: Carlos <[email protected]>
argoproj · Nov 16, 2020 · 7f474ef · 7f474ef
1 parent f983c4c
commit 7f474ef
Show file tree

Hide file tree

Showing 10 changed files with 186 additions and 86 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,6 @@ Argo Events is native to Kubernetes so you'll need a running Kubernetes cluster.
 ### Requirements
 - Golang 1.13
 - Docker
-- [dep](https://golang.github.io/dep/docs/installation.html)
 
 ### Installation & Setup
 
@@ -33,7 +32,6 @@ cd $GOPATH/src/github.com/argoproj/argo-events
 #### 2. Vendor dependencies
 ```
 GO111MODULE=on go get github.com/cloudevents/sdk-go
-dep ensure -vendor-only
 ```
 
 #### 3. Start Minikube and point Docker Client to Minikube's Docker Daemon
@@ -57,7 +55,7 @@ If you're making a change to the `pkg/apis`  package, please ensure you re-run t
 
 ```
 go get github.com/ahmetb/gen-crd-api-reference-docs
-cd $GOPATH/github.com/ahmetb/gen-crd-api-reference-docs
+cd $GOPATH/src/github.com/ahmetb/gen-crd-api-reference-docs
 go build
 ```
 

diff --git a/api/event-bus.html b/api/event-bus.html
diff --git a/api/event-bus.md b/api/event-bus.md
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/controllers/eventbus/installer/nats.go b/controllers/eventbus/installer/nats.go
@@ -660,10 +660,11 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec
 				Labels: podTemplateLabels,
 			},
 			Spec: corev1.PodSpec{
-				NodeSelector:     i.eventBus.Spec.NATS.Native.NodeSelector,
-				Tolerations:      i.eventBus.Spec.NATS.Native.Tolerations,
-				SecurityContext:  i.eventBus.Spec.NATS.Native.SecurityContext,
-				ImagePullSecrets: i.eventBus.Spec.NATS.Native.ImagePullSecrets,
+				NodeSelector:       i.eventBus.Spec.NATS.Native.NodeSelector,
+				Tolerations:        i.eventBus.Spec.NATS.Native.Tolerations,
+				SecurityContext:    i.eventBus.Spec.NATS.Native.SecurityContext,
+				ImagePullSecrets:   i.eventBus.Spec.NATS.Native.ImagePullSecrets,
+				ServiceAccountName: i.eventBus.Spec.NATS.Native.ServiceAccountName,
 				Volumes: []corev1.Volume{
 					{
 						Name: "config-volume",

diff --git a/controllers/eventbus/installer/nats_test.go b/controllers/eventbus/installer/nats_test.go
@@ -46,6 +46,7 @@ var (
 							Name: "test",
 						},
 					},
+					ServiceAccountName: "test",
 				},
 			},
 		},
@@ -237,3 +238,20 @@ func TestBuildPersistStatefulSetSpec(t *testing.T) {
 		assert.True(t, len(ss.Spec.Template.Spec.ImagePullSecrets) > 0)
 	})
 }
+
+func TestBuildServiceAccountStatefulSetSpec(t *testing.T) {
+	t.Run("installation with Service Account Name", func(t *testing.T) {
+		cl := fake.NewFakeClient(testEventBus)
+		installer := &natsInstaller{
+			client:         cl,
+			eventBus:       testEventBus,
+			streamingImage: testStreamingImage,
+			metricsImage:   testMetricsImage,
+			labels:         testLabels,
+			logger:         logging.NewArgoEventsLogger(),
+		}
+		ss, err := installer.buildStatefulSet("svcName", "cmName", "secretName")
+		assert.NoError(t, err)
+		assert.True(t, len(ss.Spec.Template.Spec.ServiceAccountName) > 0)
+	})
+}
diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go
diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto
diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/eventbus/v1alpha1/types.go b/pkg/apis/eventbus/v1alpha1/types.go
@@ -98,6 +98,9 @@ type NativeStrategy struct {
 	// +patchMergeKey=name
 	// +patchStrategy=merge
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,12,rep,name=imagePullSecrets"`
+	// ServiceAccountName to apply to NATS StatefulSet
+	// +optional
+	ServiceAccountName string `json:"serviceAccountName,omitempty" protobuf:"bytes,13,opt,name=serviceAccountName"`
 }
 
 // ContainerTemplate defines customized spec for a container