From 303117f2c8311561b99c5e32b1769f0e0407faa4 Mon Sep 17 00:00:00 2001 From: Tetiana Kravchenko Date: Tue, 19 Dec 2023 09:47:29 +0100 Subject: [PATCH] fix default metadata config: ensure that AddResourceMetadataConfig.Node and AddResourceMetadataConfig.Namespace are different objects Signed-off-by: Tetiana Kravchenko --- kubernetes/metadata/config.go | 7 ++++--- kubernetes/metadata/pod_test.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kubernetes/metadata/config.go b/kubernetes/metadata/config.go index 8ddce4eb6..f60b2b1eb 100644 --- a/kubernetes/metadata/config.go +++ b/kubernetes/metadata/config.go @@ -59,10 +59,11 @@ func (c *Config) Unmarshal(cfg *config.C) error { func GetDefaultResourceMetadataConfig() *AddResourceMetadataConfig { metaConfig := Config{} metaConfig.InitDefaults() - metaCfg, _ := config.NewConfigFrom(&metaConfig) + nodeCfg, _ := config.NewConfigFrom(metaConfig) + nsCfg, _ := config.NewConfigFrom(metaConfig) return &AddResourceMetadataConfig{ - Node: metaCfg, - Namespace: metaCfg, + Node: nodeCfg, + Namespace: nsCfg, Deployment: false, CronJob: false, } diff --git a/kubernetes/metadata/pod_test.go b/kubernetes/metadata/pod_test.go index 4877b7e0a..ecde511d0 100644 --- a/kubernetes/metadata/pod_test.go +++ b/kubernetes/metadata/pod_test.go @@ -430,6 +430,7 @@ func TestPod_Generate(t *testing.T) { "annotations.dedot": false, }) assert.NoError(t, err) + assert.NotEqual(t, *addResourceMetadata.Namespace, *addResourceMetadata.Node) replicaSets := cache.NewStore(cache.MetaNamespaceKeyFunc) err = replicaSets.Add(rs)