Support nodeSelector field for non-sidecar collectors (open-telemetry…

…#789) * Support nodeSelector field for non-sidecar collectors Signed-off-by: Jake Utley <jutley@hiya.com> * Add tests for nodeSelector Signed-off-by: Jake Utley <jutley@hiya.com> * Revise resource names in tests Signed-off-by: Jake Utley <jutley@hiya.com> * Run make bundle Signed-off-by: Jake Utley <jutley@hiya.com> * More automated changes after 'make test' Signed-off-by: Jake Utley <jutley@hiya.com> * Manually revert changes to kustomization.yaml Signed-off-by: Jake Utley <jutley@hiya.com> * Revise field description Signed-off-by: Jake Utley <jutley@hiya.com> * Use open-telemetry image repo Signed-off-by: Jake Utley <jutley@hiya.com>
ItielOlenick · Apr 7, 2022 · 7a686d7 · 7a686d7
1 parent 754cfc5
commit 7a686d7
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 4 deletions.
diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go
@@ -108,10 +108,15 @@ type OpenTelemetryCollectorSpec struct {
 	Resources v1.ResourceRequirements `json:"resources,omitempty"`
 
 	// Toleration to schedule OpenTelemetry Collector pods.
-	// This is only relevant to daemonsets, statefulsets and deployments
+	// This is only relevant to daemonset, statefulset, and deployment mode
 	// +optional
 	Tolerations []v1.Toleration `json:"tolerations,omitempty"`
 
+	// NodeSelector to schedule OpenTelemetry Collector pods.
+	// This is only relevant to daemonset, statefulset, and deployment mode
+	// +optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
 	// PodAnnotations is the set of annotations that will be attached to
 	// Collector and Target Allocator pods.
 	// +optional

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -232,6 +232,13 @@ spec:
                 - sidecar
                 - statefulset
                 type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: NodeSelector to schedule OpenTelemetry Collector pods.
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
+                type: object
               podAnnotations:
                 additionalProperties:
                   type: string
@@ -676,7 +683,8 @@ spec:
                 type: object
               tolerations:
                 description: Toleration to schedule OpenTelemetry Collector pods.
-                  This is only relevant to daemonsets, statefulsets and deployments
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
                 items:
                   description: The pod this Toleration is attached to tolerates any
                     taint that matches the triple <key,value,effect> using the matching

diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -230,6 +230,13 @@ spec:
                 - sidecar
                 - statefulset
                 type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: NodeSelector to schedule OpenTelemetry Collector pods.
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
+                type: object
               podAnnotations:
                 additionalProperties:
                   type: string
@@ -674,7 +681,8 @@ spec:
                 type: object
               tolerations:
                 description: Toleration to schedule OpenTelemetry Collector pods.
-                  This is only relevant to daemonsets, statefulsets and deployments
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
                 items:
                   description: The pod this Toleration is attached to tolerates any
                     taint that matches the triple <key,value,effect> using the matching

diff --git a/docs/api.md b/docs/api.md
@@ -1464,6 +1464,13 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector.
             <i>Enum</i>: daemonset, deployment, sidecar, statefulset<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>nodeSelector</b></td>
+        <td>map[string]string</td>
+        <td>
+          NodeSelector to schedule OpenTelemetry Collector pods. This is only relevant to daemonset, statefulset, and deployment mode<br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>podAnnotations</b></td>
         <td>map[string]string</td>
@@ -1526,7 +1533,7 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector.
         <td><b><a href="#opentelemetrycollectorspectolerationsindex">tolerations</a></b></td>
         <td>[]object</td>
         <td>
-          Toleration to schedule OpenTelemetry Collector pods. This is only relevant to daemonsets, statefulsets and deployments<br/>
+          Toleration to schedule OpenTelemetry Collector pods. This is only relevant to daemonset, statefulset, and deployment mode<br/>
         </td>
         <td>false</td>
       </tr><tr>

diff --git a/pkg/collector/daemonset.go b/pkg/collector/daemonset.go
@@ -53,6 +53,7 @@ func DaemonSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem
 					Containers:         []corev1.Container{Container(cfg, logger, otelcol)},
 					Volumes:            Volumes(cfg, otelcol),
 					Tolerations:        otelcol.Spec.Tolerations,
+					NodeSelector:       otelcol.Spec.NodeSelector,
 					HostNetwork:        otelcol.Spec.HostNetwork,
 					DNSPolicy:          getDnsPolicy(otelcol),
 					SecurityContext:    otelcol.Spec.PodSecurityContext,

diff --git a/pkg/collector/daemonset_test.go b/pkg/collector/daemonset_test.go
@@ -153,3 +153,36 @@ func TestDaemonsetFilterLabels(t *testing.T) {
 		assert.NotContains(t, d.ObjectMeta.Labels, k)
 	}
 }
+
+func TestDaemonSetNodeSelector(t *testing.T) {
+	// Test default
+	otelcol_1 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance",
+		},
+	}
+
+	cfg := config.New()
+
+	d1 := DaemonSet(cfg, logger, otelcol_1)
+
+	assert.Empty(t, d1.Spec.Template.Spec.NodeSelector)
+
+	// Test nodeSelector
+	otelcol_2 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance-nodeselector",
+		},
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			HostNetwork: true,
+			NodeSelector: map[string]string{
+				"node-key": "node-value",
+			},
+		},
+	}
+
+	cfg = config.New()
+
+	d2 := DaemonSet(cfg, logger, otelcol_2)
+	assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"})
+}
diff --git a/pkg/collector/deployment.go b/pkg/collector/deployment.go
@@ -57,6 +57,7 @@ func Deployment(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTele
 					DNSPolicy:          getDnsPolicy(otelcol),
 					HostNetwork:        otelcol.Spec.HostNetwork,
 					Tolerations:        otelcol.Spec.Tolerations,
+					NodeSelector:       otelcol.Spec.NodeSelector,
 					SecurityContext:    otelcol.Spec.PodSecurityContext,
 				},
 			},

