Skip to content

Commit 098d1da

Browse files
committed
Fix resource key to keep compatibility
Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]>
1 parent ccebc52 commit 098d1da

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ metadata:
6060
Key: ResourceKey{
6161
APIVersion: "v1",
6262
Kind: "ConfigMap",
63+
Namespace: "default",
6364
Name: "test-config",
6465
},
6566
Body: &unstructured.Unstructured{
@@ -93,6 +94,7 @@ metadata:
9394
Key: ResourceKey{
9495
APIVersion: "v1",
9596
Kind: "ConfigMap",
97+
Namespace: "default",
9698
Name: "test-config",
9799
},
98100
Body: &unstructured.Unstructured{
@@ -109,6 +111,7 @@ metadata:
109111
Key: ResourceKey{
110112
APIVersion: "v1",
111113
Kind: "Service",
114+
Namespace: "default",
112115
Name: "test-service",
113116
},
114117
Body: &unstructured.Unstructured{
@@ -191,6 +194,7 @@ metadata:
191194
Key: ResourceKey{
192195
APIVersion: "v1",
193196
Kind: "ConfigMap",
197+
Namespace: "default",
194198
Name: "test-config",
195199
},
196200
Body: &unstructured.Unstructured{
@@ -233,6 +237,7 @@ metadata:
233237
Key: ResourceKey{
234238
APIVersion: "v1",
235239
Kind: "Service",
240+
Namespace: "default",
236241
Name: "test-service",
237242
},
238243
Body: &unstructured.Unstructured{
@@ -274,6 +279,7 @@ metadata:
274279
Key: ResourceKey{
275280
APIVersion: "v1",
276281
Kind: "ConfigMap",
282+
Namespace: "default",
277283
Name: "test-config",
278284
},
279285
Body: &unstructured.Unstructured{
@@ -290,6 +296,7 @@ metadata:
290296
Key: ResourceKey{
291297
APIVersion: "v1",
292298
Kind: "Service",
299+
Namespace: "default",
293300
Name: "test-service",
294301
},
295302
Body: &unstructured.Unstructured{

pkg/app/pipedv1/plugin/kubernetes/provider/resource.go

+3
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ func MakeResourceKey(obj *unstructured.Unstructured) ResourceKey {
8787
Namespace: obj.GetNamespace(),
8888
Name: obj.GetName(),
8989
}
90+
if k.Namespace == "" {
91+
k.Namespace = DefaultNamespace
92+
}
9093
return k
9194
}
9295

0 commit comments

Comments
 (0)