Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

US-641138: Updated srs backingservice helm chart to support both Elasticsearch & OpenSearch #848

Merged
merged 4 commits into from
Nov 14, 2024
+41 −18
Merged

US-641138: Updated srs backingservice helm chart to support both Elasticsearch & OpenSearch #848

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b79953
US-641138: Updated srs backingservice helm chart to support both Elas…
saran-teja-7 Oct 24, 2024
7e278e4
Fixed linting issues
bhowd1 Nov 8, 2024
70d5793
Merge branch 'master' into feature/US-641138
bhowd1 Nov 12, 2024
3699152
Addressed review comments
bhowd1 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions charts/backingservices/charts/srs/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,37 @@ app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{- end }}

{{- define "srsStorageCredentials.username" -}}
{{- if .Values.srsStorage.esCredentials -}}
{{- .Values.srsStorage.esCredentials.username | b64enc}}
{{- else if .Values.srsStorage.authCredentials -}}
{{- .Values.srsStorage.authCredentials.username | b64enc}}
{{- end }}
{{- end }}

{{- define "srsStorageCredentials.password" -}}
{{- if .Values.srsStorage.esCredentials -}}
{{- .Values.srsStorage.esCredentials.password | b64enc}}
{{- else if .Values.srsStorage.authCredentials -}}
{{- .Values.srsStorage.authCredentials.password | b64enc}}
{{- end }}
{{- end }}

{{- define "esDeploymentUsername" -}}
{{- if and (.Values.srsStorage.tls.enabled) (not .Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.basicAuthentication.enabled) (not .Values.srsStorage.awsIAM)}}
{{- .Values.srsStorage.esCredentials.username | b64enc }}
{{- include "srsStorageCredentials.username" . }}
{{- else if and (.Values.srsStorage.basicAuthentication.enabled) (not .Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.tls.enabled) }}
{{- .Values.srsStorage.esCredentials.username | b64enc }}
{{- include "srsStorageCredentials.username" . }}
{{- else if and (.Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.awsIAM) }}
{{- "elastic" | b64enc }}
{{- end}}
{{- end}}

