Add creation of ServiceAccount to the Target Allocator

apis/v1alpha1/opentelemetrycollector_types.go

@@ -134,6 +134,10 @@ type OpenTelemetryTargetAllocator struct {
 	// +optional
 	PrometheusCR OpenTelemetryTargetAllocatorPrometheusCR `json:"prometheusCR,omitempty"`
 
+	// ServiceAccount indicates the name of an existing service account to use with this instance.
+	// +optional
+	ServiceAccount string `json:"serviceAccount,omitempty"`
+
 	// Image indicates the container image to use for the OpenTelemetry TargetAllocator.
 	// +optional
 	Image string `json:"image,omitempty"`

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -37,7 +37,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.49.0
+  name: opentelemetry-operator.v0.49.0-3-g665d4ad
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -297,7 +297,7 @@ spec:
               - args:
                 - --metrics-addr=127.0.0.1:8080
                 - --enable-leader-election
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.49.0
+                image: jaronoff/opentelemetry-operator:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -389,7 +389,7 @@ spec:
   maturity: alpha
   provider:
     name: OpenTelemetry Community
-  version: 0.49.0
+  version: 0.49.0-3-g665d4ad
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml

@@ -692,6 +692,10 @@ spec:
                           custom resources as targets or not.
                         type: boolean
                     type: object
+                  serviceAccount:
+                    description: ServiceAccount indicates the name of an existing
+                      service account to use with this instance.
+                    type: string
                 type: object
               tolerations:
                 description: Toleration to schedule OpenTelemetry Collector pods.

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

@@ -690,6 +690,10 @@ spec:
                           custom resources as targets or not.
                         type: boolean
                     type: object
+                  serviceAccount:
+                    description: ServiceAccount indicates the name of an existing
+                      service account to use with this instance.
+                    type: string
                 type: object
               tolerations:
                 description: Toleration to schedule OpenTelemetry Collector pods.

config/manager/kustomization.yaml

@@ -1,2 +1,8 @@
 resources:
-  - manager.yaml
+- manager.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: local/opentelemetry-operator
+  newTag: e2e

docs/api.md

@@ -2593,6 +2593,13 @@ TargetAllocator indicates a value which determines whether to spawn a target all
           PrometheusCR defines the configuration for the retrieval of PrometheusOperator CRDs ( servicemonitor.monitoring.coreos.com/v1 and podmonitor.monitoring.coreos.com/v1 )  retrieval. All CR instances which the ServiceAccount has access to will be retrieved. This includes other namespaces.<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>serviceAccount</b></td>
+        <td>string</td>
+        <td>
+          ServiceAccount indicates the name of an existing service account to use with this instance.<br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>
 

pkg/collector/reconcile/serviceaccount.go

@@ -17,6 +17,7 @@ package reconcile
 import (
 	"context"
 	"fmt"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator"
 
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -36,6 +37,10 @@ func ServiceAccounts(ctx context.Context, params Params) error {
 	if params.Instance.Spec.Mode != v1alpha1.ModeSidecar {
 		desired = append(desired, collector.ServiceAccount(params.Instance))
 	}
+	// QUESTION: Should we create the service account if someone supplies an existing name?
+	if params.Instance.Spec.TargetAllocator.Enabled {
+		desired = append(desired, targetallocator.ServiceAccount(params.Instance))
+	}
 
 	// first, handle the create/update parts
 	if err := expectedServiceAccounts(ctx, params, desired); err != nil {

pkg/collector/reconcile/serviceaccount_test.go

@@ -16,6 +16,7 @@ package reconcile
 
 import (
 	"context"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -27,15 +28,20 @@ import (
 )
 
 func TestExpectedServiceAccounts(t *testing.T) {
-	t.Run("should create service account", func(t *testing.T) {
+	t.Run("should create multiple service accounts", func(t *testing.T) {
 		desired := collector.ServiceAccount(params().Instance)
-		err := expectedServiceAccounts(context.Background(), params(), []v1.ServiceAccount{desired})
+		allocatorDesired := targetallocator.ServiceAccount(params().Instance)
+		err := expectedServiceAccounts(context.Background(), params(), []v1.ServiceAccount{desired, allocatorDesired})
 		assert.NoError(t, err)
 
 		exists, err := populateObjectIfExists(t, &v1.ServiceAccount{}, types.NamespacedName{Namespace: "default", Name: "test-collector"})
 		assert.NoError(t, err)
 		assert.True(t, exists)
 
+		allocatorExists, err := populateObjectIfExists(t, &v1.ServiceAccount{}, types.NamespacedName{Namespace: "default", Name: "test-targetallocator"})
+		assert.NoError(t, err)
+		assert.True(t, allocatorExists)
+
 	})
 
 	t.Run("should update existing service account", func(t *testing.T) {

pkg/naming/main.go

@@ -83,3 +83,8 @@ func TAService(otelcol v1alpha1.OpenTelemetryCollector) string {
 func ServiceAccount(otelcol v1alpha1.OpenTelemetryCollector) string {
 	return DNSName(Truncate("%s-collector", 63, otelcol.Name))
 }
+
+// TargetAllocatorServiceAccount returns the TargetAllocator service account resource name.
+func TargetAllocatorServiceAccount(otelcol v1alpha1.OpenTelemetryCollector) string {
+	return DNSName(Truncate("%s-targetallocator", 63, otelcol.Name))
+}

pkg/targetallocator/deployment.go

@@ -49,8 +49,9 @@ func Deployment(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTele
 					Annotations: otelcol.Spec.PodAnnotations,
 				},
 				Spec: corev1.PodSpec{
-					Containers: []corev1.Container{Container(cfg, logger, otelcol)},
-					Volumes:    Volumes(cfg, otelcol),
+					ServiceAccountName: ServiceAccountName(otelcol),
+					Containers:         []corev1.Container{Container(cfg, logger, otelcol)},
+					Volumes:            Volumes(cfg, otelcol),
 				},
 			},
 		},

pkg/targetallocator/serviceaccount.go

@@ -0,0 +1,47 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package targetallocator
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/naming"
+)
+
+// ServiceAccountName returns the name of the existing or self-provisioned service account to use for the given instance.
+func ServiceAccountName(instance v1alpha1.OpenTelemetryCollector) string {
+	if len(instance.Spec.TargetAllocator.ServiceAccount) == 0 {
+		return naming.ServiceAccount(instance)
+	}
+
+	return instance.Spec.TargetAllocator.ServiceAccount
+}
+
+//ServiceAccount returns the service account for the given instance.
+func ServiceAccount(otelcol v1alpha1.OpenTelemetryCollector) corev1.ServiceAccount {
+	labels := Labels(otelcol)
+	labels["app.kubernetes.io/name"] = naming.TargetAllocatorServiceAccount(otelcol)
+
+	return corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        naming.TargetAllocatorServiceAccount(otelcol),
+			Namespace:   otelcol.Namespace,
+			Labels:      labels,
+			Annotations: otelcol.Annotations,
+		},
+	}
+}

pkg/targetallocator/serviceaccount_test.go

@@ -0,0 +1,58 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package targetallocator_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
+	. "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator"
+)
+
+func TestServiceAccountNewDefault(t *testing.T) {
+	// prepare
+	otelcol := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance",
+		},
+	}
+
+	// test
+	sa := ServiceAccountName(otelcol)
+
+	// verify
+	assert.Equal(t, "my-instance-collector", sa)
+}
+
+func TestServiceAccountOverride(t *testing.T) {
+	// prepare
+	otelcol := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance",
+		},
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			ServiceAccount: "my-special-sa",
+		},
+	}
+
+	// test
+	sa := ServiceAccountName(otelcol)
+
+	// verify
+	assert.Equal(t, "my-special-sa", sa)
+}

tests/e2e/smoke-targetallocator/02-assert.yaml

@@ -18,4 +18,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: stateful-targetallocator
-
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: stateful-targetallocator