From e96b28fa2978f2adfb72734714aa11f7a12cc0ad Mon Sep 17 00:00:00 2001 From: Preet Shah Date: Tue, 19 Dec 2023 17:28:33 +0530 Subject: [PATCH 1/4] Update secret and helper templates to avoid empty secret creation --- charts/openmetadata/templates/_helpers.tpl | 19 +++++++++++++++++++ charts/openmetadata/templates/secrets.yaml | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl index 976e935b..f2baebac 100644 --- a/charts/openmetadata/templates/_helpers.tpl +++ b/charts/openmetadata/templates/_helpers.tpl @@ -96,6 +96,25 @@ Warning to update openmetadata global keyword to openmetadata.config */}} {{- printf "Error: %s" . | fail }} {{- end }} +{{/* +Function for setting PIPELINE_SERVICE_CLIENT_HOST_IP in pipeline-secret */}} +{{- define "OpenMetadata.utils.setHostIP" -}} +{{- $value := include "OpenMetadata.utils.checkEmptyString" . }} +{{- if eq $value "true" }} +PIPELINE_SERVICE_CLIENT_HOST_IP: {{ . | quote | b64enc }} +{{- end -}} +{{- end -}} + +{{/* +Function to check if passed value is empty string or null value */}} +{{- define "OpenMetadata.utils.checkEmptyString" -}} +{{- if or (empty .) (eq . "") -}} +{{- false -}} +{{- else -}} +{{- true -}} +{{- end -}} +{{- end -}} + {{/* OpenMetadata Configurations Environment Variables*/}} {{- define "OpenMetadata.configs" -}} diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml index ab7036e1..a089bcef 100644 --- a/charts/openmetadata/templates/secrets.yaml +++ b/charts/openmetadata/templates/secrets.yaml @@ -63,13 +63,13 @@ metadata: name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret type: Opaque data: +{{ include "OpenMetadata.utils.setHostIP" .Values.openmetadata.config.pipelineServiceClientConfig.hostIp | indent 2 }} {{- with .Values.openmetadata.config.pipelineServiceClientConfig }} PIPELINE_SERVICE_CLIENT_ENABLED: {{ .enabled | quote | b64enc }} PIPELINE_SERVICE_CLIENT_CLASS_NAME: {{ .className | quote | b64enc }} PIPELINE_SERVICE_IP_INFO_ENABLED: {{ .ingestionIpInfoEnabled | quote | b64enc }} PIPELINE_SERVICE_CLIENT_ENDPOINT: {{ .apiEndpoint | b64enc }} PIPELINE_SERVICE_CLIENT_VERIFY_SSL: {{ .verifySsl | quote | b64enc }} - PIPELINE_SERVICE_CLIENT_HOST_IP: {{ .hostIp | b64enc }} PIPELINE_SERVICE_CLIENT_HEALTH_CHECK_INTERVAL: {{ .healthCheckInterval | quote | b64enc }} PIPELINE_SERVICE_CLIENT_SSL_CERT_PATH: {{ .sslCertificatePath | quote | b64enc }} SERVER_HOST_API_URL: {{ .metadataApiEndpoint | b64enc }} From ceb821373ca555816dcf48d088c6c4d65a290882 Mon Sep 17 00:00:00 2001 From: Preet Shah Date: Tue, 19 Dec 2023 17:31:20 +0530 Subject: [PATCH 2/4] Update secret template file with correct indentation --- charts/openmetadata/templates/secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml index a089bcef..30ef97da 100644 --- a/charts/openmetadata/templates/secrets.yaml +++ b/charts/openmetadata/templates/secrets.yaml @@ -63,7 +63,7 @@ metadata: name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret type: Opaque data: -{{ include "OpenMetadata.utils.setHostIP" .Values.openmetadata.config.pipelineServiceClientConfig.hostIp | indent 2 }} +{{- include "OpenMetadata.utils.setHostIP" .Values.openmetadata.config.pipelineServiceClientConfig.hostIp | indent 2 }} {{- with .Values.openmetadata.config.pipelineServiceClientConfig }} PIPELINE_SERVICE_CLIENT_ENABLED: {{ .enabled | quote | b64enc }} PIPELINE_SERVICE_CLIENT_CLASS_NAME: {{ .className | quote | b64enc }} From ec5a7fed512007c8b7297c14e1d7457ea0b14bbf Mon Sep 17 00:00:00 2001 From: Preet Shah Date: Tue, 19 Dec 2023 17:33:16 +0530 Subject: [PATCH 3/4] Update secret template file --- charts/openmetadata/templates/secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml index 30ef97da..3e879dd9 100644 --- a/charts/openmetadata/templates/secrets.yaml +++ b/charts/openmetadata/templates/secrets.yaml @@ -63,8 +63,8 @@ metadata: name: {{ include "OpenMetadata.fullname" . }}-pipeline-secret type: Opaque data: -{{- include "OpenMetadata.utils.setHostIP" .Values.openmetadata.config.pipelineServiceClientConfig.hostIp | indent 2 }} {{- with .Values.openmetadata.config.pipelineServiceClientConfig }} +{{- include "OpenMetadata.utils.setHostIP" .hostIp | indent 2 }} PIPELINE_SERVICE_CLIENT_ENABLED: {{ .enabled | quote | b64enc }} PIPELINE_SERVICE_CLIENT_CLASS_NAME: {{ .className | quote | b64enc }} PIPELINE_SERVICE_IP_INFO_ENABLED: {{ .ingestionIpInfoEnabled | quote | b64enc }} From 43ba4198b4e554faa13c1c9f0c35b2ebd8c8cf2d Mon Sep 17 00:00:00 2001 From: Preet Shah Date: Tue, 19 Dec 2023 19:35:31 +0530 Subject: [PATCH 4/4] Remove extra function from _helpers.tpl --- charts/openmetadata/templates/_helpers.tpl | 9 --------- charts/openmetadata/templates/secrets.yaml | 4 +++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl index f2baebac..188c9020 100644 --- a/charts/openmetadata/templates/_helpers.tpl +++ b/charts/openmetadata/templates/_helpers.tpl @@ -96,15 +96,6 @@ Warning to update openmetadata global keyword to openmetadata.config */}} {{- printf "Error: %s" . | fail }} {{- end }} -{{/* -Function for setting PIPELINE_SERVICE_CLIENT_HOST_IP in pipeline-secret */}} -{{- define "OpenMetadata.utils.setHostIP" -}} -{{- $value := include "OpenMetadata.utils.checkEmptyString" . }} -{{- if eq $value "true" }} -PIPELINE_SERVICE_CLIENT_HOST_IP: {{ . | quote | b64enc }} -{{- end -}} -{{- end -}} - {{/* Function to check if passed value is empty string or null value */}} {{- define "OpenMetadata.utils.checkEmptyString" -}} diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml index 3e879dd9..499c1826 100644 --- a/charts/openmetadata/templates/secrets.yaml +++ b/charts/openmetadata/templates/secrets.yaml @@ -64,7 +64,9 @@ metadata: type: Opaque data: {{- with .Values.openmetadata.config.pipelineServiceClientConfig }} -{{- include "OpenMetadata.utils.setHostIP" .hostIp | indent 2 }} +{{- if eq (include "OpenMetadata.utils.checkEmptyString" .hostIp) "true" }} + PIPELINE_SERVICE_CLIENT_HOST_IP: {{ .hostIp | quote | b64enc }} +{{- end }} PIPELINE_SERVICE_CLIENT_ENABLED: {{ .enabled | quote | b64enc }} PIPELINE_SERVICE_CLIENT_CLASS_NAME: {{ .className | quote | b64enc }} PIPELINE_SERVICE_IP_INFO_ENABLED: {{ .ingestionIpInfoEnabled | quote | b64enc }}