From 8dc3836f33e67c06f73c215289b3634401e6da05 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Fri, 3 May 2024 17:38:27 +0300
Subject: [PATCH] Remove deprecated `.spec.valuesFile` from v1 API

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 api/v2/helmrelease_types.go                   |  8 -----
 .../helm.toolkit.fluxcd.io_helmreleases.yaml  |  7 -----
 docs/api/v2/helm.md                           | 30 -------------------
 3 files changed, 45 deletions(-)

diff --git a/api/v2/helmrelease_types.go b/api/v2/helmrelease_types.go
index dd90fe6da..7fd888781 100644
--- a/api/v2/helmrelease_types.go
+++ b/api/v2/helmrelease_types.go
@@ -368,14 +368,6 @@ type HelmChartTemplateSpec struct {
 	// +optional
 	ValuesFiles []string `json:"valuesFiles,omitempty"`
 
-	// Alternative values file to use as the default chart values, expected to
-	// be a relative path in the SourceRef. Deprecated in favor of ValuesFiles,
-	// for backwards compatibility the file defined here is merged before the
-	// ValuesFiles items. Ignored when omitted.
-	// +optional
-	// +deprecated
-	ValuesFile string `json:"valuesFile,omitempty"`
-
 	// IgnoreMissingValuesFiles controls whether to silently ignore missing values files rather than failing.
 	// +optional
 	IgnoreMissingValuesFiles bool `json:"ignoreMissingValuesFiles,omitempty"`
diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
index 919924d36..53f8defe0 100644
--- a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
+++ b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
@@ -136,13 +136,6 @@ spec:
                         required:
                         - name
                         type: object
-                      valuesFile:
-                        description: |-
-                          Alternative values file to use as the default chart values, expected to
-                          be a relative path in the SourceRef. Deprecated in favor of ValuesFiles,
-                          for backwards compatibility the file defined here is merged before the
-                          ValuesFiles items. Ignored when omitted.
-                        type: string
                       valuesFiles:
                         description: |-
                           Alternative list of values files to use as the chart values (values.yaml
diff --git a/docs/api/v2/helm.md b/docs/api/v2/helm.md
index 2eebb7b29..b8c01c1b6 100644
--- a/docs/api/v2/helm.md
+++ b/docs/api/v2/helm.md
@@ -792,21 +792,6 @@ the first. Ignored when omitted.</p>
 </tr>
 <tr>
 <td>
-<code>valuesFile</code><br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Alternative values file to use as the default chart values, expected to
-be a relative path in the SourceRef. Deprecated in favor of ValuesFiles,
-for backwards compatibility the file defined here is merged before the
-ValuesFiles items. Ignored when omitted.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>ignoreMissingValuesFiles</code><br>
 <em>
 bool
@@ -996,21 +981,6 @@ the first. Ignored when omitted.</p>
 </tr>
 <tr>
 <td>
-<code>valuesFile</code><br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Alternative values file to use as the default chart values, expected to
-be a relative path in the SourceRef. Deprecated in favor of ValuesFiles,
-for backwards compatibility the file defined here is merged before the
-ValuesFiles items. Ignored when omitted.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>ignoreMissingValuesFiles</code><br>
 <em>
 bool