Skip to content

Commit 87e291d

Browse files
address review comments
1 parent c8eac55 commit 87e291d

19 files changed

Lines changed: 146 additions & 116 deletions

‎operator/api/loki/v1/lokistack_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,11 +1303,11 @@ type TLSSpec struct {
13031303
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Certificate"
13041304
Certificate *ValueReference `json:"certificate,omitempty"`
13051305

1306-
// Key points to the private key of the server certificate.
1306+
// PrivateKey points to the private key of the server certificate.
13071307
//
13081308
// +kubebuilder:validation:Optional
1309-
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Certificate Key"
1310-
Key *SecretReference `json:"key,omitempty"`
1309+
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Private Key"
1310+
PrivateKey *SecretReference `json:"privateKey,omitempty"`
13111311
}
13121312

13131313
// LokiStackConditionType deifnes the type of condition types of a Loki deployment.

‎operator/api/loki/v1/zz_generated.deepcopy.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 6 additions & 6 deletions
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.9.0
155-
createdAt: "2026-01-08T09:59:48Z"
155+
createdAt: "2026-01-20T13:22:57Z"
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"
@@ -1064,18 +1064,18 @@ spec:
10641064
path: tenants.gateway.tls.certificate.secretName
10651065
x-descriptors:
10661066
- urn:alm:descriptor:com.tectonic.ui:text
1067-
- description: Key points to the private key of the server certificate.
1068-
displayName: Certificate Key
1069-
path: tenants.gateway.tls.key
1067+
- description: PrivateKey points to the private key of the server certificate.
1068+
displayName: Private Key
1069+
path: tenants.gateway.tls.privateKey
10701070
- description: Key contains the name of the key inside the referenced Secret.
10711071
displayName: Key Name
1072-
path: tenants.gateway.tls.key.key
1072+
path: tenants.gateway.tls.privateKey.key
10731073
x-descriptors:
10741074
- urn:alm:descriptor:com.tectonic.ui:text
10751075
- description: SecretName contains the name of the Secret containing the referenced
10761076
value.
10771077
displayName: Secret Name
1078-
path: tenants.gateway.tls.key.secretName
1078+
path: tenants.gateway.tls.privateKey.secretName
10791079
x-descriptors:
10801080
- urn:alm:descriptor:com.tectonic.ui:text
10811081
- description: Mode defines the mode in which lokistack-gateway component will

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3928,9 +3928,9 @@ spec:
39283928
- message: Only one of configMapName and secretName can
39293929
be set
39303930
rule: '!(has(self.configMapName) && has(self.secretName))'
3931-
key:
3932-
description: Key points to the private key of the server
3933-
certificate.
3931+
privateKey:
3932+
description: PrivateKey points to the private key of the
3933+
server certificate.
39343934
properties:
39353935
key:
39363936
description: Key contains the name of the key inside

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

Lines changed: 6 additions & 6 deletions
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.9.0
155-
createdAt: "2026-01-08T09:59:46Z"
155+
createdAt: "2026-01-20T13:22:56Z"
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
@@ -1057,18 +1057,18 @@ spec:
10571057
path: tenants.gateway.tls.certificate.secretName
10581058
x-descriptors:
10591059
- urn:alm:descriptor:com.tectonic.ui:text
1060-
- description: Key points to the private key of the server certificate.
1061-
displayName: Certificate Key
1062-
path: tenants.gateway.tls.key
1060+
- description: PrivateKey points to the private key of the server certificate.
1061+
displayName: Private Key
1062+
path: tenants.gateway.tls.privateKey
10631063
- description: Key contains the name of the key inside the referenced Secret.
10641064
displayName: Key Name
1065-
path: tenants.gateway.tls.key.key
1065+
path: tenants.gateway.tls.privateKey.key
10661066
x-descriptors:
10671067
- urn:alm:descriptor:com.tectonic.ui:text
10681068
- description: SecretName contains the name of the Secret containing the referenced
10691069
value.
10701070
displayName: Secret Name
1071-
path: tenants.gateway.tls.key.secretName
1071+
path: tenants.gateway.tls.privateKey.secretName
10721072
x-descriptors:
10731073
- urn:alm:descriptor:com.tectonic.ui:text
10741074
- description: Mode defines the mode in which lokistack-gateway component will

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3929,9 +3929,9 @@ spec:
39293929
- message: Only one of configMapName and secretName can
39303930
be set
39313931
rule: '!(has(self.configMapName) && has(self.secretName))'
3932-
key:
3933-
description: Key points to the private key of the server
3934-
certificate.
3932+
privateKey:
3933+
description: PrivateKey points to the private key of the
3934+
server certificate.
39353935
properties:
39363936
key:
39373937
description: Key contains the name of the key inside

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

