deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Remove networkpolicy dup (#1302)

Browse Source
This commit is contained in:
Hang Yan 2020-08-06 17:27:36 +08:00 committed by GitHub
parent 8edc5f4d01
commit dc6975223a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/transformer/kubernetes/k8sutils.go
View File

@ -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)