From dc6975223a0207e9a2b33221e5fb7b272905bf5b Mon Sep 17 00:00:00 2001 From: Hang Yan Date: Thu, 6 Aug 2020 17:27:36 +0800 Subject: [PATCH] Remove networkpolicy dup (#1302) --- pkg/transformer/kubernetes/k8sutils.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 9d8a1339..d125ca43 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -21,6 +21,7 @@ import ( "encoding/json" "fmt" "io/ioutil" + "k8s.io/kubernetes/pkg/api/meta" "os" "path" "path/filepath" @@ -674,16 +675,17 @@ func (k *Kubernetes) SortServicesFirst(objs *[]runtime.Object) { } // RemoveDupObjects remove objects that are dups...eg. configmaps from env. -// since we know for sure that the duplication can only happends on ConfigMap, so +// since we know for sure that the duplication can only happens on ConfigMap, so // this code will looks like this for now. +// + NetworkPolicy func (k *Kubernetes) RemoveDupObjects(objs *[]runtime.Object) { var result []runtime.Object exist := map[string]bool{} for _, obj := range *objs { - if us, ok := obj.(*api.ConfigMap); ok { - k := us.GroupVersionKind().String() + us.GetNamespace() + us.GetName() + if us, ok := obj.(meta.Object); ok { + k := obj.GetObjectKind().GroupVersionKind().String() + us.GetNamespace() + us.GetName() if exist[k] { - log.Debugf("Remove duplicate configmap: %s", us.GetName()) + log.Debugf("Remove duplicate resource: %s/%s", obj.GetObjectKind().GroupVersionKind().Kind, us.GetName()) continue } else { result = append(result, obj)