Merge pull request #272 from jlarriba/syslog_protocol

Do not let the user choose syslog protocol

Author: openshift-merge-bot[bot]

api/bases/telemetry.openstack.org_loggings.yaml

@@ -52,14 +52,6 @@ spec:
                 description: Port is the port where the service will listen on
                 format: int32
                 type: integer
-              protocol:
-                default: TCP
-                description: 'The protocol of the connection the Service will listen
-                  on: tcp or udp'
-                enum:
-                - TCP
-                - UDP
-                type: string
               rsyslogQueueSize:
                 default: 10000
                 description: The size of the local queue of logs

api/v1beta1/logging_types.go

@@ -44,12 +44,6 @@ type LoggingSpec struct {
 	// +kubebuilder:default=10514
 	TargetPort int `json:"targetPort"`
 
-	// The protocol of the connection the Service will listen on: tcp or udp
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Enum=TCP;UDP
-	// +kubebuilder:default:=TCP
-	Protocol string `json:"protocol"`
-
 	// CLONamespace points to the namespace where the cluster-logging-operator is deployed
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=openshift-logging

config/crd/bases/telemetry.openstack.org_loggings.yaml

@@ -52,14 +52,6 @@ spec:
                 description: Port is the port where the service will listen on
                 format: int32
                 type: integer
-              protocol:
-                default: TCP
-                description: 'The protocol of the connection the Service will listen
-                  on: tcp or udp'
-                enum:
-                - TCP
-                - UDP
-                type: string
               rsyslogQueueSize:
                 default: 10000
                 description: The size of the local queue of logs

controllers/logging_controller.go

@@ -270,7 +270,6 @@ func (r *LoggingReconciler) generateComputeServiceConfig(
 	templateParameters := map[string]interface{}{
 		"RsyslogAddress":   instance.Spec.IPAddr,
 		"RsyslogPort":      instance.Spec.Port,
-		"RsyslogProtocol":  instance.Spec.Protocol,
 		"RsyslogRetries":   instance.Spec.RsyslogRetries,
 		"RsyslogQueueType": instance.Spec.RsyslogQueueType,
 		"RsyslogQueueSize": instance.Spec.RsyslogQueueSize,

pkg/logging/service.go

@@ -40,7 +40,7 @@ func Service(
 	op, err := controllerutil.CreateOrUpdate(context.TODO(), helper.GetClient(), service, func() error {
 		//service.Labels = labels
 		service.Spec.Ports = []corev1.ServicePort{{
-			Protocol:   corev1.Protocol(instance.Spec.Protocol),
+			Protocol:   corev1.Protocol("TCP"),
 			Port:       instance.Spec.Port,
 			TargetPort: intstr.FromInt(instance.Spec.TargetPort),
 		}}

templates/logging/config/10-telemetry.conf

@@ -1,7 +1,7 @@
 action(type="omfwd"
        target="{{ .RsyslogAddress }}"
        port="{{ .RsyslogPort }}"
-       protocol="{{ .RsyslogProtocol }}"
+       protocol="tcp"
        action.resumeRetryCount="{{ .RsyslogRetries }}"
        queue.type="{{ .RsyslogQueueType }}"
        queue.size="{{ .RsyslogQueueSize }}"