Respond to comments

Signed-off-by: Kevin Earls <kearls@redhat.com>
open-telemetry · Jul 15, 2022 · 81aa971 · yuriolisa · Jul 15, 2022 · yuriolisa
1 parent c733b6e
commit 81aa971
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go
@@ -37,7 +37,7 @@ type OpenTelemetryCollectorSpec struct {
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
-	// MinReplicas sets a lower bound to the autoscaling feature.
+	// MinReplicas sets a lower bound to the autoscaling feature.  It must be at least 1
 	// +optional
 	MinReplicas *int32 `json:"minReplicas,omitempty"`
 

diff --git a/apis/v1alpha1/opentelemetrycollector_webhook.go b/apis/v1alpha1/opentelemetrycollector_webhook.go
@@ -126,7 +126,7 @@ func (r *OpenTelemetryCollector) validateCRDSpec() error {
 		}
 
 		if r.Spec.MinReplicas != nil && *r.Spec.MinReplicas < int32(1) {
-			return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, minReplicas should be more than one")
+			return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, minReplicas should be one or more")
 		}
 
 	}

diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
@@ -224,7 +224,8 @@ spec:
                 format: int32
                 type: integer
               minReplicas:
-                description: MinReplicas sets a lower bound to the autoscaling feature.
+                description: MinReplicas sets a lower bound to the autoscaling feature.  It
+                  must be at least 1
                 format: int32
                 type: integer
               mode:

diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -222,7 +222,8 @@ spec:
                 format: int32
                 type: integer
               minReplicas:
-                description: MinReplicas sets a lower bound to the autoscaling feature.
+                description: MinReplicas sets a lower bound to the autoscaling feature.  It
+                  must be at least 1
                 format: int32
                 type: integer
               mode:

diff --git a/pkg/collector/reconcile/horizontalpodautoscaler_test.go b/pkg/collector/reconcile/horizontalpodautoscaler_test.go
@@ -52,7 +52,6 @@ func TestExpectedHPA(t *testing.T) {
 		maxReplicas := int32(3)
 		updateParms := paramsWithHPA()
 		updateParms.Instance.Spec.Replicas = &minReplicas
-		updateParms.Instance.Spec.Replicas = &minReplicas
 		updateParms.Instance.Spec.MaxReplicas = &maxReplicas
 		updatedHPA := collector.HorizontalPodAutoscaler(updateParms.Config, logger, updateParms.Instance)
 

diff --git a/tests/e2e/autoscale/00-install.yaml b/tests/e2e/autoscale/00-install.yaml
@@ -3,7 +3,6 @@ kind: OpenTelemetryCollector
 metadata:
   name: simplest
 spec:
-  replicas: 1
   minReplicas: 1
   maxReplicas: 2
   resources:
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,7 +126,7 @@ func (r *OpenTelemetryCollector) validateCRDSpec() error { @@
     		}
     		if r.Spec.MinReplicas != nil && *r.Spec.MinReplicas < int32(1) {
-    			return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, minReplicas should be more than one")
+    			return fmt.Errorf("the OpenTelemetry Spec autoscale configuration is incorrect, minReplicas should be one or more")
     		}
     	}
@@ Expand Down @@