feat: Prepare OpenMetadata Helm Charts with 0.12 Release (open-metada…

…ta#70)
CoverGenius · Sep 8, 2022 · 942f6b7 · 942f6b7
1 parent 80c69be
commit 942f6b7
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 21 deletions.
diff --git a/charts/deps/Chart.lock b/charts/deps/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 7.10.2
 - name: airflow
   repository: https://airflow-helm.github.io/charts
-  version: 8.5.3
-digest: sha256:b7b9724b2be1c21fe45ccd23a9b6369a1ee84084d712cc0d4fea1a60372c4650
-generated: "2022-05-10T11:59:07.322952+05:30"
+  version: 8.6.1
+digest: sha256:7e3ee62003495f4ac777672c2a8a38bca70e18fe80a22adb594851175e106fc0
+generated: "2022-09-07T15:42:15.519747+05:30"
diff --git a/charts/deps/Chart.yaml b/charts/deps/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.35
+version: 0.0.36
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.11.5"
+appVersion: "0.12.0"
 
 home: https://open-metadata.org/
 
@@ -67,6 +67,6 @@ dependencies:
   repository: "https://helm.elastic.co"
   condition: elasticsearch.enabled
 - name: airflow
-  version: "8.5.3"
+  version: "8.6.1"
   repository: "https://airflow-helm.github.io/charts"
   condition: airflow.enabled
diff --git a/charts/deps/values.yaml b/charts/deps/values.yaml
@@ -51,7 +51,7 @@ airflow:
   airflow:
     image:
       repository: openmetadata/airflow
-      tag: 0.11.5
+      tag: 0.12.0
       pullPolicy: "IfNotPresent"
     executor: "KubernetesExecutor"
     config:
@@ -63,8 +63,11 @@ airflow:
       AIRFLOW__LINEAGE__OPENMETADATA_API_ENDPOINT: http://openmetadata.default.svc.cluster.local:8585/api
       AIRFLOW__LINEAGE__AUTH_PROVIDER_TYPE: no-auth
       # OpenMetadata Airflow Apis Plugin DAGs Configuration
-      AIRFLOW__OPENMETADATA_AIRFLOW_APIS__DAG_RUNNER_TEMPLATE: "/opt/airflow/dag_templates/dag_runner.j2"
       AIRFLOW__OPENMETADATA_AIRFLOW_APIS__DAG_GENERATED_CONFIGS: "/opt/airflow/dags"
+      # OpenMetadata Airflow Secrets Manager Configuration
+      AIRFLOW__OPENMETADATA_SECRETS_MANAGER__AWS_REGION: ""
+      AIRFLOW__OPENMETADATA_SECRETS_MANAGER__AWS_ACCESS_KEY_ID: ""
+      AIRFLOW__OPENMETADATA_SECRETS_MANAGER__AWS_ACCESS_KEY: ""
     users:
     - username: admin
       password: admin

diff --git a/charts/openmetadata/Chart.yaml b/charts/openmetadata/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.35
+version: 0.0.36
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.11.5"
+appVersion: "0.12.0"
 
 home: https://open-metadata.org/
 

diff --git a/charts/openmetadata/README.md b/charts/openmetadata/README.md
@@ -83,6 +83,7 @@ This is achieved by Helm Hooks currently.
 | global.airflow.openmetadata.authConfig.openMetadata.jwtToken.secretKey| string | `openmetadata-jwt-secret` |
 | global.airflow.openmetadata.authConfig.openMetadata.jwtToken.secretRef| string | `openmetadata-jwt-secret` |
 | global.airflow.openmetadata.serverHostApiUrl | string | `http://openmetadata.default.svc.cluster.local:8585/api` |
+| global.clusterName | string | `openmetadata` |
 | global.database.auth.password.secretRef | string | `mysql-secrets` |
 | global.database.auth.password.secretKey | string | `openmetadata-mysql-password` |
 | global.database.auth.username | string | `openmetadata_user` |
@@ -113,6 +114,13 @@ This is achieved by Helm Hooks currently.
 | global.openmetadata.adminPort | int | 8586 |
 | global.openmetadata.host | string | `openmetadata` |
 | global.openmetadata.port | int | 8585 |
+| global.secretsManager.provider | string | `noop` |
+| global.secretsManager.additionalParameters.enabled | bool | `false` |
+| global.secretsManager.additionalParameters.accessKeyId.secretRef | string | `aws-access-key-secret` |
+| global.secretsManager.additionalParameters.accessKeyId.secretKey | string | `aws-key-secret` |
+| global.secretsManager.additionalParameters.region | string | `Empty String` |
+| global.secretsManager.additionalParameters.secretAccessKey.secretRef | string | `aws-secret-access-key-secret` |
+| global.secretsManager.additionalParameters.secretAccessKey.secretKey | string | `aws-key-secret` |
 
 ## Chart Values
 

diff --git a/charts/openmetadata/templates/check-db-migrations-job-hook.yaml b/charts/openmetadata/templates/check-db-migrations-job-hook.yaml
@@ -68,20 +68,20 @@ spec:
                 key: {{ .password.secretKey }}
           {{- end }}
           {{- end }}
-          - name: MYSQL_HOST
+          - name: DB_HOST
             value: "{{ .Values.global.database.host }}"
-          - name: MYSQL_PORT
+          - name: DB_PORT
             value: "{{ .Values.global.database.port }}"
           {{- with .Values.global.database.auth }}
-          - name: MYSQL_USER
+          - name: DB_USER
             value: "{{ .username }}"
-          - name: MYSQL_USER_PASSWORD
+          - name: DB_USER_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: {{ .password.secretRef }}
                 key: {{ .password.secretKey }}
           {{- end }}
-          - name: MYSQL_DATABASE
+          - name: OM_DATABASE
             value: "{{ .Values.global.database.databaseName }}"
           - name: DB_DRIVER_CLASS
             value: "{{ .Values.global.database.driverClass }}"

diff --git a/charts/openmetadata/templates/deployment.yaml b/charts/openmetadata/templates/deployment.yaml
@@ -61,6 +61,8 @@ spec:
               path: /
               port: http
           env:
+          - name: OPENMETADATA_CLUSTER_NAME
+            value: "{{ .Values.global.clusterName }}"
           - name: LOG_LEVEL
             value: "{{ .Values.global.logLevel }}"
           - name: SERVER_HOST
@@ -135,20 +137,20 @@ spec:
                 key: {{ .password.secretKey }}
           {{- end }}
           {{- end }}
-          - name: MYSQL_HOST
+          - name: DB_HOST
             value: "{{ .Values.global.database.host }}"
-          - name: MYSQL_PORT
+          - name: DB_PORT
             value: "{{ .Values.global.database.port }}"
           {{- with .Values.global.database.auth }}
-          - name: MYSQL_USER
+          - name: DB_USER
             value: "{{ .username }}"
-          - name: MYSQL_USER_PASSWORD
+          - name: DB_USER_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: {{ .password.secretRef }}
                 key: {{ .password.secretKey }}
           {{- end }}
-          - name: MYSQL_DATABASE
+          - name: OM_DATABASE
             value: "{{ .Values.global.database.databaseName }}"
           - name: DB_DRIVER_CLASS
             value: "{{ .Values.global.database.driverClass }}"
@@ -176,6 +178,26 @@ spec:
             {{- include "OpenMetadata.Airflow.authProviderConfig" . | nindent 10 }}
           {{- end -}}
           {{- end }}
+          - name: SECRET_MANAGER
+            value: "{{ .Values.global.secretsManager.provider }}"
+          {{- if .Values.global.secretsManager.additionalParameters.enabled }}
+          - name: OM_SM_REGION
+            value: "{{ .Values.global.secretsManager.additionalParameters.region }}"
+          {{- with .Values.global.secretsManager.additionalParameters.accessKeyId }}
+          - name: OM_SM_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: {{ .secretRef }}
+                key: {{ .secretKey }}
+          {{- end }}
+          {{- with .Values.global.secretsManager.additionalParameters.secretAccessKey }}
+          - name: OM_SM_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: {{ .secretRef }}
+                key: {{ .secretKey }}
+          {{- end }}
+          {{- end -}}
           {{- with .Values.extraEnvs }}
             {{- toYaml . | nindent 10 }}
           {{- end }}

diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
@@ -8,6 +8,7 @@ replicaCount: 1
 global:
   # Values can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL
   logLevel: INFO
+  clusterName: openmetadata
   openmetadata:
     host: openmetadata
     port: 8585
@@ -123,6 +124,22 @@ global:
     jwtissuer: "open-metadata.org"
     keyId: "Gb389a-9f76-gdjs-a92j-0242bk94356"
   fernetKey: "jJ/9sz0g0OHxsfxOoSfdFdmk3ysNmPRnH3TUAbz3IHA="
+  secretsManager:
+    # Possible values are noop, aws, aws-ssm
+    provider: noop
+    additionalParameters:
+      enabled: false
+      region: ""
+      accessKeyId:
+        secretRef: aws-access-key-secret
+        secretKey: aws-key-secret
+      secretAccessKey:
+        secretRef: aws-secret-access-key-secret
+        secretKey: aws-key-secret
+    # You can create Kubernetes secrets from AWS Credentials with the below command
+    # kubectl create secret generic aws-key-secret \
+    # --from-literal=aws-access-key-secret=<access_key_id_value> \
+    # --from-literal=aws-secret-access-key-secret=<access_key_secret_value>
 
   # Example Google SSO Auth Config
   # authorizer:
@@ -141,7 +158,6 @@ global:
   #   clientId: "<client_id>"
   #   callbackUrl: "<callback_url>"
 
-
 image:
   repository: openmetadata/server
   # Overrides the image tag whose default is the chart appVersion.