.

Signed-off-by: ben-dov <ben.d@claroty.com>

Author: ben-dov

pkg/operator/fluentd-service.go

@@ -50,8 +50,10 @@ func MakeFluentdService(fd fluentdv1alpha1.Fluentd) *corev1.Service {
 		},
 	}
 
-	// read inputs definition from globalInputs
+	// Read inputs definition from globalInputs
 	globalInputs := fd.Spec.GlobalInputs
+	firstForwardPort := true
+	firstHttpPort := true
 	for _, input := range globalInputs {
 
 		if input.Forward != nil {
@@ -60,13 +62,18 @@ func MakeFluentdService(fd fluentdv1alpha1.Fluentd) *corev1.Service {
 				forwardPort = DefaultForwardPort
 			}
 
+			forwardName := DefaultForwardName
+			if !firstForwardPort {
+				forwardName = fmt.Sprintf("%s-%d", DefaultForwardName, forwardPort)
+			}
 			forwardContainerPort := corev1.ServicePort{
-				Name:       DefaultForwardName,
+				Name:       forwardName,
 				Port:       forwardPort,
 				TargetPort: intstr.FromString(FluentdForwardPortName),
 				Protocol:   corev1.ProtocolTCP,
 			}
 			svc.Spec.Ports = append(svc.Spec.Ports, forwardContainerPort)
+			firstForwardPort = false
 			continue
 		}
 
@@ -75,13 +82,18 @@ func MakeFluentdService(fd fluentdv1alpha1.Fluentd) *corev1.Service {
 			if httpPort == 0 {
 				httpPort = DefaultHttpPort
 			}
+			httpName := DefaultHttpName
+			if !firstHttpPort {
+				httpName = fmt.Sprintf("%s-%d", DefaultHttpName, httpPort)
+			}
 			httpContainerPort := corev1.ServicePort{
-				Name:       DefaultHttpName,
+				Name:       httpName,
 				Port:       httpPort,
 				TargetPort: intstr.FromString(FluentdHttpPortName),
 				Protocol:   corev1.ProtocolTCP,
 			}
 			svc.Spec.Ports = append(svc.Spec.Ports, httpContainerPort)
+			firstHttpPort = false
 		}
 	}
 

pkg/operator/sts.go

@@ -188,20 +188,27 @@ func makeFluentdPorts(fd fluentdv1alpha1.Fluentd) []corev1.ContainerPort {
 		},
 	}
 
-	// read inputs definition from globalInputs
+	// Read inputs definition from globalInputs
 	globalInputs := fd.Spec.GlobalInputs
+	firstForwardPort := true
+	firstHttpPort := true
 	for _, input := range globalInputs {
 		if input.Forward != nil {
 			forwardPort := DefaultForwardPort
 			if input.Forward.Port != nil {
 				forwardPort = *input.Forward.Port
 			}
 
+			forwardName := DefaultForwardName
+			if !firstForwardPort {
+				forwardName = fmt.Sprintf("%s-%d", DefaultForwardName, forwardPort)
+			}
 			ports = append(ports, corev1.ContainerPort{
-				Name:          DefaultForwardName,
+				Name:          forwardName,
 				ContainerPort: forwardPort,
 				Protocol:      corev1.ProtocolTCP,
 			})
+			firstForwardPort = false
 			continue
 		}
 		if input.Http != nil {
@@ -210,11 +217,16 @@ func makeFluentdPorts(fd fluentdv1alpha1.Fluentd) []corev1.ContainerPort {
 				httpPort = *input.Http.Port
 			}
 
+			httpName := DefaultHttpName
+			if !firstHttpPort {
+				httpName = fmt.Sprintf("%s-%d", DefaultHttpName, httpPort)
+			}
 			ports = append(ports, corev1.ContainerPort{
-				Name:          DefaultHttpName,
+				Name:          httpName,
 				ContainerPort: httpPort,
 				Protocol:      corev1.ProtocolTCP,
 			})
+			firstHttpPort = false
 		}
 	}