Skip to content

Commit 35e914d

Browse files
committed
api: deprecate stragic merge and JSON 6902 patches
They have been deprecated for a long time, and should be scheduled for removal to ensure they can be removed in the final `v2` release. Signed-off-by: Hidde Beydals <hidde@hhh.computer>
1 parent b10947b commit 35e914d

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

api/v2beta2/helmrelease_types.go

+2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ type Kustomize struct {
5050
Patches []kustomize.Patch `json:"patches,omitempty"`
5151

5252
// Strategic merge patches, defined as inline YAML objects.
53+
// Deprecated: use Patches instead.
5354
// +optional
5455
PatchesStrategicMerge []apiextensionsv1.JSON `json:"patchesStrategicMerge,omitempty"`
5556

5657
// JSON 6902 patches, defined as inline YAML objects.
58+
// Deprecated: use Patches instead.
5759
// +optional
5860
PatchesJSON6902 []kustomize.JSON6902Patch `json:"patchesJson6902,omitempty"`
5961

config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,8 @@ spec:
15291529
type: object
15301530
type: array
15311531
patchesJson6902:
1532-
description: JSON 6902 patches, defined as inline YAML objects.
1532+
description: 'JSON 6902 patches, defined as inline YAML
1533+
objects. Deprecated: use Patches instead.'
15331534
items:
15341535
description: JSON6902Patch contains a JSON6902 patch and
15351536
the target the patch should be applied to.
@@ -1624,8 +1625,8 @@ spec:
16241625
type: object
16251626
type: array
16261627
patchesStrategicMerge:
1627-
description: Strategic merge patches, defined as inline
1628-
YAML objects.
1628+
description: 'Strategic merge patches, defined as inline
1629+
YAML objects. Deprecated: use Patches instead.'
16291630
items:
16301631
x-kubernetes-preserve-unknown-fields: true
16311632
type: array

docs/api/v2beta2/helm.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,8 @@ capable of targeting objects based on kind, label and annotation selectors.</p>
18971897
</td>
18981898
<td>
18991899
<em>(Optional)</em>
1900-
<p>Strategic merge patches, defined as inline YAML objects.</p>
1900+
<p>Strategic merge patches, defined as inline YAML objects.
1901+
Deprecated: use Patches instead.</p>
19011902
</td>
19021903
</tr>
19031904
<tr>
@@ -1911,7 +1912,8 @@ capable of targeting objects based on kind, label and annotation selectors.</p>
19111912
</td>
19121913
<td>
19131914
<em>(Optional)</em>
1914-
<p>JSON 6902 patches, defined as inline YAML objects.</p>
1915+
<p>JSON 6902 patches, defined as inline YAML objects.
1916+
Deprecated: use Patches instead.</p>
19151917
</td>
19161918
</tr>
19171919
<tr>

0 commit comments

Comments
 (0)