{{- define "esDeploymentPassword" -}}
{{- if and (.Values.srsStorage.tls.enabled) (not .Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.basicAuthentication.enabled) (not .Values.srsStorage.awsIAM)}}
{{- .Values.srsStorage.esCredentials.password | b64enc }}
{{- include "srsStorageCredentials.password" . }}
{{- else if and (.Values.srsStorage.basicAuthentication.enabled) (not .Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.tls.enabled) }}
{{- .Values.srsStorage.esCredentials.password | b64enc }}
{{- include "srsStorageCredentials.password" . }}
{{- else if and (.Values.srsStorage.provisionInternalESCluster) (not .Values.srsStorage.awsIAM) }}
{{- $secret := (lookup "v1" "Secret" .Release.Namespace "srs-elastic-credentials") }}
{{- if $secret }}
Expand Down
35 changes: 21 additions & 14 deletions charts/backingservices/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,44 +63,51 @@ srs:
# specified in the `elasticsearch` section
# If you do not enable SRS and the srs.enabled parameter is set to false, always set srs.srsStorage.provisionInternalESCluster=false
provisionInternalESCluster: true
# To use your own Elasticsearch cluster, set srsStorage.provisionInternalESCluster to false and then
# set the external Elasticsearch cluster URL and port details below when using an externally managed elasticsearch
# To use your own Elasticsearch/OpenSearch cluster, set srsStorage.provisionInternalESCluster to false and then
# set the external Elasticsearch/OpenSearch cluster URL and port details below when using an externally managed Elasticsearch/OpenSearch
# Ensure that the specified endpoint is accessible from the kubernetes cluster pods.
# domain: ""
# port: 9200
# protocol: https
# The elasticsearch connection supports three authentication methods: basic authentication ,
# AWS IAM role-based authentication and Elasticsearch secure connection(tls).
# Set srs.srsStorage.tls.enabled: true to enable the use of TLS-based authentication to your Elasticsearch service
# The Elasticsearch/OpenSearch connection supports three authentication methods: basic authentication ,
# AWS IAM role-based authentication and Elasticsearch/OpenSearch secure connection(tls).
# Set srs.srsStorage.tls.enabled: true to enable the use of TLS-based authentication to your Elasticsearch/OpenSearch service
# whether is it running as an internalized or externalized service in your SRS cluster.
tls:
enabled: false
# To specify a certificate used to authenticate an external Elasticsearch service (with tls.enabled: true and srsStorage.provisionInternalESCluster: false),
# uncomment the following lines to specify the TLS certificate name with password for your Elasticsearch service.
# To specify a certificate used to authenticate an external Elasticsearch/OpenSearch service (with tls.enabled: true and srsStorage.provisionInternalESCluster: false),
# uncomment the following lines to specify the TLS certificate name with password for your Elasticsearch/OpenSearch service.
# Default certificatePassword value will be empty if not used.
# certificateName: "Certificate_Name"
# certificatePassword: "password"
# To specify a certificate using a secret, uncomment the certsSecret parameter and provide the secret name containing your certificate and certificate password.
# Use the full name of the certificate file (together with file extension, for example, “certificate.p12” or “certificate.jks”) as a key name in the secret. Use this key name
# to configure the “certificateName” parameter. Use a key name “password” to provide the certificate password in the secret.
# certsSecret: srs-certificates
# Set srs.srsStorage.basicAuthentication.enabled: true to enable the use of basic authentication to your Elasticsearch service
# Set srs.srsStorage.basicAuthentication.enabled: true to enable the use of basic authentication to your Elasticsearch/OpenSearch service
# whether is it running as an internalized or externalized service in your SRS cluster.
basicAuthentication:
enabled: true
# To configure basic authentication or TLS-based authentication to your externally-managed Elasticsearch service in your SRS cluster,
# uncomment and add the parameter details: srs.srsStorage.esCredentials.username and srs.srsStorage.esCredentials.password.
# To configure basic authentication or TLS-based authentication to your externally-managed Elasticsearch/OpenSearch service in your SRS cluster,
# uncomment and add the parameter details: srs.srsStorage.esCredentials.username and srs.srsStorage.esCredentials.password for your externally managed elasticsearch cluster.
# Elasticsearch credentials can also be added under authCredentials field which supports both Elasticsearch and OpenSearch credentials.
# We have not removed this field to support backward compatibility and soon this field will be deprecated
# uncomment and add the parameter details: srs.srsStorage.authCredentials.username and srs.srsStorage.authCredentials.password
# for your externally managed Elasticsearch/OpenSearch cluster.
# esCredentials:
# username: "username"
# password: "password"
# To use a secret to configure basic authentication or TLS-based authentication between your external Elasticsearch service and SRS,
bhowd1 marked this conversation as resolved.
Show resolved Hide resolved
# authCredentials:
# username: "username"
# password: "password"
# To use a secret to configure basic authentication or TLS-based authentication between your external Elasticsearch/OpenSearch service and SRS,
# uncomment the authSecret parameter and set it to the secret name. Use "username" and "password" as keys for your secret.
# authSecret: srs-elastic-credentials
# To configure AWS IAM role-based authentication to your externally-managed Elasticsearch cluster, uncomment
# To configure AWS IAM role-based authentication to your externally-managed Elasticsearch/OpenSearch cluster, uncomment
# and add the parameter details: srs.srsStorage.awsIAM and its associated region, srs.srsStorage.awsIAM.region
# awsIAM:
# region: "AWS_ELASTICSEARCH_REGION"
# To configure either authentication method, when the elasticsearch domain requires an open internet connection,
# region: "AWS_ELASTICSEARCH_REGION"/"AWS_OPENSEARCH_REGION"
# To configure either authentication method, when the Elasticsearch/OpenSearch domain requires an open internet connection,
# set the requireInternetAccess parameter to "true".
requireInternetAccess: false

Expand Down
Loading