Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

api: deprecate stragic merge and JSON 6902 patches #832

Merged
merged 1 commit into from
Dec 7, 2023
Merged

api: deprecate stragic merge and JSON 6902 patches #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/v2beta2/helmrelease_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ type Kustomize struct {
Patches []kustomize.Patch `json:"patches,omitempty"`

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

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

Expand Down
7 changes: 4 additions & 3 deletions config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,8 @@ spec:
type: object
type: array
patchesJson6902:
description: JSON 6902 patches, defined as inline YAML objects.
description: 'JSON 6902 patches, defined as inline YAML
objects. Deprecated: use Patches instead.'
items:
description: JSON6902Patch contains a JSON6902 patch and
the target the patch should be applied to.
Expand Down Expand Up @@ -1624,8 +1625,8 @@ spec:
type: object
type: array
patchesStrategicMerge:
description: Strategic merge patches, defined as inline
YAML objects.
description: 'Strategic merge patches, defined as inline
YAML objects. Deprecated: use Patches instead.'
items:
x-kubernetes-preserve-unknown-fields: true
type: array
Expand Down
6 changes: 4 additions & 2 deletions docs/api/v2beta2/helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1897,7 +1897,8 @@ capable of targeting objects based on kind, label and annotation selectors.</p>
</td>
<td>
<em>(Optional)</em>
<p>Strategic merge patches, defined as inline YAML objects.</p>
<p>Strategic merge patches, defined as inline YAML objects.
Deprecated: use Patches instead.</p>
</td>
</tr>
<tr>
Expand All @@ -1911,7 +1912,8 @@ capable of targeting objects based on kind, label and annotation selectors.</p>
</td>
<td>
<em>(Optional)</em>
<p>JSON 6902 patches, defined as inline YAML objects.</p>
<p>JSON 6902 patches, defined as inline YAML objects.
Deprecated: use Patches instead.</p>
</td>
</tr>
<tr>
Expand Down