Lines changed: 6 additions & 6 deletions
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: "2026-01-08T09:59:49Z"
155+
createdAt: "2026-01-20T13:22:58Z"
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
@@ -1077,18 +1077,18 @@ spec:
10771077
path: tenants.gateway.tls.certificate.secretName
10781078
x-descriptors:
10791079
- urn:alm:descriptor:com.tectonic.ui:text
1080-
- description: Key points to the private key of the server certificate.
1081-
displayName: Certificate Key
1082-
path: tenants.gateway.tls.key
1080+
- description: PrivateKey points to the private key of the server certificate.
1081+
displayName: Private Key
1082+
path: tenants.gateway.tls.privateKey
10831083
- description: Key contains the name of the key inside the referenced Secret.
10841084
displayName: Key Name
1085-
path: tenants.gateway.tls.key.key
1085+
path: tenants.gateway.tls.privateKey.key
10861086
x-descriptors:
10871087
- urn:alm:descriptor:com.tectonic.ui:text
10881088
- description: SecretName contains the name of the Secret containing the referenced
10891089
value.
10901090
displayName: Secret Name
1091-
path: tenants.gateway.tls.key.secretName
1091+
path: tenants.gateway.tls.privateKey.secretName
10921092
x-descriptors:
10931093
- urn:alm:descriptor:com.tectonic.ui:text
10941094
- description: Mode defines the mode in which lokistack-gateway component will

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3928,9 +3928,9 @@ spec:
39283928
- message: Only one of configMapName and secretName can
39293929
be set
39303930
rule: '!(has(self.configMapName) && has(self.secretName))'
3931-
key:
3932-
description: Key points to the private key of the server
3933-
certificate.
3931+
privateKey:
3932+
description: PrivateKey points to the private key of the
3933+
server certificate.
39343934
properties:
39353935
key:
39363936
description: Key contains the name of the key inside

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3910,9 +3910,9 @@ spec:
39103910
- message: Only one of configMapName and secretName can
39113911
be set
39123912
rule: '!(has(self.configMapName) && has(self.secretName))'
3913-
key:
3914-
description: Key points to the private key of the server
3915-
certificate.
3913+
privateKey:
3914+
description: PrivateKey points to the private key of the
3915+
server certificate.
39163916
properties:
39173917
key:
39183918
description: Key contains the name of the key inside

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -977,18 +977,18 @@ spec:
977977
path: tenants.gateway.tls.certificate.secretName
978978
x-descriptors:
979979
- urn:alm:descriptor:com.tectonic.ui:text
980-
- description: Key points to the private key of the server certificate.
981-
displayName: Certificate Key
982-
path: tenants.gateway.tls.key
980+
- description: PrivateKey points to the private key of the server certificate.
981+
displayName: Private Key
982+
path: tenants.gateway.tls.privateKey
983983
- description: Key contains the name of the key inside the referenced Secret.
984984
displayName: Key Name
985-
path: tenants.gateway.tls.key.key
985+
path: tenants.gateway.tls.privateKey.key
986986
x-descriptors:
987987
- urn:alm:descriptor:com.tectonic.ui:text
988988
- description: SecretName contains the name of the Secret containing the referenced
989989
value.
990990
displayName: Secret Name
991-
path: tenants.gateway.tls.key.secretName
991+
path: tenants.gateway.tls.privateKey.secretName
992992
x-descriptors:
993993
- urn:alm:descriptor:com.tectonic.ui:text
994994
- description: Mode defines the mode in which lokistack-gateway component will

0 commit comments

Comments
 (0)