operator: Move cli flags to component config (grafana#6433)

Author: periklis

operator/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Main
 
 - [6411](https://github.com/grafana/loki/pull/6411) **Red-GV**: Extend schema validation in LokiStack webhook
+- [6334](https://github.com/grafana/loki/pull/6433) **periklis**: Move operator cli flags to component config
 - [6224](https://github.com/grafana/loki/pull/6224) **periklis**: Add support for GRPC over TLS for Loki components
 - [5952](https://github.com/grafana/loki/pull/5952) **Red-GV**: Add api to change storage schema version
 - [6363](https://github.com/grafana/loki/pull/6363) **periklis**: Allow optional installation of webhooks (Kind)

operator/Dockerfile

@@ -11,7 +11,7 @@ RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
-COPY api/ api/
+COPY apis/ apis/
 COPY controllers/ controllers/
 COPY internal/ internal/
 

operator/PROJECT

@@ -1,6 +1,8 @@
+componentConfig: true
 domain: grafana.com
 layout:
 - go.kubebuilder.io/v3
+multigroup: true
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
@@ -14,7 +16,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: LokiStack
-  path: github.com/grafana/loki/operator/api/v1beta1
+  path: github.com/grafana/loki/operator/apis/loki/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -23,7 +25,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: AlertingRule
-  path: github.com/grafana/loki/operator/api/v1beta1
+  path: github.com/grafana/loki/operator/apis/loki/v1beta1
   version: v1beta1
   webhooks:
     validation: true
@@ -35,7 +37,7 @@ resources:
   domain: grafana.com
   group: loki
   kind: RecordingRule
-  path: github.com/grafana/loki/operator/api/v1beta1
+  path: github.com/grafana/loki/operator/apis/loki/v1beta1
   version: v1beta1
   webhooks:
     validation: true
@@ -47,6 +49,6 @@ resources:
   domain: grafana.com
   group: loki
   kind: RulerConfig
-  path: github.com/grafana/loki/operator/api/v1beta1
+  path: github.com/grafana/loki/operator/apis/loki/v1beta1
   version: v1beta1
 version: "3"

operator/apis/config/v1/groupversion_info.go

@@ -0,0 +1,20 @@
+// Package v1 contains API Schema definitions for the config v1 API group
+//+kubebuilder:object:generate=true
+//+groupName=config.loki.grafana.com
+package v1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects
+	GroupVersion = schema.GroupVersion{Group: "config.loki.grafana.com", Version: "v1"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)

operator/apis/config/v1/projectconfig_types.go

@@ -0,0 +1,37 @@
+package v1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	cfg "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
+)
+
+// FeatureFlags is a set of operator feature flags.
+type FeatureFlags struct {
+	EnableCertificateSigningService bool `json:"enableCertSigningService,omitempty"`
+	EnableServiceMonitors           bool `json:"enableServiceMonitors,omitempty"`
+	EnableTLSServiceMonitorConfig   bool `json:"enableTlsServiceMonitorConfig,omitempty"`
+	EnableTLSGRPCServices           bool `json:"enableTlsGrpcServices,omitempty"`
+	EnablePrometheusAlerts          bool `json:"enableLokiStackAlerts,omitempty"`
+	EnableGateway                   bool `json:"enableLokiStackGateway,omitempty"`
+	EnableGatewayRoute              bool `json:"enableLokiStackGatewayRoute,omitempty"`
+	EnableGrafanaLabsStats          bool `json:"enableGrafanaLabsStats,omitempty"`
+	EnableLokiStackWebhook          bool `json:"enableLokiStackWebhook,omitempty"`
+	EnableAlertingRuleWebhook       bool `json:"enableAlertingRuleWebhook,omitempty"`
+	EnableRecordingRuleWebhook      bool `json:"enableRecordingRuleWebhook,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// ProjectConfig is the Schema for the projectconfigs API
+type ProjectConfig struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// ControllerManagerConfigurationSpec returns the contfigurations for controllers
+	cfg.ControllerManagerConfigurationSpec `json:",inline"`
+
+	Flags FeatureFlags `json:"featureFlags,omitempty"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ProjectConfig{})
+}

operator/apis/config/v1/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@ package v1beta1_test
 import (
 	"testing"
 
-	"github.com/grafana/loki/operator/api/v1beta1"
+	"github.com/grafana/loki/operator/apis/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

operator/api/v1beta1/alertingrule_types.go renamed to operator/apis/loki/v1beta1/alertingrule_types.go

@@ -3,7 +3,7 @@ package v1beta1_test
 import (
 	"testing"
 
-	"github.com/grafana/loki/operator/api/v1beta1"
+	"github.com/grafana/loki/operator/apis/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

operator/api/v1beta1/alertingrule_webhook.go renamed to operator/apis/loki/v1beta1/alertingrule_webhook.go

@@ -3,7 +3,7 @@ package v1beta1_test
 import (
 	"testing"
 
-	"github.com/grafana/loki/operator/api/v1beta1"
+	"github.com/grafana/loki/operator/apis/loki/v1beta1"
 	"github.com/stretchr/testify/require"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

operator/api/v1beta1/alertingrule_webhook_test.go renamed to operator/apis/loki/v1beta1/alertingrule_webhook_test.go

@@ -1,17 +1,31 @@
 apiVersion: v1
 data:
   controller_manager_config.yaml: |
-    apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
-    kind: ControllerManagerConfig
+    apiVersion: config.loki.grafana.com/v1
+    kind: ProjectConfig
     health:
       healthProbeBindAddress: :8081
     metrics:
+      # Bind only on this host to allow accessing metrics
+      # only via the kube-rbac-proxy sidecar.
       bindAddress: 127.0.0.1:8080
     webhook:
       port: 9443
     leaderElection:
-      leaderElect: true
+      leaderElect: false
       resourceName: e3716011.grafana.com
+    featureFlags:
+      enableCertSigningService: true
+      enableServiceMonitors: true
+      enableTlsServiceMonitorConfig: true
+      enableTlsGRPCServices: true
+      enableLokiStackAlerts: true
+      enableLokiStackGateway: true
+      enableLokiStackGatewayRoute: true
+      enableGrafanaLabsStats: true
+      enableLokiStackWebhook: true
+      enableAlertingRuleWebhook: true
+      enableRecordingRuleWebhook: true
 kind: ConfigMap
 metadata:
   labels:

operator/api/v1beta1/groupversion_info.go renamed to operator/apis/loki/v1beta1/groupversion_info.go

@@ -1176,13 +1176,7 @@ spec:
             spec:
               containers:
               - args:
-                - --with-lokistack-gateway
-                - --with-lokistack-gateway-route
-                - --with-cert-signing-service
-                - --with-tls-grpc-services
-                - --with-service-monitors
-                - --with-tls-service-monitors
-                - --with-prometheus-alerts
+                - --config=controller_manager_config.yaml
                 command:
                 - /manager
                 env:
@@ -1220,6 +1214,9 @@ spec:
                 - mountPath: /tmp/k8s-webhook-server/serving-certs
                   name: webhook-cert
                   readOnly: true
+                - mountPath: /controller_manager_config.yaml
+                  name: manager-config
+                  subPath: controller_manager_config.yaml
               - args:
                 - --secure-listen-address=0.0.0.0:8443
                 - --upstream=http://127.0.0.1:8080/
@@ -1244,6 +1241,9 @@ spec:
                 secret:
                   defaultMode: 420
                   secretName: loki-operator-webhook-service
+              - configMap:
+                  name: loki-operator-manager-config
+                name: manager-config
               - name: loki-operator-metrics-cert
                 secret:
                   defaultMode: 420

operator/api/v1beta1/lokistack_types.go renamed to operator/apis/loki/v1beta1/lokistack_types.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/ViaQ/logerr/v2/log"
 	"github.com/go-logr/logr"
-	"github.com/grafana/loki/operator/api/v1beta1"
+	"github.com/grafana/loki/operator/apis/loki/v1beta1"
 	"github.com/grafana/loki/operator/internal/manifests"
 	"github.com/grafana/loki/operator/internal/manifests/storage"
 	"sigs.k8s.io/yaml"