Skip to content

Commit ea5664b

Browse files
author
Marcos Xavier
committed
fix: Edit tests and namespace to search configmap
1 parent f6763d4 commit ea5664b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

config/manager/manager.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ metadata:
1515
# If you change this name, change in controller
1616
# cmName = "trashed-resources-config"
1717
name: config
18+
# If you change this namespace, change in code too
1819
namespace: trashed-resources-system
1920
data:
2021
namespacesToIgnore: istio-system; kube-node-lease; kube-public; kube-system

internal/controller/trashedresources_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ var _ = Describe("TrashedResource Controller", func() {
324324
// Ensure 'system' namespace exists for the ConfigMap
325325
ns = &corev1.Namespace{
326326
ObjectMeta: metav1.ObjectMeta{
327-
Name: "system",
327+
Name: "trashed-resources-system",
328328
},
329329
}
330330
// Create namespace if it doesn't exist
@@ -336,7 +336,7 @@ var _ = Describe("TrashedResource Controller", func() {
336336
cm = &corev1.ConfigMap{
337337
ObjectMeta: metav1.ObjectMeta{
338338
Name: "trashedresources-config",
339-
Namespace: "system",
339+
Namespace: "trashed-resources-system",
340340
},
341341
Data: map[string]string{
342342
"kindsToObserve": "Deployment;Secret",

internal/utils/common_interactions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func GetAllConfigsFromConfigMap(mgr ctrl.Manager, cmName string) v1.ConfigMap {
2525
logger.Info("Loading configMap " + cmName)
2626

2727
// Use APIReader instead of mgr.GetClient() because the cache is not yet initialized.
28-
if err := mgr.GetAPIReader().Get(ctx, client.ObjectKey{Namespace: "system", Name: cmName}, &cm); err != nil {
28+
if err := mgr.GetAPIReader().Get(ctx, client.ObjectKey{Namespace: "trashed-resources-system", Name: cmName}, &cm); err != nil {
2929
cm.Data = map[string]string{
3030
// are same of config/manager/manager.yaml
3131
"kindsToObserve": "Deployment;Secret;ConfigMap",

0 commit comments

Comments
 (0)