-
Notifications
You must be signed in to change notification settings - Fork 458
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix optional resource deletion for collector CR (#3494)
* Fix optional resource deletion for collector CR * Refactor ConfigMap version keeping * Revert change to clusterrole management * Code Review fixes
- Loading branch information
Showing
11 changed files
with
851 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: bug_fix | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) | ||
component: collector | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Fix deletion of optional resources for OpenTelemetryCollector CRs | ||
|
||
# One or more tracking issues related to the change | ||
issues: [3454] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package controllers | ||
|
||
import ( | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/assert" | ||
corev1 "k8s.io/api/core/v1" | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
) | ||
|
||
func TestGetCollectorConfigMapsToKeep(t *testing.T) { | ||
now := time.Now() | ||
testCases := []struct { | ||
name string | ||
versionsToKeep int | ||
input []*corev1.ConfigMap | ||
output []*corev1.ConfigMap | ||
}{ | ||
{ | ||
name: "no configmaps", | ||
input: []*corev1.ConfigMap{}, | ||
output: []*corev1.ConfigMap{}, | ||
}, | ||
{ | ||
name: "one configmap", | ||
input: []*corev1.ConfigMap{ | ||
{}, | ||
}, | ||
output: []*corev1.ConfigMap{ | ||
{}, | ||
}, | ||
}, | ||
{ | ||
name: "two configmaps, keep one", | ||
input: []*corev1.ConfigMap{ | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now}}}, | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Second)}}}, | ||
}, | ||
output: []*corev1.ConfigMap{ | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Second)}}}, | ||
}, | ||
}, | ||
{ | ||
name: "three configmaps, keep two", | ||
versionsToKeep: 2, | ||
input: []*corev1.ConfigMap{ | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now}}}, | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Second)}}}, | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Minute)}}}, | ||
}, | ||
output: []*corev1.ConfigMap{ | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Minute)}}}, | ||
{ObjectMeta: metav1.ObjectMeta{CreationTimestamp: metav1.Time{Time: now.Add(time.Second)}}}, | ||
}, | ||
}, | ||
} | ||
for _, tc := range testCases { | ||
t.Run(tc.name, func(t *testing.T) { | ||
actualOutput := getCollectorConfigMapsToKeep(tc.versionsToKeep, tc.input) | ||
assert.Equal(t, tc.output, actualOutput) | ||
}) | ||
} | ||
} |
Oops, something went wrong.