Merge pull request #897 from jlarriba/fix-rsyslog-template-empty-value

openshift-merge-bot[bot] · web-flow · commit 2519807f5aa2 · 2026-05-18T13:24:24.000Z
Allow empty rsyslogTemplate for Go-constructed CRs
diff --git a/api/bases/telemetry.openstack.org_loggings.yaml b/api/bases/telemetry.openstack.org_loggings.yaml
@@ -88,6 +88,7 @@ spec:
                 default: RSYSLOG_TraditionalFileFormat
                 description: The template format for rsyslog forwarding actions
                 enum:
+                - ""
                 - RSYSLOG_TraditionalFileFormat
                 - RSYSLOG_SyslogProtocol23Format
                 type: string
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -1418,6 +1418,7 @@ spec:
                     default: RSYSLOG_TraditionalFileFormat
                     description: The template format for rsyslog forwarding actions
                     enum:
+                    - ""
                     - RSYSLOG_TraditionalFileFormat
                     - RSYSLOG_SyslogProtocol23Format
                     type: string
diff --git a/api/v1beta1/logging_types.go b/api/v1beta1/logging_types.go
@@ -62,7 +62,7 @@ type LoggingSpec struct {
 	// The template format for rsyslog forwarding actions
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=RSYSLOG_TraditionalFileFormat
-	// +kubebuilder:validation:Enum=RSYSLOG_TraditionalFileFormat;RSYSLOG_SyslogProtocol23Format
+	// +kubebuilder:validation:Enum="";RSYSLOG_TraditionalFileFormat;RSYSLOG_SyslogProtocol23Format
 	RsyslogTemplate string `json:"rsyslogTemplate"`
 }
 
diff --git a/config/crd/bases/telemetry.openstack.org_loggings.yaml b/config/crd/bases/telemetry.openstack.org_loggings.yaml
@@ -88,6 +88,7 @@ spec:
                 default: RSYSLOG_TraditionalFileFormat
                 description: The template format for rsyslog forwarding actions
                 enum:
+                - ""
                 - RSYSLOG_TraditionalFileFormat
                 - RSYSLOG_SyslogProtocol23Format
                 type: string
diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -1418,6 +1418,7 @@ spec:
                     default: RSYSLOG_TraditionalFileFormat
                     description: The template format for rsyslog forwarding actions
                     enum:
+                    - ""
                     - RSYSLOG_TraditionalFileFormat
                     - RSYSLOG_SyslogProtocol23Format
                     type: string
diff --git a/internal/controller/logging_controller.go b/internal/controller/logging_controller.go
@@ -294,6 +294,10 @@ func (r *LoggingReconciler) generateComputeServiceConfig(
 		instance.Spec.RsyslogQueueType = "linkedList"
 	}
 
+	if instance.Spec.RsyslogTemplate == "" {
+		instance.Spec.RsyslogTemplate = "RSYSLOG_TraditionalFileFormat"
+	}
+
 	templateParameters := map[string]any{
 		"RsyslogAddress":   service.Annotations["metallb.universe.tf/loadBalancerIPs"],
 		"RsyslogPort":      instance.Spec.Port,

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ type LoggingSpec struct {`
`62`	`62`	`// The template format for rsyslog forwarding actions`
`63`	`63`	`// +kubebuilder:validation:Optional`
`64`	`64`	`// +kubebuilder:default=RSYSLOG_TraditionalFileFormat`
`65`		`- // +kubebuilder:validation:Enum=RSYSLOG_TraditionalFileFormat;RSYSLOG_SyslogProtocol23Format`
	`65`	`+ // +kubebuilder:validation:Enum="";RSYSLOG_TraditionalFileFormat;RSYSLOG_SyslogProtocol23Format`
`66`	`66`	RsyslogTemplate string `json:"rsyslogTemplate"`
`67`	`67`	`}`
`68`	`68`