forked from LaconicNetwork/kompose
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:
parent
1f7441845e
commit
55b077ab04
@ -503,13 +503,20 @@ func (k *Kubernetes) CreateHeadlessService(name string, service kobject.ServiceC
|
|||||||
}
|
}
|
||||||
|
|
||||||
// UpdateKubernetesObjectsMultipleContainers method updates the kubernetes objects with the necessary data
|
// 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
|
// Configure annotations
|
||||||
annotations := transformer.ConfigAnnotations(service)
|
annotations := transformer.ConfigAnnotations(service)
|
||||||
|
|
||||||
// fillTemplate fills the pod template with the value calculated from config
|
// fillTemplate fills the pod template with the value calculated from config
|
||||||
fillTemplate := func(template *api.PodTemplateSpec) error {
|
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()
|
template.Spec = podSpec.Get()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@ -660,7 +667,13 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
|
|||||||
template.Spec.SecurityContext = podSecurityContext
|
template.Spec.SecurityContext = podSecurityContext
|
||||||
}
|
}
|
||||||
template.Spec.Containers[0].Ports = ports
|
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
|
// Configure the image pull policy
|
||||||
policy, err := GetImagePullPolicy(name, service.ImagePullPolicy)
|
policy, err := GetImagePullPolicy(name, service.ImagePullPolicy)
|
||||||
|
|||||||
@ -1600,7 +1600,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
|
|||||||
podSpec.Append(ServiceAccountName(serviceAccountName))
|
podSpec.Append(ServiceAccountName(serviceAccountName))
|
||||||
}
|
}
|
||||||
|
|
||||||
err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec)
|
err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec, opt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "Error transforming Kubernetes objects")
|
return nil, errors.Wrap(err, "Error transforming Kubernetes objects")
|
||||||
}
|
}
|
||||||
|
|||||||
@ -50,7 +50,6 @@ func newServiceConfig() kobject.ServiceConfig {
|
|||||||
WorkingDir: "dir",
|
WorkingDir: "dir",
|
||||||
Args: []string{"arg1", "arg2"},
|
Args: []string{"arg1", "arg2"},
|
||||||
VolList: []string{"/tmp/volume"},
|
VolList: []string{"/tmp/volume"},
|
||||||
Network: []string{"network1", "network2"}, // supported
|
|
||||||
Labels: nil,
|
Labels: nil,
|
||||||
FsGroup: 1001,
|
FsGroup: 1001,
|
||||||
Annotations: map[string]string{"abc": "def"},
|
Annotations: map[string]string{"abc": "def"},
|
||||||
|
|||||||
@ -44,7 +44,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -69,7 +68,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -44,7 +44,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -69,7 +68,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -43,7 +43,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -96,7 +95,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -43,7 +43,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -96,7 +95,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/change-in-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/compose-env-interpolation-default: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -43,7 +43,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/compose-file-env-variable-default: "true"
|
|
||||||
io.kompose.service: alpine
|
io.kompose.service: alpine
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -69,7 +68,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/compose-file-env-variable-default: "true"
|
|
||||||
io.kompose.service: debian
|
io.kompose.service: debian
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -29,7 +29,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/compose-file-support-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -33,7 +33,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -33,7 +33,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -33,7 +33,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -32,7 +32,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -32,7 +32,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -32,7 +32,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-file-configs-default: "true"
|
|
||||||
io.kompose.service: busy
|
io.kompose.service: busy
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -19,7 +19,6 @@ apiVersion: v1
|
|||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-pod-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
name: redis
|
name: redis
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@ -19,7 +19,6 @@ apiVersion: v1
|
|||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-pod-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
name: redis
|
name: redis
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@ -15,7 +15,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -63,7 +62,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -15,7 +15,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -64,7 +63,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -14,7 +14,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -90,7 +89,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -14,7 +14,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -91,7 +90,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/configmap-volume-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
1
script/test/fixtures/cronjob/output-k8s.yaml
vendored
1
script/test/fixtures/cronjob/output-k8s.yaml
vendored
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/cronjob-default: "true"
|
|
||||||
io.kompose.service: challenge
|
io.kompose.service: challenge
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
1
script/test/fixtures/cronjob/output-os.yaml
vendored
1
script/test/fixtures/cronjob/output-os.yaml
vendored
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/cronjob-default: "true"
|
|
||||||
io.kompose.service: challenge
|
io.kompose.service: challenge
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/placement-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
affinity:
|
affinity:
|
||||||
|
|||||||
@ -27,7 +27,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/placement-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
affinity:
|
affinity:
|
||||||
|
|||||||
@ -56,7 +56,6 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: another-namenode
|
io.kompose.service: another-namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -117,7 +116,6 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: namenode
|
io.kompose.service: namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -78,7 +78,6 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: another-namenode
|
io.kompose.service: another-namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -151,7 +150,6 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
creationTimestamp: null
|
creationTimestamp: null
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: namenode
|
io.kompose.service: namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/env/output-k8s.yaml
vendored
2
script/test/fixtures/env/output-k8s.yaml
vendored
@ -49,7 +49,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: another-namenode
|
io.kompose.service: another-namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -100,7 +99,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: namenode
|
io.kompose.service: namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/env/output-os.yaml
vendored
2
script/test/fixtures/env/output-os.yaml
vendored
@ -59,7 +59,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: another-namenode
|
io.kompose.service: another-namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -126,7 +125,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/env-default: "true"
|
|
||||||
io.kompose.service: namenode
|
io.kompose.service: namenode
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/envvars-interpolation-default: "true"
|
|
||||||
io.kompose.service: myservice
|
io.kompose.service: myservice
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -12,7 +12,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/envvars-interpolation-default: "true"
|
|
||||||
io.kompose.service: myservice
|
io.kompose.service: myservice
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/envvars-with-status-default: "true"
|
|
||||||
io.kompose.service: app
|
io.kompose.service: app
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -27,7 +27,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/envvars-with-status-default: "true"
|
|
||||||
io.kompose.service: app
|
io.kompose.service: app
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/expose/output-k8s.yaml
vendored
2
script/test/fixtures/expose/output-k8s.yaml
vendored
@ -43,7 +43,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/expose-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -69,7 +68,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/expose-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/expose/output-os.yaml
vendored
2
script/test/fixtures/expose/output-os.yaml
vendored
@ -42,7 +42,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/expose-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -96,7 +95,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/expose-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -30,7 +30,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/external-traffic-policy-default: "true"
|
|
||||||
io.kompose.service: front-end
|
io.kompose.service: front-end
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -30,7 +30,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/external-traffic-policy-default: "true"
|
|
||||||
io.kompose.service: front-end
|
io.kompose.service: front-end
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -29,7 +29,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/external-traffic-policy-default: "true"
|
|
||||||
io.kompose.service: front-end
|
io.kompose.service: front-end
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -29,7 +29,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/external-traffic-policy-default: "true"
|
|
||||||
io.kompose.service: front-end
|
io.kompose.service: front-end
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
1
script/test/fixtures/fsgroup/output-k8s.yaml
vendored
1
script/test/fixtures/fsgroup/output-k8s.yaml
vendored
@ -15,7 +15,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/fsgroup-default: "true"
|
|
||||||
io.kompose.service: pgadmin
|
io.kompose.service: pgadmin
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
1
script/test/fixtures/fsgroup/output-os.yaml
vendored
1
script/test/fixtures/fsgroup/output-os.yaml
vendored
@ -14,7 +14,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/fsgroup-default: "true"
|
|
||||||
io.kompose.service: pgadmin
|
io.kompose.service: pgadmin
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -73,7 +73,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: mongo
|
io.kompose.service: mongo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -111,7 +110,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: mysql
|
io.kompose.service: mysql
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -149,7 +147,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: postgresql
|
io.kompose.service: postgresql
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -189,7 +186,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -72,7 +72,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: mongo
|
io.kompose.service: mongo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -138,7 +137,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: mysql
|
io.kompose.service: mysql
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -204,7 +202,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: postgresql
|
io.kompose.service: postgresql
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -272,7 +269,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/healthcheck-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/host-port-protocol-default: "true"
|
|
||||||
io.kompose.service: nginx
|
io.kompose.service: nginx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -27,7 +27,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/host-port-protocol-default: "true"
|
|
||||||
io.kompose.service: nginx
|
io.kompose.service: nginx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
1
script/test/fixtures/hpa/output-k8s.yaml
vendored
1
script/test/fixtures/hpa/output-k8s.yaml
vendored
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/hpa-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/initcontainer-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -13,7 +13,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-files-default: "true"
|
|
||||||
io.kompose.service: bar
|
io.kompose.service: bar
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -37,7 +36,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-files-default: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -12,7 +12,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-files-default: "true"
|
|
||||||
io.kompose.service: bar
|
io.kompose.service: bar
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -63,7 +62,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-files-default: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -15,7 +15,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-type-volumes-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -61,7 +60,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-type-volumes-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -14,7 +14,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-type-volumes-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -88,7 +87,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/multiple-type-volumes-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -39,7 +39,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/namespace-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -36,7 +36,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/namespace-default: "true"
|
|
||||||
io.kompose.service: web
|
io.kompose.service: web
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/network-mode-service-default: "true"
|
|
||||||
io.kompose.service: client
|
io.kompose.service: client
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -29,7 +29,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/read-only-default: "true"
|
|
||||||
io.kompose.service: test
|
io.kompose.service: test
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -27,7 +27,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/read-only-default: "true"
|
|
||||||
io.kompose.service: test
|
io.kompose.service: test
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/resources-lowercase-default: "true"
|
|
||||||
io.kompose.service: nginx
|
io.kompose.service: nginx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -27,7 +27,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/resources-lowercase-default: "true"
|
|
||||||
io.kompose.service: nginx
|
io.kompose.service: nginx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -31,7 +31,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/service-group-default: "true"
|
|
||||||
io.kompose.service: librenms-dispatcher
|
io.kompose.service: librenms-dispatcher
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -28,7 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/single-file-output-default: "true"
|
|
||||||
io.kompose.service: front-end
|
io.kompose.service: front-end
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -50,7 +50,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -100,7 +99,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: wordpress
|
io.kompose.service: wordpress
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -46,7 +46,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -96,7 +95,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -166,7 +164,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: wordpress
|
io.kompose.service: wordpress
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -216,7 +213,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/statefulset-default: "true"
|
|
||||||
io.kompose.service: wordpress
|
io.kompose.service: wordpress
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/v2/output-k8s.yaml
vendored
2
script/test/fixtures/v2/output-k8s.yaml
vendored
@ -121,7 +121,6 @@ apiVersion: v1
|
|||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v2-default: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
name: foo
|
name: foo
|
||||||
spec:
|
spec:
|
||||||
@ -203,7 +202,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v2-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
2
script/test/fixtures/v2/output-os.yaml
vendored
2
script/test/fixtures/v2/output-os.yaml
vendored
@ -121,7 +121,6 @@ apiVersion: v1
|
|||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v2-default: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
name: foo
|
name: foo
|
||||||
spec:
|
spec:
|
||||||
@ -202,7 +201,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v2-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
4
script/test/fixtures/v3.0/output-k8s.yaml
vendored
4
script/test/fixtures/v3.0/output-k8s.yaml
vendored
@ -29,9 +29,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/app-network: "true"
|
|
||||||
io.kompose.network/v30-normalized-network: "true"
|
|
||||||
io.kompose.network/web-network: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -58,7 +55,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v30-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
4
script/test/fixtures/v3.0/output-os.yaml
vendored
4
script/test/fixtures/v3.0/output-os.yaml
vendored
@ -28,9 +28,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/app-network: "true"
|
|
||||||
io.kompose.network/v30-normalized-network: "true"
|
|
||||||
io.kompose.network/web-network: "true"
|
|
||||||
io.kompose.service: foo
|
io.kompose.service: foo
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
@ -85,7 +82,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/v30-default: "true"
|
|
||||||
io.kompose.service: redis
|
io.kompose.service: redis
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -15,7 +15,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/vols-subpath-default: "true"
|
|
||||||
io.kompose.service: postgres
|
io.kompose.service: postgres
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -14,7 +14,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/vols-subpath-default: "true"
|
|
||||||
io.kompose.service: postgres
|
io.kompose.service: postgres
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -30,7 +30,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/windows-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
@ -30,7 +30,6 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
io.kompose.network/windows-default: "true"
|
|
||||||
io.kompose.service: db
|
io.kompose.service: db
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user