RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/kubernetes/kompose/commit/55b077ab0423fe50871d225f53be99c386a59c6a below:

removes uneeded annotation when not using network policy (#1… · kubernetes/kompose@55b077a · GitHub

File tree Expand file treeCollapse file tree 71 files changed

+17

-110

lines changed

Filter options

pkg/transformer/kubernetes
- compose-env-interpolation
- compose-file-env-variable

Expand file treeCollapse file tree 71 files changed

+17

-110

lines changed Original file line number Diff line number Diff line change


 @@ -503,13 +503,20 @@ func (k *Kubernetes) CreateHeadlessService(name string, service kobject.ServiceC

503 503

504 504 505 505


 // UpdateKubernetesObjectsMultipleContainers method updates the kubernetes objects with the necessary data

506

-
 func (k *Kubernetes) UpdateKubernetesObjectsMultipleContainers(name string, service kobject.ServiceConfig, objects *[]runtime.Object, podSpec PodSpec) error {

506

+
 func (k *Kubernetes) UpdateKubernetesObjectsMultipleContainers(name string, service kobject.ServiceConfig, objects *[]runtime.Object, podSpec PodSpec, opt kobject.ConvertOptions) error {

507 507


 // Configure annotations

508 508


 annotations := transformer.ConfigAnnotations(service)

509 509 510 510


 // fillTemplate fills the pod template with the value calculated from config

511 511


 fillTemplate := func(template *api.PodTemplateSpec) error {

512

-
 template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)

512 + 513

+
 // We will ONLY add config labels with network if we actually

514

+
 // passed in --generate-network-policies to the kompose command

515

+
 if opt.GenerateNetworkPolicies {

516

+
 template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)

517

+
 } else {

518

+
 template.ObjectMeta.Labels = transformer.ConfigLabels(name)

519

+
 }

513 520


 template.Spec = podSpec.Get()

514 521


 return nil

515 522


 @@ -660,7 +667,13 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic

660 667


 template.Spec.SecurityContext = podSecurityContext

661 668

662 669


 template.Spec.Containers[0].Ports = ports

663

-
 template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)

670 + 671

+
 // Only add network mode if generate-network-policies is set

672

+
 if opt.GenerateNetworkPolicies {

673

+
 template.ObjectMeta.Labels = transformer.ConfigLabelsWithNetwork(name, service.Network)

674

+
 } else {

675

+
 template.ObjectMeta.Labels = transformer.ConfigLabels(name)

676

+
 }

664 677 665 678


 // Configure the image pull policy

666 679


 policy, err := GetImagePullPolicy(name, service.ImagePullPolicy)

Original file line number Diff line number Diff line change


 @@ -1600,7 +1600,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.

1600 1600


 podSpec.Append(ServiceAccountName(serviceAccountName))

1601 1601

1602 1602 1603

-
 err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec)

1603

+
 err = k.UpdateKubernetesObjectsMultipleContainers(groupName, service, &objects, podSpec, opt)

1604 1604


 if err != nil {

1605 1605


 return nil, errors.Wrap(err, "Error transforming Kubernetes objects")

1606 1606

Original file line number Diff line number Diff line change


 @@ -50,7 +50,6 @@ func newServiceConfig() kobject.ServiceConfig {

50 50


 WorkingDir: "dir",

51 51


 Args: []string{"arg1", "arg2"},

52 52


 VolList: []string{"/tmp/volume"},

53

-
 Network: []string{"network1", "network2"}, // supported

54 53


 Labels: nil,

55 54


 FsGroup: 1001,

56 55


 Annotations: map[string]string{"abc": "def"},

Original file line number Diff line number Diff line change


 @@ -44,7 +44,6 @@ spec:

44 44


 template:

45 45


 metadata:

46 46


 labels:

47

-
 io.kompose.network/change-in-volume-default: "true"

48 47


 io.kompose.service: redis

49 48


 spec:

50 49


 containers:


 @@ -69,7 +68,6 @@ spec:

69 68


 template:

70 69


 metadata:

71 70


 labels:

72

-
 io.kompose.network/change-in-volume-default: "true"

73 71


 io.kompose.service: web

74 72


 spec:

75 73


 containers:

Original file line number Diff line number Diff line change


 @@ -44,7 +44,6 @@ spec:

44 44


 template:

45 45


 metadata:

46 46


 labels:

47

-
 io.kompose.network/change-in-volume-default: "true"

48 47


 io.kompose.service: redis

49 48


 spec:

50 49


 containers:


 @@ -69,7 +68,6 @@ spec:

69 68


 template:

70 69


 metadata:

71 70


 labels:

72

-
 io.kompose.network/change-in-volume-default: "true"

73 71


 io.kompose.service: web

74 72


 spec:

75 73


 containers:

Original file line number Diff line number Diff line change


 @@ -43,7 +43,6 @@ spec:

43 43


 template:

44 44


 metadata:

45 45


 labels:

46

-
 io.kompose.network/change-in-volume-default: "true"

47 46


 io.kompose.service: redis

48 47


 spec:

49 48


 containers:


 @@ -96,7 +95,6 @@ spec:

96 95


 template:

97 96


 metadata:

98 97


 labels:

99

-
 io.kompose.network/change-in-volume-default: "true"

100 98


 io.kompose.service: web

101 99


 spec:

102 100


 containers:

Original file line number Diff line number Diff line change


 @@ -43,7 +43,6 @@ spec:

43 43


 template:

44 44


 metadata:

45 45


 labels:

46

-
 io.kompose.network/change-in-volume-default: "true"

47 46


 io.kompose.service: redis

48 47


 spec:

49 48


 containers:


 @@ -96,7 +95,6 @@ spec:

96 95


 template:

97 96


 metadata:

98 97


 labels:

99

-
 io.kompose.network/change-in-volume-default: "true"

100 98


 io.kompose.service: web

101 99


 spec:

102 100


 containers:

Original file line number Diff line number Diff line change


 @@ -28,7 +28,6 @@ spec:

28 28


 template:

29 29


 metadata:

30 30


 labels:

31

-
 io.kompose.network/compose-env-interpolation-default: "true"

32 31


 io.kompose.service: foo

33 32


 spec:

34 33


 containers:

Original file line number Diff line number Diff line change


 @@ -43,7 +43,6 @@ spec:

43 43


 template:

44 44


 metadata:

45 45


 labels:

46

-
 io.kompose.network/compose-file-env-variable-default: "true"

47 46


 io.kompose.service: alpine

48 47


 spec:

49 48


 containers:


 @@ -69,7 +68,6 @@ spec:

69 68


 template:

70 69


 metadata:

71 70


 labels:

72

-
 io.kompose.network/compose-file-env-variable-default: "true"

73 71


 io.kompose.service: debian

74 72


 spec:

75 73


 containers:

Original file line number Diff line number Diff line change


 @@ -29,7 +29,6 @@ spec:

29 29


 template:

30 30


 metadata:

31 31


 labels:

32

-
 io.kompose.network/compose-file-support-default: "true"

33 32


 io.kompose.service: web

34 33


 spec:

35 34


 containers:

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4