From a1ba7d764e23ed28e7ef93a8b7d53d6d55cd162a Mon Sep 17 00:00:00 2001
From: Pablo Takara <pjt1991@gmail.com>
Date: Wed, 21 Aug 2024 10:20:47 +0200
Subject: [PATCH 1/2] Prepare Release 1.4.8

---
 charts/deps/Chart.yaml                     |  4 ++--
 charts/deps/values.yaml                    |  2 +-
 charts/openmetadata/Chart.yaml             |  4 ++--
 charts/openmetadata/README.md              |  2 +-
 charts/openmetadata/templates/_helpers.tpl | 15 ++++++++++++---
 charts/openmetadata/templates/secrets.yaml |  6 +++---
 charts/openmetadata/values.schema.json     | 17 ++++++++++++++---
 charts/openmetadata/values.yaml            |  5 ++++-
 8 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/charts/deps/Chart.yaml b/charts/deps/Chart.yaml
index 439ebb8..8b07567 100644
--- a/charts/deps/Chart.yaml
+++ b/charts/deps/Chart.yaml
@@ -16,13 +16,13 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.4.7
+version: 1.4.8
 
 # 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: "1.4.7"
+appVersion: "1.4.8"
 
 home: https://open-metadata.org/
 
diff --git a/charts/deps/values.yaml b/charts/deps/values.yaml
index 8cfdad0..4041342 100644
--- a/charts/deps/values.yaml
+++ b/charts/deps/values.yaml
@@ -61,7 +61,7 @@ airflow:
   airflow:
     image:
       repository: docker.getcollate.io/openmetadata/ingestion
-      tag: 1.4.7
+      tag: 1.4.8
       pullPolicy: "IfNotPresent"
     executor: "KubernetesExecutor"
     config:
diff --git a/charts/openmetadata/Chart.yaml b/charts/openmetadata/Chart.yaml
index c070bfb..b8bf31b 100644
--- a/charts/openmetadata/Chart.yaml
+++ b/charts/openmetadata/Chart.yaml
@@ -16,13 +16,13 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.4.7
+version: 1.4.8
 
 # 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: "1.4.7"
+appVersion: "1.4.8"
 
 home: https://open-metadata.org/
 
diff --git a/charts/openmetadata/README.md b/charts/openmetadata/README.md
index 8f77f40..b2db36e 100644
--- a/charts/openmetadata/README.md
+++ b/charts/openmetadata/README.md
@@ -258,7 +258,7 @@ helm install openmetadata open-metadata/openmetadata --values <<path-to-values-f
 | fullnameOverride | string | `"openmetadata"` |
 | image.pullPolicy | string | `"Always"` |
 | image.repository | string | `"docker.getcollate.io/openmetadata/server"` |
-| image.tag | string | `1.4.7` |
+| image.tag | string | `1.4.8` |
 | imagePullSecrets | list | `[]` |
 | ingress.annotations | object | `{}` |
 | ingress.className | string | `""` |
diff --git a/charts/openmetadata/templates/_helpers.tpl b/charts/openmetadata/templates/_helpers.tpl
index b26b032..dc5c1cd 100644
--- a/charts/openmetadata/templates/_helpers.tpl
+++ b/charts/openmetadata/templates/_helpers.tpl
@@ -239,8 +239,17 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-{{- if or .Values.openmetadata.config.authentication.saml.security.wantAssertionEncrypted .Values.openmetadata.config.authentication.saml.security.wantNameIdEncrypted }}
-# Key Store should only be considered if either wantAssertionEncrypted or wantNameIdEncrypted will be true
+{{- if .Values.openmetadata.config.authentication.saml.sp.spPrivateKey.secretRef }}
+{{- with .Values.openmetadata.config.authentication.saml.sp.spPrivateKey }}
+- name: SAML_SP_PRIVATE_KEY
+  valueFrom:
+    secretKeyRef:
+      name: {{ .secretRef }}
+      key: {{ .secretKey }}
+{{- end }}
+{{- end }}
+{{- if .Values.openmetadata.config.authentication.saml.security.wantAssertionEncrypted }}
+# Key Store should only be considered if wantAssertionEncrypted will be true
 {{- if .Values.openmetadata.config.authentication.saml.security.keyStoreAlias.secretRef }}
 {{- with .Values.openmetadata.config.authentication.saml.security.keyStoreAlias }}
 - name: SAML_KEYSTORE_ALIAS
@@ -325,4 +334,4 @@ OpenMetadata Configurations Environment Variables*/}}
       key: {{ .secretKey }}
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/openmetadata/templates/secrets.yaml b/charts/openmetadata/templates/secrets.yaml
index 4ce0a90..9a5f671 100644
--- a/charts/openmetadata/templates/secrets.yaml
+++ b/charts/openmetadata/templates/secrets.yaml
@@ -286,6 +286,7 @@ data:
   SAML_SP_ACS: {{ .saml.sp.acs | quote | b64enc }}
   SAML_SP_CALLBACK: {{ .saml.sp.callback | quote | b64enc }}
   SAML_STRICT_MODE: {{ .saml.security.strictMode | quote | b64enc }}
+  SAML_VALIDATE_XML: {{ .saml.security.validateXml | quote | b64enc }}
   SAML_SP_TOKEN_VALIDITY: {{ .saml.security.tokenValidity | quote | b64enc }}
   SAML_SEND_ENCRYPTED_NAME_ID: {{ .saml.security.sendEncryptedNameId | quote | b64enc }}
   SAML_SEND_SIGNED_AUTH_REQUEST: {{ .saml.security.sendSignedAuthRequest | quote | b64enc }}
@@ -293,9 +294,8 @@ data:
   SAML_WANT_MESSAGE_SIGNED: {{ .saml.security.wantMessagesSigned | quote | b64enc }}
   SAML_WANT_ASSERTION_SIGNED: {{ .saml.security.wantAssertionsSigned | quote | b64enc }}
   SAML_WANT_ASSERTION_ENCRYPTED: {{ .saml.security.wantAssertionEncrypted | quote | b64enc }}
-  SAML_WANT_NAME_ID_ENCRYPTED: {{ .saml.security.wantNameIdEncrypted | quote | b64enc }}
-  # Key Store should only be considered if either wantAssertionEncrypted or wantNameIdEncrypted will be true
-  {{- if or .saml.security.wantAssertionEncrypted .saml.security.wantNameIdEncrypted }}
+  # Key Store should only be considered if wantAssertionEncrypted will be true
+  {{- if .saml.security.wantAssertionEncrypted }}
   SAML_KEYSTORE_FILE_PATH: {{ .saml.security.keyStoreFilePath | quote | b64enc }}
   {{ end }}
 {{ end }}
diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json
index 2edcf85..a9fc20c 100644
--- a/charts/openmetadata/values.schema.json
+++ b/charts/openmetadata/values.schema.json
@@ -574,6 +574,17 @@
                                                         }
                                                     }
                                                 },
+                                                "spPrivateKey": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "secretRef": {
+                                                            "type": "string"
+                                                        },
+                                                        "secretKey": {
+                                                            "type": "string"
+                                                        }
+                                                    }
+                                                },
                                                 "callback": {
                                                     "type": "string"
                                                 }
@@ -586,6 +597,9 @@
                                                 "strictMode": {
                                                     "type": "boolean"
                                                 },
+                                                "validatexml": {
+                                                    "type": "boolean"
+                                                },
                                                 "tokenValidity": {
                                                     "type": "integer"
                                                 },
@@ -607,9 +621,6 @@
                                                 "wantAssertionEncrypted": {
                                                     "type": "boolean"
                                                 },
-                                                "wantNameIdEncrypted": {
-                                                    "type": "boolean"
-                                                },
                                                 "keyStoreFilePath": {
                                                     "type": "string"
                                                 },
diff --git a/charts/openmetadata/values.yaml b/charts/openmetadata/values.yaml
index 28c14b9..49a9dbb 100644
--- a/charts/openmetadata/values.yaml
+++ b/charts/openmetadata/values.yaml
@@ -192,9 +192,13 @@ openmetadata:
           spX509Certificate:
             secretRef: ""
             secretKey: ""
+          spPrivateKey:
+            secretRef: ""
+            secretKey: ""
           callback: "http://openmetadata:8585/saml/callback"
         security:
           strictMode: false
+          validateXml: false
           tokenValidity: 3600
           sendEncryptedNameId: false
           sendSignedAuthRequest: false
@@ -202,7 +206,6 @@ openmetadata:
           wantMessagesSigned: false
           wantAssertionsSigned: false
           wantAssertionEncrypted: false
-          wantNameIdEncrypted: false
           keyStoreFilePath: ""
           keyStoreAlias:
             secretRef: ""

From 85e601830d690ba1bcf62fcaa2a099cad4e88c86 Mon Sep 17 00:00:00 2001
From: Pablo Takara <pjt1991@gmail.com>
Date: Wed, 21 Aug 2024 10:31:03 +0200
Subject: [PATCH 2/2] Fix values schema

---
 charts/openmetadata/values.schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/openmetadata/values.schema.json b/charts/openmetadata/values.schema.json
index a9fc20c..0d7edc0 100644
--- a/charts/openmetadata/values.schema.json
+++ b/charts/openmetadata/values.schema.json
@@ -597,7 +597,7 @@
                                                 "strictMode": {
                                                     "type": "boolean"
                                                 },
-                                                "validatexml": {
+                                                "validateXml": {
                                                     "type": "boolean"
                                                 },
                                                 "tokenValidity": {