More automated changes after 'make test'

Signed-off-by: Jake Utley <[email protected]>
open-telemetry · Mar 25, 2022 · bf64e6a · bf64e6a
1 parent 9d369c7
commit bf64e6a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -297,11 +297,15 @@ spec:
               - args:
                 - --metrics-addr=127.0.0.1:8080
                 - --enable-leader-election
+<<<<<<< HEAD
 <<<<<<< HEAD
                 image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0
 =======
                 image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.46.0-13-g4a3699a
 >>>>>>> c426cd0 (Run make bundle)
+=======
+                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.46.0
+>>>>>>> 77029c2 (More automated changes after 'make test')
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -393,11 +397,15 @@ spec:
   maturity: alpha
   provider:
     name: OpenTelemetry Community
+<<<<<<< HEAD
 <<<<<<< HEAD
   version: 0.47.0
 =======
   version: 0.46.0-13-g4a3699a
 >>>>>>> c426cd0 (Run make bundle)
+=======
+  version: 0.46.0
+>>>>>>> 77029c2 (More automated changes after 'make test')
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

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 daemonsets, statefulsets and deployments<br/>
+        </td>
+        <td>false</td>
       </tr><tr>
         <td><b>podAnnotations</b></td>
         <td>map[string]string</td>

diff --git a/pkg/collector/deployment_test.go b/pkg/collector/deployment_test.go
@@ -152,7 +152,6 @@ func TestDeploymentHostNetwork(t *testing.T) {
 	assert.Equal(t, d2.Spec.Template.Spec.DNSPolicy, v1.DNSClusterFirstWithHostNet)
 }
 
-
 func TestDeploymentNodeSelector(t *testing.T) {
 	// Test default
 	otelcol_1 := v1alpha1.OpenTelemetryCollector{