cleanup: removes uneeded annotation when not using network policy (#1884

)

#### What type of PR is this?

<!--
Add one of the following kinds:
/kind bug
/kind documentation
/kind feature
-->

/kind cleanup

#### What this PR does / why we need it:

Removes the network policy annotation which is not needed (we are not
generating network policy)

#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #1759

#### Special notes for your reviewer:

pkg/transformer/kubernetes/k8sutils.go

@@ -503,13 +503,20 @@ func (k *Kubernetes) CreateHeadlessService(name string, service kobject.ServiceC
 }
 
 // UpdateKubernetesObjectsMultipleContainers method updates the kubernetes objects with the necessary data
-func (k *Kubernetes) UpdateKubernetesObjectsMultipleContainers(name string, service kobject.ServiceConfig, objects *[]runtime.Object, podSpec PodSpec) error {
+func (k *Kubernetes) UpdateKubernetesObjectsMultipleContainers(name string, service kobject.ServiceConfig, objects *[]runtime.Object, podSpec PodSpec, opt kobject.ConvertOptions) error {
 	// Configure annotations
 	annotations := transformer.ConfigAnnotations(service)
 
 	// fillTemplate fills the pod template with the value calculated from config
 	fillTemplate := func(template *api.PodTemplateSpec) error {
-		template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)
+
+		// We will ONLY add config labels with network if we actually
+		// passed in --generate-network-policies to the kompose command
+		if opt.GenerateNetworkPolicies {
+			template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)
+		} else {
+			template.ObjectMeta.Labels = transformer.ConfigLabels(name)
+		}
 		template.Spec = podSpec.Get()
 		return nil
 	}
@@ -660,7 +667,13 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
 			template.Spec.SecurityContext = podSecurityContext
 		}
 		template.Spec.Containers[0].Ports = ports
-		template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)
+
+		// Only add network mode if generate-network-policies is set
+		if opt.GenerateNetworkPolicies {
+			template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)
+		} else {
+			template.ObjectMeta.Labels = transformer.ConfigLabels(name)
+		}
 
 		// Configure the image pull policy
 		policy, err := GetImagePullPolicy(name, service.ImagePullPolicy)

pkg/transformer/kubernetes/kubernetes.go

@@ -1600,7 +1600,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
 					podSpec.Append(ServiceAccountName(serviceAccountName))
 				}
 
-				err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec)
+				err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec, opt)
 				if err != nil {
 					return nil, errors.Wrap(err, "Error transforming Kubernetes objects")
 				}

pkg/transformer/kubernetes/kubernetes_test.go

