From c8b92661d992e1653ef68ad71e251bb478e80602 Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 18:41:03 +0530 Subject: [PATCH 1/6] [Fix] Airflow Auth --- charts/openmetadata/templates/_helpers.tpl | 2 ++ charts/openmetadata/values.schema.json | 5 ++++- charts/openmetadata/values.yaml | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl index c840c4d8..9c3d8a56 100644 --- a/charts/openmetadata/templates/_helpers.tpl +++ b/charts/openmetadata/templates/_helpers.tpl @@ -359,6 +359,7 @@ OpenMetadata Configurations Environment Variables*/}} value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.ingestionIpInfoEnabled }}" - name: PIPELINE_SERVICE_CLIENT_ENDPOINT value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.apiEndpoint }}" +{{ if and (contains "airflow" .Values.openmetadata.config.pipelineServiceClientConfig.className) (.Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled) }} {{- with .Values.openmetadata.config.pipelineServiceClientConfig.auth }} - name: AIRFLOW_USERNAME value: "{{ .username }}" @@ -368,6 +369,7 @@ OpenMetadata Configurations Environment Variables*/}} name: {{ .password.secretRef }} key: {{ .password.secretKey }} {{- end }} +{{- end }} - name: PIPELINE_SERVICE_CLIENT_VERIFY_SSL value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.verifySsl }}" - name: PIPELINE_SERVICE_CLIENT_HOST_IP diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json index ffb84ac4..ad6f8fb6 100644 --- a/charts/openmetadata/values.schema.json +++ b/charts/openmetadata/values.schema.json @@ -164,7 +164,7 @@ "properties": { "auth": { "type": "object", - "additionalProperties": false, + "additionalProperties": true, "properties": { "password": { "type": "object", @@ -1056,6 +1056,9 @@ "type": "object", "additionalProperties": false, "properties": { + "enabled" : { + "type": "boolean" + }, "config": { "type": "object", "properties": { diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml index 7c791e14..1ebbddec 100644 --- a/charts/openmetadata/values.yaml +++ b/charts/openmetadata/values.yaml @@ -56,7 +56,7 @@ openmetadata: dbParams: "allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC" pipelineServiceClientConfig: enabled: true - className: "org.openmetadata.service.clients.pipeline.airflow.AirflowRESTClient" + className: "io.collate.pipeline.argo.ArgoServiceClient" # endpoint url for airflow apiEndpoint: http://openmetadata-dependencies-web:8080 # this will be the api endpoint url of OpenMetadata Server @@ -70,6 +70,7 @@ openmetadata: # local path in Airflow Pod sslCertificatePath: "/no/path" auth: + enabled: true username: admin password: secretRef: airflow-secrets @@ -392,8 +393,8 @@ startupProbe: podDisruptionBudget: enabled: false config: - maxUnavailable: 1 - minAvailable: 1 + maxUnavailable: "1" + minAvailable: "1" commonLabels: {} podAnnotations: {} \ No newline at end of file From c4615f2accf823780fecf66d97d90df17c96b15a Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 18:53:47 +0530 Subject: [PATCH 2/6] [Fix] Airflow Auth --- charts/openmetadata/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml index 1ebbddec..f881c387 100644 --- a/charts/openmetadata/values.yaml +++ b/charts/openmetadata/values.yaml @@ -56,7 +56,7 @@ openmetadata: dbParams: "allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC" pipelineServiceClientConfig: enabled: true - className: "io.collate.pipeline.argo.ArgoServiceClient" + className: "org.openmetadata.service.clients.pipeline.airflow.AirflowRESTClient" # endpoint url for airflow apiEndpoint: http://openmetadata-dependencies-web:8080 # this will be the api endpoint url of OpenMetadata Server From 46736afd4768046c7f3065d6fb8baf923faecde4 Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 18:55:34 +0530 Subject: [PATCH 3/6] [Fix] Airflow Auth --- charts/openmetadata/values.schema.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json index ad6f8fb6..3836ddea 100644 --- a/charts/openmetadata/values.schema.json +++ b/charts/openmetadata/values.schema.json @@ -164,8 +164,11 @@ "properties": { "auth": { "type": "object", - "additionalProperties": true, + "additionalProperties": false, "properties": { + "enabled" : { + "type": "boolean" + }, "password": { "type": "object", "additionalProperties": false, From 3ea70c00b3f9b506ba422eac24f0b20e72265aed Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 18:59:16 +0530 Subject: [PATCH 4/6] [Fix] Airflow Auth --- charts/openmetadata/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl index 9c3d8a56..23b79447 100644 --- a/charts/openmetadata/templates/_helpers.tpl +++ b/charts/openmetadata/templates/_helpers.tpl @@ -359,7 +359,7 @@ OpenMetadata Configurations Environment Variables*/}} value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.ingestionIpInfoEnabled }}" - name: PIPELINE_SERVICE_CLIENT_ENDPOINT value: "{{ .Values.openmetadata.config.pipelineServiceClientConfig.apiEndpoint }}" -{{ if and (contains "airflow" .Values.openmetadata.config.pipelineServiceClientConfig.className) (.Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled) }} +{{ if .Values.openmetadata.config.pipelineServiceClientConfig.auth.enabled }} {{- with .Values.openmetadata.config.pipelineServiceClientConfig.auth }} - name: AIRFLOW_USERNAME value: "{{ .username }}" From 79c0a77a3a35ec274b56bc20e2dbdafe856b24b9 Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 19:03:33 +0530 Subject: [PATCH 5/6] [Fix] Updating charts --- charts/openmetadata/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openmetadata/Chart.yaml b/charts/openmetadata/Chart.yaml index 8b2a188b..12aa43fe 100644 --- a/charts/openmetadata/Chart.yaml +++ b/charts/openmetadata/Chart.yaml @@ -16,7 +16,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.3 +version: 1.2.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From a8055de6683f106900e9e678c33615f7b2ca6581 Mon Sep 17 00:00:00 2001 From: dhruvinmaniar123 Date: Tue, 21 Nov 2023 19:19:20 +0530 Subject: [PATCH 6/6] [Fix] Updating charts --- charts/openmetadata/values.schema.json | 2 +- charts/openmetadata/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json index 3836ddea..3169a681 100644 --- a/charts/openmetadata/values.schema.json +++ b/charts/openmetadata/values.schema.json @@ -1088,4 +1088,4 @@ } } } -} \ No newline at end of file +} diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml index f881c387..3e8b6d53 100644 --- a/charts/openmetadata/values.yaml +++ b/charts/openmetadata/values.yaml @@ -397,4 +397,4 @@ podDisruptionBudget: minAvailable: "1" commonLabels: {} -podAnnotations: {} \ No newline at end of file +podAnnotations: {}