diff --git a/pkg/collector/deployment_test.go b/pkg/collector/deployment_test.go
@@ -175,3 +175,36 @@ func TestDeploymentFilterLabels(t *testing.T) {
 		assert.NotContains(t, d.ObjectMeta.Labels, k)
 	}
 }
+
+func TestDeploymentNodeSelector(t *testing.T) {
+	// Test default
+	otelcol_1 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance",
+		},
+	}
+
+	cfg := config.New()
+
+	d1 := Deployment(cfg, logger, otelcol_1)
+
+	assert.Empty(t, d1.Spec.Template.Spec.NodeSelector)
+
+	// Test nodeSelector
+	otelcol_2 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance-nodeselector",
+		},
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			HostNetwork: true,
+			NodeSelector: map[string]string{
+				"node-key": "node-value",
+			},
+		},
+	}
+
+	cfg = config.New()
+
+	d2 := Deployment(cfg, logger, otelcol_2)
+	assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"})
+}
diff --git a/pkg/collector/statefulset.go b/pkg/collector/statefulset.go
@@ -57,6 +57,7 @@ func StatefulSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTel
 					DNSPolicy:          getDnsPolicy(otelcol),
 					HostNetwork:        otelcol.Spec.HostNetwork,
 					Tolerations:        otelcol.Spec.Tolerations,
+					NodeSelector:       otelcol.Spec.NodeSelector,
 					SecurityContext:    otelcol.Spec.PodSecurityContext,
 				},
 			},

diff --git a/pkg/collector/statefulset_test.go b/pkg/collector/statefulset_test.go
@@ -234,3 +234,36 @@ func TestStatefulSetFilterLabels(t *testing.T) {
 		assert.NotContains(t, d.ObjectMeta.Labels, k)
 	}
 }
+
+func TestStatefulSetNodeSelector(t *testing.T) {
+	// Test default
+	otelcol_1 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance",
+		},
+	}
+
+	cfg := config.New()
+
+	d1 := StatefulSet(cfg, logger, otelcol_1)
+
+	assert.Empty(t, d1.Spec.Template.Spec.NodeSelector)
+
+	// Test nodeSelector
+	otelcol_2 := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "my-instance-nodeselector",
+		},
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			HostNetwork: true,
+			NodeSelector: map[string]string{
+				"node-key": "node-value",
+			},
+		},
+	}
+
+	cfg = config.New()
+
+	d2 := StatefulSet(cfg, logger, otelcol_2)
+	assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"})
+}