@@ -50,7 +50,6 @@ func newServiceConfig() kobject.ServiceConfig {
 		WorkingDir:      "dir",
 		Args:            []string{"arg1", "arg2"},
 		VolList:         []string{"/tmp/volume"},
-		Network:         []string{"network1", "network2"}, // supported
 		Labels:          nil,
 		FsGroup:         1001,
 		Annotations:     map[string]string{"abc": "def"},

script/test/fixtures/change-in-volume/output-k8s-empty-vols-template.yaml

@@ -44,7 +44,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
@@ -69,7 +68,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/change-in-volume/output-k8s.yaml

@@ -44,7 +44,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
@@ -69,7 +68,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/change-in-volume/output-os-empty-vols-template.yaml

@@ -43,7 +43,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
@@ -96,7 +95,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/change-in-volume/output-os.yaml

@@ -43,7 +43,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: redis
     spec:
       containers:
@@ -96,7 +95,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/change-in-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/compose-env-interpolation/output-k8s.yaml

@@ -28,7 +28,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/compose-env-interpolation-default: "true"
         io.kompose.service: foo
     spec:
       containers:

script/test/fixtures/compose-file-env-variable/output-k8s.yaml

@@ -43,7 +43,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/compose-file-env-variable-default: "true"
         io.kompose.service: alpine
     spec:
       containers:
@@ -69,7 +68,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/compose-file-env-variable-default: "true"
         io.kompose.service: debian
     spec:
       containers:

script/test/fixtures/compose-file-support/output-k8s.yaml

@@ -29,7 +29,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/compose-file-support-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-k8s-1.yaml

@@ -33,7 +33,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-k8s-2.yaml

@@ -33,7 +33,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-k8s-3.yaml

@@ -33,7 +33,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-os-1.yaml

@@ -32,7 +32,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-os-2.yaml

@@ -32,7 +32,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-file-configs/output-os-3.yaml

@@ -32,7 +32,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-file-configs-default: "true"
         io.kompose.service: busy
     spec:
       containers:

script/test/fixtures/configmap-pod/output-k8s.yaml

@@ -19,7 +19,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   labels:
-    io.kompose.network/configmap-pod-default: "true"
     io.kompose.service: redis
   name: redis
 spec:

script/test/fixtures/configmap-pod/output-os.yaml

@@ -19,7 +19,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   labels:
-    io.kompose.network/configmap-pod-default: "true"
     io.kompose.service: redis
   name: redis
 spec:

script/test/fixtures/configmap-volume/output-k8s-withlabel.yaml

@@ -15,7 +15,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: db
     spec:
       containers:
@@ -63,7 +62,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/configmap-volume/output-k8s.yaml

@@ -15,7 +15,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: db
     spec:
       containers:
@@ -64,7 +63,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/configmap-volume/output-os-withlabel.yaml

@@ -14,7 +14,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: db
     spec:
       containers:
@@ -90,7 +89,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/configmap-volume/output-os.yaml

@@ -14,7 +14,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: db
     spec:
       containers:
@@ -91,7 +90,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/configmap-volume-default: "true"
         io.kompose.service: web
     spec:
       containers:

script/test/fixtures/cronjob/output-k8s.yaml

@@ -13,7 +13,6 @@ spec:
       template:
         metadata:
           labels:
-            io.kompose.network/cronjob-default: "true"
             io.kompose.service: challenge
         spec:
           containers:

script/test/fixtures/cronjob/output-os.yaml

@@ -13,7 +13,6 @@ spec:
       template:
         metadata:
           labels:
-            io.kompose.network/cronjob-default: "true"
             io.kompose.service: challenge
         spec:
           containers:

script/test/fixtures/deploy/placement/output-placement-k8s.yaml

@@ -28,7 +28,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/placement-default: "true"
         io.kompose.service: redis
     spec:
       affinity:

script/test/fixtures/deploy/placement/output-placement-os.yaml

@@ -27,7 +27,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/placement-default: "true"
         io.kompose.service: redis
     spec:
       affinity:

script/test/fixtures/env-multiple/output-k8s.yaml

@@ -56,7 +56,6 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: another-namenode
     spec:
       containers:
@@ -117,7 +116,6 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: namenode
     spec:
       containers:

script/test/fixtures/env-multiple/output-os.yaml

@@ -78,7 +78,6 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: another-namenode
     spec:
       containers:
@@ -151,7 +150,6 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: namenode
     spec:
       containers:

script/test/fixtures/env/output-k8s.yaml

@@ -49,7 +49,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: another-namenode
     spec:
       containers:
@@ -100,7 +99,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: namenode
     spec:
       containers:

script/test/fixtures/env/output-os.yaml

@@ -59,7 +59,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: another-namenode
     spec:
       containers:
@@ -126,7 +125,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/env-default: "true"
         io.kompose.service: namenode
     spec:
       containers:

script/test/fixtures/envvars-interpolation/output-k8s.yaml

@@ -13,7 +13,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/envvars-interpolation-default: "true"
         io.kompose.service: myservice
     spec:
       containers:

script/test/fixtures/envvars-interpolation/output-os.yaml

@@ -12,7 +12,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/envvars-interpolation-default: "true"
         io.kompose.service: myservice
     spec:
       containers:

script/test/fixtures/envvars-with-status/output-k8s.yaml

@@ -28,7 +28,6 @@ spec:
   template:
     metadata:
       labels:
-        io.kompose.network/envvars-with-status-default: "true"
         io.kompose.service: app
     spec:
       containers: