From b705f7df6e95b85589f1d0d76da492a83545c7bc Mon Sep 17 00:00:00 2001
From: Yini <yinigao1103@gmail.com>
Date: Tue, 19 Mar 2024 17:43:27 +0100
Subject: [PATCH 1/2] Revert "update the _helpers.tpl"

This reverts commit 6934a9215a4a4368338554eec07ba82dcbd70bda.
---
 charts/flyte-core/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/flyte-core/templates/_helpers.tpl b/charts/flyte-core/templates/_helpers.tpl
index 4013035a07f..fdea9ae57b7 100755
--- a/charts/flyte-core/templates/_helpers.tpl
+++ b/charts/flyte-core/templates/_helpers.tpl
@@ -267,6 +267,6 @@ Check for deprecated .Values.secrets.adminOauthClientCredentials.enabled and war
 */}}
 {{- define "chart.checkDeprecatedValue" -}}
 {{- if  .Values.secrets.adminOauthClientCredentials.enabled }}
-{{- printf "Deprecated value: .Values.secrets.adminOauthClientCredentials.enabled. Please update your values.yaml to use the new preferred value." | fail}}
+WARNING: You are using a deprecated value: .Values.secrets.adminOauthClientCredentials.enabled. Please update your values.yaml to use the new preferred value.
 {{- end }}
 {{- end }}
\ No newline at end of file

From 0acc952205bfb21641f13581f794780b53eedb24 Mon Sep 17 00:00:00 2001
From: Yini <yinigao1103@gmail.com>
Date: Tue, 19 Mar 2024 17:43:41 +0100
Subject: [PATCH 2/2] Revert "warn user if there is deprecated value specified"

This reverts commit 21305702a6c59e47b87207d491f2ec8b35b2c152.
---
 charts/flyte-core/templates/_helpers.tpl                 | 9 ---------
 .../templates/clusterresourcesync/deployment.yaml        | 1 -
 charts/flyte-core/templates/common/secret-auth.yaml      | 1 -
 .../flyte-core/templates/flytescheduler/deployment.yaml  | 1 -
 charts/flyte-core/templates/propeller/deployment.yaml    | 1 -
 charts/flyte-core/templates/propeller/manager.yaml       | 1 -
 6 files changed, 14 deletions(-)

diff --git a/charts/flyte-core/templates/_helpers.tpl b/charts/flyte-core/templates/_helpers.tpl
index fdea9ae57b7..98a42655e3f 100755
--- a/charts/flyte-core/templates/_helpers.tpl
+++ b/charts/flyte-core/templates/_helpers.tpl
@@ -261,12 +261,3 @@ storage:
   limits:
     maxDownloadMBs: {{ .Values.storage.limits.maxDownloadMBs }}
 {{- end }}
-
-{{/*
-Check for deprecated .Values.secrets.adminOauthClientCredentials.enabled and warn users
-*/}}
-{{- define "chart.checkDeprecatedValue" -}}
-{{- if  .Values.secrets.adminOauthClientCredentials.enabled }}
-WARNING: You are using a deprecated value: .Values.secrets.adminOauthClientCredentials.enabled. Please update your values.yaml to use the new preferred value.
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
index 3af5df56ff1..531b89f6998 100644
--- a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
+++ b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
@@ -1,4 +1,3 @@
-{{ include "chart.checkDeprecatedValue" . }}
 {{- if .Values.cluster_resource_manager.enabled }}
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/flyte-core/templates/common/secret-auth.yaml b/charts/flyte-core/templates/common/secret-auth.yaml
index 104fe1caee0..3fa7a257b2d 100644
--- a/charts/flyte-core/templates/common/secret-auth.yaml
+++ b/charts/flyte-core/templates/common/secret-auth.yaml
@@ -1,4 +1,3 @@
-{{ include "chart.checkDeprecatedValue" . }}
 {{- if .Values.secrets.adminOauthClientCredentials.create }}
 apiVersion: v1
 kind: Secret
diff --git a/charts/flyte-core/templates/flytescheduler/deployment.yaml b/charts/flyte-core/templates/flytescheduler/deployment.yaml
index 3ede3107e3f..96feae2841f 100755
--- a/charts/flyte-core/templates/flytescheduler/deployment.yaml
+++ b/charts/flyte-core/templates/flytescheduler/deployment.yaml
@@ -1,4 +1,3 @@
-{{ include "chart.checkDeprecatedValue" . }}
 {{- if .Values.workflow_scheduler.enabled}}
   {{- if eq .Values.workflow_scheduler.type "native" }}
 apiVersion: apps/v1
diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml
index 7e082a61083..21ecb056901 100644
--- a/charts/flyte-core/templates/propeller/deployment.yaml
+++ b/charts/flyte-core/templates/propeller/deployment.yaml
@@ -1,4 +1,3 @@
-{{ include "chart.checkDeprecatedValue" . }}
 {{- if .Values.flytepropeller.enabled }}
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/flyte-core/templates/propeller/manager.yaml b/charts/flyte-core/templates/propeller/manager.yaml
index 77cf954d413..1bbb436e877 100644
--- a/charts/flyte-core/templates/propeller/manager.yaml
+++ b/charts/flyte-core/templates/propeller/manager.yaml
@@ -1,4 +1,3 @@
-{{ include "chart.checkDeprecatedValue" . }}
 {{- if .Values.flytepropeller.enabled }}
 {{- if .Values.flytepropeller.manager }}
 apiVersion: v1