From 3f75cb21e4f2ac9d5b8177c3b44973fe0bdaea2d Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 22 Nov 2022 15:56:25 +0100 Subject: [PATCH] operator: Fix object storage TLS spec CAKey descriptor (#7744) --- operator/CHANGELOG.md | 4 ++++ operator/apis/loki/v1/lokistack_types.go | 2 +- .../bundle/manifests/loki-operator.clusterserviceversion.yaml | 2 -- .../manifests/bases/loki-operator.clusterserviceversion.yaml | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index dc78644b4e05..f175523425de 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,9 @@ ## Main +- [7744](https://github.com/grafana/loki/pull/7744) **periklis**: Fix object storage TLS spec CAKey descriptor +- [7716](https://github.com/grafana/loki/pull/7716) **aminesnow**: Migrate API docs generation tool +- [7710](https://github.com/grafana/loki/pull/7710) **periklis**: Fix LokiStackController watches for cluster-scoped resources +- [7682](https://github.com/grafana/loki/pull/7682) **periklis**: Refactor cluster proxy to use configv1.Proxy on OpenShift - [7711](https://github.com/grafana/loki/pull/7711) **Red-GV**: Remove default value from replicationFactor field - [7617](https://github.com/grafana/loki/pull/7617) **Red-GV**: Modify ingestionRate for respective shirt size - [7214](https://github.com/grafana/loki/pull/7214) **periklis**: Fix ruler GRPC tls client configuration diff --git a/operator/apis/loki/v1/lokistack_types.go b/operator/apis/loki/v1/lokistack_types.go index 7917f28db94f..2bd6cbd54863 100644 --- a/operator/apis/loki/v1/lokistack_types.go +++ b/operator/apis/loki/v1/lokistack_types.go @@ -329,7 +329,7 @@ type ObjectStorageTLSSpec struct { // +optional // +kubebuilder:validation:optional // +kubebuilder:default:=service-ca.crt - // +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:io.kubernetes:ConfigMap",displayName="CA ConfigMap Key" + // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CA ConfigMap Key" CAKey string `json:"caKey,omitempty"` // CA is the name of a ConfigMap containing a CA certificate. // It needs to be in the same namespace as the LokiStack custom resource. diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index e184d075138c..b0a5ab26cee4 100644 --- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml @@ -468,8 +468,6 @@ spec: It needs to be in the same namespace as the LokiStack custom resource. displayName: CA ConfigMap Key path: storage.tls.caKey - x-descriptors: - - urn:alm:descriptor:io.kubernetes:ConfigMap - description: CA is the name of a ConfigMap containing a CA certificate. It needs to be in the same namespace as the LokiStack custom resource. displayName: CA ConfigMap Name diff --git a/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml index 09102c595014..c4869905dd16 100644 --- a/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml @@ -323,8 +323,6 @@ spec: It needs to be in the same namespace as the LokiStack custom resource. displayName: CA ConfigMap Key path: storage.tls.caKey - x-descriptors: - - urn:alm:descriptor:io.kubernetes:ConfigMap - description: CA is the name of a ConfigMap containing a CA certificate. It needs to be in the same namespace as the LokiStack custom resource. displayName: CA ConfigMap Name