From 057b9f55222d546bf363e7f252ccfb27f64f59f1 Mon Sep 17 00:00:00 2001 From: Shinnosuke Sawada-Dazai Date: Wed, 18 Dec 2024 17:41:55 +0900 Subject: [PATCH] Revert "Fix resource key to keep compatibility" Signed-off-by: Shinnosuke Sawada-Dazai This reverts commit 098d1da4753fe0a3272f5970bd98aa98065899ba. --- pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go | 7 ------- pkg/app/pipedv1/plugin/kubernetes/provider/resource.go | 3 --- 2 files changed, 10 deletions(-) diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go b/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go index 06e3353954..24b825efb0 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go @@ -60,7 +60,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "ConfigMap", - Namespace: "default", Name: "test-config", }, Body: &unstructured.Unstructured{ @@ -94,7 +93,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "ConfigMap", - Namespace: "default", Name: "test-config", }, Body: &unstructured.Unstructured{ @@ -111,7 +109,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "Service", - Namespace: "default", Name: "test-service", }, Body: &unstructured.Unstructured{ @@ -194,7 +191,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "ConfigMap", - Namespace: "default", Name: "test-config", }, Body: &unstructured.Unstructured{ @@ -237,7 +233,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "Service", - Namespace: "default", Name: "test-service", }, Body: &unstructured.Unstructured{ @@ -279,7 +274,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "ConfigMap", - Namespace: "default", Name: "test-config", }, Body: &unstructured.Unstructured{ @@ -296,7 +290,6 @@ metadata: Key: ResourceKey{ APIVersion: "v1", Kind: "Service", - Namespace: "default", Name: "test-service", }, Body: &unstructured.Unstructured{ diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/resource.go b/pkg/app/pipedv1/plugin/kubernetes/provider/resource.go index 7aeb1d6262..f626afeb58 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/resource.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/resource.go @@ -87,9 +87,6 @@ func MakeResourceKey(obj *unstructured.Unstructured) ResourceKey { Namespace: obj.GetNamespace(), Name: obj.GetName(), } - if k.Namespace == "" { - k.Namespace = DefaultNamespace - } return k }