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 https://github.com/kubernetes/kompose/issues/1759

#### Special notes for your reviewer:
This commit is contained in:
Charlie Drage
2024-06-02 20:46:57 +02:00
committed by GitHub
parent 1f7441845e
commit 55b077ab04
71 changed files with 17 additions and 110 deletions
+16 -3
View File
@@ -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)
+1 -1
View File
@@ -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")
}
@@ -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"},
@@ -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:
-2
View File
@@ -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:
@@ -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:
-2
View File
@@ -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:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/compose-env-interpolation-default: "true"
io.kompose.service: foo
spec:
containers:
@@ -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:
@@ -29,7 +29,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/compose-file-support-default: "true"
io.kompose.service: web
spec:
containers:
@@ -33,7 +33,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
@@ -33,7 +33,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
@@ -33,7 +33,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
@@ -32,7 +32,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
@@ -32,7 +32,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
@@ -32,7 +32,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/configmap-file-configs-default: "true"
io.kompose.service: busy
spec:
containers:
-1
View File
@@ -19,7 +19,6 @@ apiVersion: v1
kind: Pod
metadata:
labels:
io.kompose.network/configmap-pod-default: "true"
io.kompose.service: redis
name: redis
spec:
-1
View File
@@ -19,7 +19,6 @@ apiVersion: v1
kind: Pod
metadata:
labels:
io.kompose.network/configmap-pod-default: "true"
io.kompose.service: redis
name: redis
spec:
@@ -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:
-2
View File
@@ -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:
@@ -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:
-2
View File
@@ -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:
-1
View File
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/cronjob-default: "true"
io.kompose.service: challenge
spec:
containers:
-1
View File
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/cronjob-default: "true"
io.kompose.service: challenge
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/placement-default: "true"
io.kompose.service: redis
spec:
affinity:
@@ -27,7 +27,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/placement-default: "true"
io.kompose.service: redis
spec:
affinity:
-2
View File
@@ -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:
-2
View File
@@ -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:
-2
View File
@@ -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:
-2
View File
@@ -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:
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/envvars-interpolation-default: "true"
io.kompose.service: myservice
spec:
containers:
@@ -12,7 +12,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/envvars-interpolation-default: "true"
io.kompose.service: myservice
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/envvars-with-status-default: "true"
io.kompose.service: app
spec:
containers:
@@ -27,7 +27,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/envvars-with-status-default: "true"
io.kompose.service: app
spec:
containers:
-2
View File
@@ -43,7 +43,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/expose-default: "true"
io.kompose.service: redis
spec:
containers:
@@ -69,7 +68,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/expose-default: "true"
io.kompose.service: web
spec:
containers:
-2
View File
@@ -42,7 +42,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/expose-default: "true"
io.kompose.service: redis
spec:
containers:
@@ -96,7 +95,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/expose-default: "true"
io.kompose.service: web
spec:
containers:
@@ -30,7 +30,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/external-traffic-policy-default: "true"
io.kompose.service: front-end
spec:
containers:
@@ -30,7 +30,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/external-traffic-policy-default: "true"
io.kompose.service: front-end
spec:
containers:
@@ -29,7 +29,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/external-traffic-policy-default: "true"
io.kompose.service: front-end
spec:
containers:
@@ -29,7 +29,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/external-traffic-policy-default: "true"
io.kompose.service: front-end
spec:
containers:
-1
View File
@@ -15,7 +15,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/fsgroup-default: "true"
io.kompose.service: pgadmin
spec:
containers:
-1
View File
@@ -14,7 +14,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/fsgroup-default: "true"
io.kompose.service: pgadmin
spec:
containers:
@@ -73,7 +73,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: mongo
spec:
containers:
@@ -111,7 +110,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: mysql
spec:
containers:
@@ -149,7 +147,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: postgresql
spec:
containers:
@@ -189,7 +186,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: redis
spec:
containers:
@@ -72,7 +72,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: mongo
spec:
containers:
@@ -138,7 +137,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: mysql
spec:
containers:
@@ -204,7 +202,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: postgresql
spec:
containers:
@@ -272,7 +269,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/healthcheck-default: "true"
io.kompose.service: redis
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/host-port-protocol-default: "true"
io.kompose.service: nginx
spec:
containers:
@@ -27,7 +27,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/host-port-protocol-default: "true"
io.kompose.service: nginx
spec:
containers:
-1
View File
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/hpa-default: "true"
io.kompose.service: web
spec:
containers:
-1
View File
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/initcontainer-default: "true"
io.kompose.service: web
spec:
containers:
-2
View File
@@ -13,7 +13,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-files-default: "true"
io.kompose.service: bar
spec:
containers:
@@ -37,7 +36,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-files-default: "true"
io.kompose.service: foo
spec:
containers:
-2
View File
@@ -12,7 +12,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-files-default: "true"
io.kompose.service: bar
spec:
containers:
@@ -63,7 +62,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-files-default: "true"
io.kompose.service: foo
spec:
containers:
@@ -15,7 +15,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-type-volumes-default: "true"
io.kompose.service: db
spec:
containers:
@@ -61,7 +60,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-type-volumes-default: "true"
io.kompose.service: web
spec:
containers:
@@ -14,7 +14,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-type-volumes-default: "true"
io.kompose.service: db
spec:
containers:
@@ -88,7 +87,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/multiple-type-volumes-default: "true"
io.kompose.service: web
spec:
containers:
-1
View File
@@ -39,7 +39,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/namespace-default: "true"
io.kompose.service: web
spec:
containers:
-1
View File
@@ -36,7 +36,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/namespace-default: "true"
io.kompose.service: web
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/network-mode-service-default: "true"
io.kompose.service: client
spec:
containers:
-1
View File
@@ -29,7 +29,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/read-only-default: "true"
io.kompose.service: test
spec:
containers:
-1
View File
@@ -27,7 +27,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/read-only-default: "true"
io.kompose.service: test
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/resources-lowercase-default: "true"
io.kompose.service: nginx
spec:
containers:
@@ -27,7 +27,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/resources-lowercase-default: "true"
io.kompose.service: nginx
spec:
containers:
-1
View File
@@ -31,7 +31,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/service-group-default: "true"
io.kompose.service: librenms-dispatcher
spec:
containers:
@@ -28,7 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/single-file-output-default: "true"
io.kompose.service: front-end
spec:
containers:
-2
View File
@@ -50,7 +50,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: db
spec:
containers:
@@ -100,7 +99,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: wordpress
spec:
containers:
-4
View File
@@ -46,7 +46,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: db
spec:
containers:
@@ -96,7 +95,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: db
spec:
containers:
@@ -166,7 +164,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: wordpress
spec:
containers:
@@ -216,7 +213,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/statefulset-default: "true"
io.kompose.service: wordpress
spec:
containers:
-2
View File
@@ -121,7 +121,6 @@ apiVersion: v1
kind: Pod
metadata:
labels:
io.kompose.network/v2-default: "true"
io.kompose.service: foo
name: foo
spec:
@@ -203,7 +202,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/v2-default: "true"
io.kompose.service: redis
spec:
containers:
-2
View File
@@ -121,7 +121,6 @@ apiVersion: v1
kind: Pod
metadata:
labels:
io.kompose.network/v2-default: "true"
io.kompose.service: foo
name: foo
spec:
@@ -202,7 +201,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/v2-default: "true"
io.kompose.service: redis
spec:
containers:
-4
View File
@@ -29,9 +29,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/app-network: "true"
io.kompose.network/v30-normalized-network: "true"
io.kompose.network/web-network: "true"
io.kompose.service: foo
spec:
containers:
@@ -58,7 +55,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/v30-default: "true"
io.kompose.service: redis
spec:
containers:
-4
View File
@@ -28,9 +28,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/app-network: "true"
io.kompose.network/v30-normalized-network: "true"
io.kompose.network/web-network: "true"
io.kompose.service: foo
spec:
containers:
@@ -85,7 +82,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/v30-default: "true"
io.kompose.service: redis
spec:
containers:
-1
View File
@@ -15,7 +15,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/vols-subpath-default: "true"
io.kompose.service: postgres
spec:
containers:
-1
View File
@@ -14,7 +14,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/vols-subpath-default: "true"
io.kompose.service: postgres
spec:
containers:
@@ -30,7 +30,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/windows-default: "true"
io.kompose.service: db
spec:
containers:
@@ -30,7 +30,6 @@ spec:
template:
metadata:
labels:
io.kompose.network/windows-default: "true"
io.kompose.service: db
spec:
containers: