operator: Add support for configuring HTTP server timeouts

operator/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Main
 
+- [9405](https://github.com/grafana/loki/pull/9405) **periklis**: Add support for configuring HTTP server timeouts
 - [9378](https://github.com/grafana/loki/pull/9378) **aminesnow**: Add zone aware API spec validation
 - [9408](https://github.com/grafana/loki/pull/9408) **JoaoBraveCoding**: Add PodAntiAffinity overwrites per component
 - [9429](https://github.com/grafana/loki/pull/9429) **aminesnow**: Add default TopologySpreadContraints to Gateway

operator/bundle/community-openshift/manifests/loki-operator.clusterserviceversion.yaml

@@ -150,7 +150,7 @@ metadata:
     categories: OpenShift Optional, Logging & Tracing
     certified: "false"
     containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
-    createdAt: "2023-05-11T08:04:29Z"
+    createdAt: "2023-05-17T13:41:47Z"
     description: The Community Loki Operator provides Kubernetes native deployment
       and management of Loki and related logging components.
     operators.operatorframework.io/builder: operator-sdk-unknown

operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml

@@ -150,7 +150,7 @@ metadata:
     categories: OpenShift Optional, Logging & Tracing
     certified: "false"
     containerImage: docker.io/grafana/loki-operator:main-ac1c1fd
-    createdAt: "2023-05-11T08:04:26Z"
+    createdAt: "2023-05-17T13:41:44Z"
     description: The Community Loki Operator provides Kubernetes native deployment
       and management of Loki and related logging components.
     operators.operatorframework.io/builder: operator-sdk-unknown

operator/bundle/openshift/manifests/loki-operator.clusterserviceversion.yaml

@@ -150,7 +150,7 @@ metadata:
     categories: OpenShift Optional, Logging & Tracing
     certified: "false"
     containerImage: quay.io/openshift-logging/loki-operator:v0.1.0
-    createdAt: "2023-05-11T08:04:32Z"
+    createdAt: "2023-05-17T13:41:50Z"
     description: |
       The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
       ## Prerequisites and Requirements

operator/docs/operator/api.md

@@ -1302,6 +1302,21 @@ the component onto it.</p>
 the component onto it.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>podAntiAffinity</code><br/>
+<em>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#podantiaffinity-v1-core">
+Kubernetes core/v1.PodAntiAffinity
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>PodAntiAffinity defines the pod anti affinity scheduling rules to schedule pods
+of a component.</p>
+</td>
+</tr>
 </tbody>
 </table>
 
@@ -3329,7 +3344,8 @@ int32
 </td>
 <td>
 <em>(Optional)</em>
-<p>Zones defines an array of ZoneSpec that the scheduler will try to satisfy.</p>
+<p>Zones defines an array of ZoneSpec that the scheduler will try to satisfy.
+IMPORTANT: Make sure that the replication factor defined is less than or equal to the number of available zones.</p>
 </td>
 </tr>
 </tbody>

operator/internal/handlers/lokistack_create_or_update.go

@@ -269,6 +269,11 @@ func CreateOrUpdateLokiStack(
 		certRotationRequiredAt = stack.Annotations[manifests.AnnotationCertRotationRequiredAt]
 	}
 
+	serverCfg, err := manifests.NewServerConfig(stack.Spec.Limits)
+	if err != nil {
+		ll.Error(err, "failed to parser server limits using fallback to defaults")
+	}
+
 	// Here we will translate the lokiv1.LokiStack options into manifest options
 	opts := manifests.Options{
 		Name:                   req.Name,
@@ -286,6 +291,7 @@ func CreateOrUpdateLokiStack(
 			Spec:   rulerConfig,
 			Secret: rulerSecret,
 		},
+		Server: serverCfg,
 		Tenants: manifests.Tenants{
 			Secrets: tenantSecrets,
 			Configs: tenantConfigs,

operator/internal/manifests/build_test.go

@@ -17,6 +17,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func defaultServerConfig() ServerConfig {
+	s, _ := NewServerConfig(nil)
+	return s
+}
+
 func TestApplyUserOptions_OverrideDefaults(t *testing.T) {
 	allSizes := []lokiv1.LokiStackSizeType{
 		lokiv1.SizeOneXDemo,
@@ -36,6 +41,7 @@ func TestApplyUserOptions_OverrideDefaults(t *testing.T) {
 					},
 				},
 			},
+			Server: defaultServerConfig(),
 		}
 		err := ApplyDefaultSettings(&opt)
 		defs := internal.StackSizeTable[size]
@@ -78,6 +84,7 @@ func TestApplyUserOptions_AlwaysSetCompactorReplicasToOne(t *testing.T) {
 					},
 				},
 			},
+			Server: defaultServerConfig(),
 		}
 		err := ApplyDefaultSettings(&opt)
 		defs := internal.StackSizeTable[size]
@@ -232,6 +239,7 @@ func TestBuildAll_WithFeatureGates_ServiceMonitors(t *testing.T) {
 						ServingCertsService: false,
 					},
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -250,6 +258,7 @@ func TestBuildAll_WithFeatureGates_ServiceMonitors(t *testing.T) {
 						ServingCertsService: false,
 					},
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}
@@ -292,6 +301,7 @@ func TestBuildAll_WithFeatureGates_OpenShift_ServingCertsService(t *testing.T) {
 						ServingCertsService: false,
 					},
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -309,6 +319,7 @@ func TestBuildAll_WithFeatureGates_OpenShift_ServingCertsService(t *testing.T) {
 						ServingCertsService: true,
 					},
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}
@@ -349,6 +360,7 @@ func TestBuildAll_WithFeatureGates_HTTPEncryption(t *testing.T) {
 		Gates: configv1.FeatureGates{
 			HTTPEncryption: true,
 		},
+		Server: defaultServerConfig(),
 	}
 
 	err := ApplyDefaultSettings(&opts)
@@ -422,6 +434,7 @@ func TestBuildAll_WithFeatureGates_ServiceMonitorTLSEndpoints(t *testing.T) {
 			HTTPEncryption:             true,
 			ServiceMonitorTLSEndpoints: true,
 		},
+		Server: defaultServerConfig(),
 	}
 
 	err := ApplyDefaultSettings(&opts)
@@ -526,6 +539,7 @@ func TestBuildAll_WithFeatureGates_GRPCEncryption(t *testing.T) {
 				Gates: configv1.FeatureGates{
 					GRPCEncryption: false,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -568,6 +582,7 @@ func TestBuildAll_WithFeatureGates_GRPCEncryption(t *testing.T) {
 				Gates: configv1.FeatureGates{
 					GRPCEncryption: true,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}
@@ -692,6 +707,7 @@ func TestBuildAll_WithFeatureGates_RuntimeSeccompProfile(t *testing.T) {
 				Gates: configv1.FeatureGates{
 					RuntimeSeccompProfile: false,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -734,6 +750,7 @@ func TestBuildAll_WithFeatureGates_RuntimeSeccompProfile(t *testing.T) {
 				Gates: configv1.FeatureGates{
 					RuntimeSeccompProfile: true,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}
@@ -797,6 +814,7 @@ func TestBuildAll_WithFeatureGates_LokiStackGateway(t *testing.T) {
 					HTTPEncryption:             true,
 					ServiceMonitorTLSEndpoints: false,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -835,6 +853,7 @@ func TestBuildAll_WithFeatureGates_LokiStackGateway(t *testing.T) {
 					HTTPEncryption:             true,
 					ServiceMonitorTLSEndpoints: true,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}
@@ -873,6 +892,7 @@ func TestBuildAll_WithFeatureGates_LokiStackAlerts(t *testing.T) {
 					ServiceMonitors: false,
 					LokiStackAlerts: false,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 		{
@@ -887,6 +907,7 @@ func TestBuildAll_WithFeatureGates_LokiStackAlerts(t *testing.T) {
 					ServiceMonitors: true,
 					LokiStackAlerts: true,
 				},
+				Server: defaultServerConfig(),
 			},
 		},
 	}

operator/internal/manifests/config.go

@@ -4,6 +4,7 @@ import (
 	"crypto/sha1"
 	"fmt"
 	"strings"
+	"time"
 
 	lokiv1 "github.com/grafana/loki/operator/apis/loki/v1"
 	"github.com/grafana/loki/operator/internal/manifests/internal/config"
@@ -172,6 +173,7 @@ func ConfigOptions(opt Options) config.Options {
 			IngesterMemoryRequest: opt.ResourceRequirements.Ingester.Requests.Memory().Value(),
 		},
 		ObjectStorage:         opt.ObjectStorage,
+		Server:                serverConfig(opt.Server),
 		EnableRemoteReporting: opt.Gates.GrafanaLabsUsageReport,
 		Ruler: config.Ruler{
 			Enabled:               rulerEnabled,
@@ -186,6 +188,33 @@ func ConfigOptions(opt Options) config.Options {
 	}
 }
 
+func serverConfig(cfg ServerConfig) config.ServerConfig {
+	oneMinute := 1 * time.Minute
+
+	idleTimeout := fmt.Sprintf("%.fm", cfg.HTTP.IdleTimeout.Minutes())
+	if cfg.HTTP.IdleTimeout < oneMinute {
+		idleTimeout = fmt.Sprintf("%.fs", cfg.HTTP.IdleTimeout.Seconds())
+	}
+
+	readTimeout := fmt.Sprintf("%.fm", cfg.HTTP.ReadTimeout.Minutes())
+	if cfg.HTTP.ReadTimeout < oneMinute {
+		readTimeout = fmt.Sprintf("%.fs", cfg.HTTP.ReadTimeout.Seconds())
+	}
+
+	writeTimeout := fmt.Sprintf("%.fm", cfg.HTTP.WriteTimeout.Minutes())
+	if cfg.HTTP.WriteTimeout < oneMinute {
+		writeTimeout = fmt.Sprintf("%.fs", cfg.HTTP.WriteTimeout.Seconds())
+	}
+
+	return config.ServerConfig{
+		HTTP: config.HTTPServerConfig{
+			IdleTimeout:  idleTimeout,
+			ReadTimeout:  readTimeout,
+			WriteTimeout: writeTimeout,
+		},
+	}
+}
+
 func alertManagerConfig(spec *lokiv1.AlertManagerSpec) *config.AlertManagerConfig {
 	if spec == nil {
 		return nil