Skip to content

Commit 804c9a0

Browse files
Copilotcircy9
andcommitted
Remove unrelated CRD changes, keep only DeleteOptions changes in clusterresourceplacements.yaml
Co-authored-by: circy9 <13264318+circy9@users.noreply.github.com>
1 parent bcf7321 commit 804c9a0

8 files changed

+14
-46
lines changed

config/crd/bases/placement.kubernetes-fleet.io_clusterresourcebindings.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ spec:
542542
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
543543
option.
544544
545-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
546-
managed fields; if you would like to make temporary edits on the member cluster side
545+
Note that this option would revert any ad-hoc changes made on the member cluster side in
546+
the managed fields; if you would like to make temporary edits on the member cluster side
547547
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
548548
fields will be left alone; if you use the FullDiff compare option, such changes will
549549
be reported as drifts.

config/crd/bases/placement.kubernetes-fleet.io_clusterresourceplacements.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,8 +1829,8 @@ spec:
18291829
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
18301830
option.
18311831
1832-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
1833-
managed fields; if you would like to make temporary edits on the member cluster side
1832+
Note that this option would revert any ad-hoc changes made on the member cluster side in
1833+
the managed fields; if you would like to make temporary edits on the member cluster side
18341834
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
18351835
fields will be left alone; if you use the FullDiff compare option, such changes will
18361836
be reported as drifts.

config/crd/bases/placement.kubernetes-fleet.io_clusterresourcesnapshots.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ spec:
4040
Each snapshot MUST have the following labels:
4141
- `CRPTrackingLabel` which points to its owner CRP.
4242
- `ResourceIndexLabel` which is the index of the snapshot group.
43-
44-
The first snapshot of the index group MAY have the following labels:
4543
- `IsLatestSnapshotLabel` which indicates whether the snapshot is the latest one.
4644
4745
All the snapshots within the same index group must have the same ResourceIndexLabel.
@@ -52,9 +50,6 @@ spec:
5250
5351
Each snapshot (excluding the first snapshot) MUST have the following annotations:
5452
- `SubindexOfResourceSnapshotAnnotation` to store the subindex of resource snapshot in the group.
55-
56-
Snapshot may have the following annotations to indicate the time of next resourceSnapshot candidate detected by the controller:
57-
- `NextResourceSnapshotCandidateDetectionTimeAnnotation` to store the time of next resourceSnapshot candidate detected by the controller.
5853
properties:
5954
apiVersion:
6055
description: |-
@@ -191,9 +186,6 @@ spec:
191186
192187
Each snapshot (excluding the first snapshot) MUST have the following annotations:
193188
- `SubindexOfResourceSnapshotAnnotation` to store the subindex of resource snapshot in the group.
194-
195-
Snapshot may have the following annotations to indicate the time of next resourceSnapshot candidate detected by the controller:
196-
- `NextResourceSnapshotCandidateDetectionTimeAnnotation` to store the time of next resourceSnapshot candidate detected by the controller.
197189
properties:
198190
apiVersion:
199191
description: |-

config/crd/bases/placement.kubernetes-fleet.io_clusterstagedupdateruns.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ spec:
235235
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
236236
option.
237237
238-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
239-
managed fields; if you would like to make temporary edits on the member cluster side
238+
Note that this option would revert any ad-hoc changes made on the member cluster side in
239+
the managed fields; if you would like to make temporary edits on the member cluster side
240240
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
241241
fields will be left alone; if you use the FullDiff compare option, such changes will
242242
be reported as drifts.
@@ -1315,8 +1315,8 @@ spec:
13151315
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
13161316
option.
13171317
1318-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
1319-
managed fields; if you would like to make temporary edits on the member cluster side
1318+
Note that this option would revert any ad-hoc changes made on the member cluster side in
1319+
the managed fields; if you would like to make temporary edits on the member cluster side
13201320
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
13211321
fields will be left alone; if you use the FullDiff compare option, such changes will
13221322
be reported as drifts.

config/crd/bases/placement.kubernetes-fleet.io_resourcebindings.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ spec:
190190
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
191191
option.
192192
193-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
194-
managed fields; if you would like to make temporary edits on the member cluster side
193+
Note that this option would revert any ad-hoc changes made on the member cluster side in
194+
the managed fields; if you would like to make temporary edits on the member cluster side
195195
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
196196
fields will be left alone; if you use the FullDiff compare option, such changes will
197197
be reported as drifts.

config/crd/bases/placement.kubernetes-fleet.io_resourceplacements.yaml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,6 @@ spec:
7979
spec:
8080
description: The desired state of ResourcePlacement.
8181
properties:
82-
deleteOptions:
83-
description: DeleteOptions configures the deletion behavior when the
84-
ClusterResourcePlacement is deleted.
85-
properties:
86-
propagationPolicy:
87-
default: Abandon
88-
description: |-
89-
PropagationPolicy controls how the deletion is propagated to placed resources.
90-
Defaults to "Abandon".
91-
92-
Available options:
93-
94-
* Abandon: all placed resources on member clusters will be left intact (abandoned)
95-
when the ClusterResourcePlacement is deleted. This is the default behavior.
96-
97-
* Delete: all placed resources on member clusters will be deleted when the
98-
ClusterResourcePlacement is deleted.
99-
enum:
100-
- Abandon
101-
- Delete
102-
type: string
103-
type: object
10482
policy:
10583
description: |-
10684
Policy defines how to select member clusters to place the selected resources.
@@ -764,8 +742,8 @@ spec:
764742
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
765743
option.
766744
767-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
768-
managed fields; if you would like to make temporary edits on the member cluster side
745+
Note that this option would revert any ad-hoc changes made on the member cluster side in
746+
the managed fields; if you would like to make temporary edits on the member cluster side
769747
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
770748
fields will be left alone; if you use the FullDiff compare option, such changes will
771749
be reported as drifts.

config/crd/bases/placement.kubernetes-fleet.io_resourcesnapshots.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ spec:
4040
Each snapshot MUST have the following labels:
4141
- `CRPTrackingLabel` which points to its owner resource placement.
4242
- `ResourceIndexLabel` which is the index of the snapshot group.
43-
44-
The first snapshot of the index group MAY have the following labels:
4543
- `IsLatestSnapshotLabel` which indicates whether the snapshot is the latest one.
4644
4745
All the snapshots within the same index group must have the same ResourceIndexLabel.

config/crd/bases/placement.kubernetes-fleet.io_works.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,8 @@ spec:
433433
managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
434434
option.
435435
436-
Note that this option would revert any ad-hoc changes made on the member cluster side in the
437-
managed fields; if you would like to make temporary edits on the member cluster side
436+
Note that this option would revert any ad-hoc changes made on the member cluster side in
437+
the managed fields; if you would like to make temporary edits on the member cluster side
438438
in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
439439
fields will be left alone; if you use the FullDiff compare option, such changes will
440440
be reported as drifts.

0 commit comments

Comments
 (0)