From 9c61f19d9b07c227b61d29cc1a32419148e6854f Mon Sep 17 00:00:00 2001
From: Jake Utley <jutley@hiya.com>
Date: Fri, 25 Mar 2022 08:44:57 -0700
Subject: [PATCH] Revise field description

Signed-off-by: Jake Utley <jutley@hiya.com>
---
 apis/v1alpha1/opentelemetrycollector_types.go  |  4 ++--
 ...lemetry-operator.clusterserviceversion.yaml | 18 +-----------------
 ...entelemetry.io_opentelemetrycollectors.yaml |  6 ++++--
 ...entelemetry.io_opentelemetrycollectors.yaml |  6 ++++--
 docs/api.md                                    |  4 ++--
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go
index 98dfa9e52a..b20332d658 100644
--- a/apis/v1alpha1/opentelemetrycollector_types.go
+++ b/apis/v1alpha1/opentelemetrycollector_types.go
@@ -108,12 +108,12 @@ 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 daemonsets, statefulsets and deployments
+	// This is only relevant to daemonset, statefulset, and deployment mode
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
index 1c84b6c46a..c642a4434c 100644
--- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -297,15 +297,7 @@ 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')
+                image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.47.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -397,15 +389,7 @@ 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/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
index c44b19f5ed..871fb595ad 100644
--- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -236,7 +236,8 @@ spec:
                 additionalProperties:
                   type: string
                 description: NodeSelector to schedule OpenTelemetry Collector pods.
-                  This is only relevant to daemonsets, statefulsets and deployments
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
                 type: object
               podAnnotations:
                 additionalProperties:
@@ -682,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
index 9bb28e7234..1621d0e6f0 100644
--- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
+++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -234,7 +234,8 @@ spec:
                 additionalProperties:
                   type: string
                 description: NodeSelector to schedule OpenTelemetry Collector pods.
-                  This is only relevant to daemonsets, statefulsets and deployments
+                  This is only relevant to daemonset, statefulset, and deployment
+                  mode
                 type: object
               podAnnotations:
                 additionalProperties:
@@ -680,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
index 0f63682c56..dd4693b9c7 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -1468,7 +1468,7 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector.
         <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/>
+          NodeSelector to schedule OpenTelemetry Collector pods. This is only relevant to daemonset, statefulset, and deployment mode<br/>
         </td>
         <td>false</td>
       </tr><tr>
@@ -1533,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>