Skip to content

Commit 6ab8f6c

Browse files
committed
feat: openshift mode to allow both logging and network
1 parent 37eddab commit 6ab8f6c

32 files changed

+834
-48
lines changed

operator/api/loki/v1/lokistack_types.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ type AuthenticationSpec struct {
237237

238238
// ModeType is the authentication/authorization mode in which LokiStack Gateway will be configured.
239239
//
240-
// +kubebuilder:validation:Enum=static;dynamic;openshift-logging;openshift-network
240+
// +kubebuilder:validation:Enum=static;dynamic;openshift-logging;openshift-network;openshift
241241
type ModeType string
242242

243243
const (
@@ -250,6 +250,8 @@ const (
250250
OpenshiftLogging ModeType = "openshift-logging"
251251
// OpenshiftNetwork mode provides fully automatic OpenShift in-cluster authentication and authorization support for network logs only.
252252
OpenshiftNetwork ModeType = "openshift-network"
253+
// Openshif mode provides fully automatic OpenShift in-cluster authentication and authorization support for application, infrastructure, audit and network logs.
254+
Openshift ModeType = "openshift"
253255
)
254256

255257
// TenantsSpec defines the mode, authentication and authorization
@@ -260,7 +262,7 @@ type TenantsSpec struct {
260262
// +required
261263
// +kubebuilder:validation:Required
262264
// +kubebuilder:default:=openshift-logging
263-
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:select:static","urn:alm:descriptor:com.tectonic.ui:select:dynamic","urn:alm:descriptor:com.tectonic.ui:select:openshift-logging","urn:alm:descriptor:com.tectonic.ui:select:openshift-network"},displayName="Mode"
265+
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:select:static","urn:alm:descriptor:com.tectonic.ui:select:dynamic","urn:alm:descriptor:com.tectonic.ui:select:openshift-logging","urn:alm:descriptor:com.tectonic.ui:select:openshift-network","urn:alm:descriptor:com.tectonic.ui:select:openshift"},displayName="Mode"
264266
Mode ModeType `json:"mode"`
265267
// Authentication defines the lokistack-gateway component authentication configuration spec per tenant.
266268
//

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
categories: OpenShift Optional, Logging & Tracing
153153
certified: "false"
154154
containerImage: docker.io/grafana/loki-operator:0.8.0
155-
createdAt: "2025-09-12T11:03:05Z"
155+
createdAt: "2025-09-22T10:10:09Z"
156156
description: The Community Loki Operator provides Kubernetes native deployment
157157
and management of Loki and related logging components.
158158
features.operators.openshift.io/disconnected: "true"
@@ -1005,6 +1005,7 @@ spec:
10051005
- urn:alm:descriptor:com.tectonic.ui:select:dynamic
10061006
- urn:alm:descriptor:com.tectonic.ui:select:openshift-logging
10071007
- urn:alm:descriptor:com.tectonic.ui:select:openshift-network
1008+
- urn:alm:descriptor:com.tectonic.ui:select:openshift
10081009
- description: Openshift defines the configuration specific to Openshift modes.
10091010
displayName: Openshift
10101011
path: tenants.openshift

operator/bundle/community-openshift/manifests/loki.grafana.com_lokistacks.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,6 +3856,7 @@ spec:
38563856
- dynamic
38573857
- openshift-logging
38583858
- openshift-network
3859+
- openshift
38593860
type: string
38603861
openshift:
38613862
description: Openshift defines the configuration specific to Openshift

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
categories: OpenShift Optional, Logging & Tracing
153153
certified: "false"
154154
containerImage: docker.io/grafana/loki-operator:0.8.0
155-
createdAt: "2025-09-12T11:03:03Z"
155+
createdAt: "2025-09-22T10:10:06Z"
156156
description: The Community Loki Operator provides Kubernetes native deployment
157157
and management of Loki and related logging components.
158158
operators.operatorframework.io/builder: operator-sdk-unknown
@@ -998,6 +998,7 @@ spec:
998998
- urn:alm:descriptor:com.tectonic.ui:select:dynamic
999999
- urn:alm:descriptor:com.tectonic.ui:select:openshift-logging
10001000
- urn:alm:descriptor:com.tectonic.ui:select:openshift-network
1001+
- urn:alm:descriptor:com.tectonic.ui:select:openshift
10011002
- description: Openshift defines the configuration specific to Openshift modes.
10021003
displayName: Openshift
10031004
path: tenants.openshift

operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3857,6 +3857,7 @@ spec:
38573857
- dynamic
38583858
- openshift-logging
38593859
- openshift-network
3860+
- openshift
38603861
type: string
38613862
openshift:
38623863
description: Openshift defines the configuration specific to Openshift

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
categories: OpenShift Optional, Logging & Tracing
153153
certified: "false"
154154
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
155-
createdAt: "2025-09-12T11:03:07Z"
155+
createdAt: "2025-09-22T10:10:11Z"
156156
description: |
157157
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
158158
## Prerequisites and Requirements
@@ -1018,6 +1018,7 @@ spec:
10181018
- urn:alm:descriptor:com.tectonic.ui:select:dynamic
10191019
- urn:alm:descriptor:com.tectonic.ui:select:openshift-logging
10201020
- urn:alm:descriptor:com.tectonic.ui:select:openshift-network
1021+
- urn:alm:descriptor:com.tectonic.ui:select:openshift
10211022
- description: Openshift defines the configuration specific to Openshift modes.
10221023
displayName: Openshift
10231024
path: tenants.openshift

operator/bundle/openshift/manifests/loki.grafana.com_lokistacks.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,6 +3856,7 @@ spec:
38563856
- dynamic
38573857
- openshift-logging
38583858
- openshift-network
3859+
- openshift
38593860
type: string
38603861
openshift:
38613862
description: Openshift defines the configuration specific to Openshift

operator/config/crd/bases/loki.grafana.com_lokistacks.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3838,6 +3838,7 @@ spec:
38383838
- dynamic
38393839
- openshift-logging
38403840
- openshift-network
3841+
- openshift
38413842
type: string
38423843
openshift:
38433844
description: Openshift defines the configuration specific to Openshift

operator/config/manifests/community-openshift/bases/loki-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,7 @@ spec:
918918
- urn:alm:descriptor:com.tectonic.ui:select:dynamic
919919
- urn:alm:descriptor:com.tectonic.ui:select:openshift-logging
920920
- urn:alm:descriptor:com.tectonic.ui:select:openshift-network
921+
- urn:alm:descriptor:com.tectonic.ui:select:openshift
921922
- description: Openshift defines the configuration specific to Openshift modes.
922923
displayName: Openshift
923924
path: tenants.openshift

operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ spec:
911911
- urn:alm:descriptor:com.tectonic.ui:select:dynamic
912912
- urn:alm:descriptor:com.tectonic.ui:select:openshift-logging
913913
- urn:alm:descriptor:com.tectonic.ui:select:openshift-network
914+
- urn:alm:descriptor:com.tectonic.ui:select:openshift
914915
- description: Openshift defines the configuration specific to Openshift modes.
915916
displayName: Openshift
916917
path: tenants.openshift

0 commit comments

Comments
 (0)