diff --git a/deploy/crds/infra.watch_servicetelemetrys_crd.yaml b/deploy/crds/infra.watch_servicetelemetrys_crd.yaml index 857a172af..a23dcf619 100644 --- a/deploy/crds/infra.watch_servicetelemetrys_crd.yaml +++ b/deploy/crds/infra.watch_servicetelemetrys_crd.yaml @@ -172,24 +172,28 @@ spec: enabled: description: Enable Elasticsearch as a storage backend for events type: boolean - extHostUrl: - description: URL of Elasticsearch HTTP(S) endpoint - type: string - extTlsServerName: - description: (if required) Server Name expected to match the certificate presented by the endpoint - type: string - extTlsSecretName: - description: (if required) Name of the secret that stores the CA cert and client cert/key - type: string - extUserSecretName: - description: (if required) Name of the secret that stores the Basic Auth credentials - type: string - extUseBasicAuth: - description: Whether to provide HTTP Basic Auth headers - type: boolean - extUseTls: - description: Whether to enable TLS - type: boolean + forwarding: + description: Configuration for where to forward events + type: object + properties: + hostUrl: + description: URL of Elasticsearch HTTP(S) endpoint + type: string + tlsServerName: + description: (if required) Server Name expected to match the certificate presented by the endpoint + type: string + tlsSecretName: + description: (if required) Name of the secret that stores the CA cert and client cert/key + type: string + userSecretName: + description: (if required) Name of the secret that stores the Basic Auth credentials + type: string + useBasicAuth: + description: Whether to provide HTTP Basic Auth headers + type: boolean + useTls: + description: Whether to enable TLS + type: boolean version: description: (DEPRECATED - Use ext* after STF 1.5.3) Version of Elasticsearch to deploy. Elasticsearch licensing has changed as of version 7.11. See https://www.elastic.co/pricing/faq/licensing for details. type: string diff --git a/deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml b/deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml index 8199930e6..6129e9b41 100644 --- a/deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml +++ b/deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml @@ -36,12 +36,13 @@ spec: events: elasticsearch: enabled: false - extHostUrl: https://external-elastic-http.domain:9200 - extTlsServerName: "" - extTlsSecretName: elasticsearch-es-cert - extUserSecretName: elasticsearch-es-elastic-user - extUseBasicAuth: true - extUseTls: true + forwarding: + hostUrl: https://external-elastic-http.domain:9200 + tlsServerName: "" + tlsSecretName: elasticsearch-es-cert + userSecretName: elasticsearch-es-elastic-user + useBasicAuth: true + useTls: true version: 7.16.1 storage: strategy: persistent diff --git a/deploy/olm-catalog/service-telemetry-operator/manifests/infra.watch_servicetelemetrys_crd.yaml b/deploy/olm-catalog/service-telemetry-operator/manifests/infra.watch_servicetelemetrys_crd.yaml index fd53687f8..8648d06c2 100644 --- a/deploy/olm-catalog/service-telemetry-operator/manifests/infra.watch_servicetelemetrys_crd.yaml +++ b/deploy/olm-catalog/service-telemetry-operator/manifests/infra.watch_servicetelemetrys_crd.yaml @@ -147,27 +147,31 @@ spec: description: Enable Elasticsearch as a storage backend for events type: boolean - extHostUrl: - description: URL of Elasticsearch HTTP(S) endpoint - type: string - extTlsSecretName: - description: (if required) Name of the secret that stores - the CA cert and client cert/key - type: string - extTlsServerName: - description: (if required) Server Name expected to match - the certificate presented by the endpoint - type: string - extUseBasicAuth: - description: Whether to provide HTTP Basic Auth headers - type: boolean - extUseTls: - description: Whether to enable TLS - type: boolean - extUserSecretName: - description: (if required) Name of the secret that stores - the Basic Auth credentials - type: string + forwarding: + description: Configuration for where to forward events + properties: + hostUrl: + description: URL of Elasticsearch HTTP(S) endpoint + type: string + tlsSecretName: + description: (if required) Name of the secret that + stores the CA cert and client cert/key + type: string + tlsServerName: + description: (if required) Server Name expected to + match the certificate presented by the endpoint + type: string + useBasicAuth: + description: Whether to provide HTTP Basic Auth headers + type: boolean + useTls: + description: Whether to enable TLS + type: boolean + userSecretName: + description: (if required) Name of the secret that + stores the Basic Auth credentials + type: string + type: object nodeCount: description: (DEPRECATED - Use ext* after STF 1.5.3) Elasticsearch node count diff --git a/deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml b/deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml index 49431b80d..7b865921e 100644 --- a/deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml @@ -44,12 +44,14 @@ metadata: "endpointCertDuration": "70080h" }, "enabled": false, - "extHostUrl": "https://external-elastic-http.domain:9200", - "extTlsSecretName": "elasticsearch-es-cert", - "extTlsServerName": "", - "extUseBasicAuth": true, - "extUseTls": true, - "extUserSecretName": "elasticsearch-es-elastic-user", + "forwarding": { + "hostUrl": "https://external-elastic-http.domain:9200", + "tlsSecretName": "elasticsearch-es-cert", + "tlsServerName": "", + "useBasicAuth": true, + "useTls": true, + "userSecretName": "elasticsearch-es-elastic-user" + }, "storage": { "persistent": { "pvcStorageRequest": "20Gi"