default, min, assert less

open-telemetry · May 10, 2024 · a111e27 · a111e27
1 parent 5fa0025
commit a111e27
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
@@ -5544,6 +5544,7 @@ spec:
               configVersions:
                 format: int32
                 type: integer
+                default: 3
               configmaps:
                 items:
                   properties:

diff --git a/controllers/opentelemetrycollector_controller.go b/controllers/opentelemetrycollector_controller.go
@@ -143,7 +143,7 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
 	})
 	configVersionsToKeep := 3
 	if params.OtelCol.Spec.ConfigVersions != nil {
-		configVersionsToKeep = int(*params.OtelCol.Spec.ConfigVersions)
+		configVersionsToKeep = max(1, int(*params.OtelCol.Spec.ConfigVersions))
 	}
 
 	for i := range configMapList.Items {

diff --git a/tests/e2e/versioned-configmaps/00-assert.yaml b/tests/e2e/versioned-configmaps/00-assert.yaml
@@ -10,15 +10,6 @@ spec:
         - name: otc-internal
           configMap:
             name: simple-collector-d6f40475
-            items:
-              - key: collector.yaml
-                path: collector.yaml
-            defaultMode: 420
-      containers:
-        - name: otc-container
-          volumeMounts:
-            - name: otc-internal
-              mountPath: /conf
 status:
   readyReplicas: 1
 ---

diff --git a/tests/e2e/versioned-configmaps/01-assert.yaml b/tests/e2e/versioned-configmaps/01-assert.yaml
@@ -10,15 +10,6 @@ spec:
         - name: otc-internal
           configMap:
             name: simple-collector-8cd615bf
-            items:
-              - key: collector.yaml
-                path: collector.yaml
-            defaultMode: 420
-      containers:
-        - name: otc-container
-          volumeMounts:
-            - name: otc-internal
-              mountPath: /conf
 status:
   readyReplicas: 1
 ---