Skip to content

Commit

Permalink
Update description and add objectHash annotation
Browse files Browse the repository at this point in the history
Signed-off-by: Jian Qiu <[email protected]>
  • Loading branch information
qiujian16 committed Nov 19, 2024
1 parent f777e4a commit 75ffcc5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ spec:
onSpokeChange:
default: Override
description: |-
OnSpokeChange defines whether the resource should be overriden by the manifestwork it is changed
OnSpokeChange defines whether the resource should be overridden by the manifestwork when it is changed
on the spoke by another actor.
enum:
- Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ spec:
onSpokeChange:
default: Override
description: |-
OnSpokeChange defines whether the resource should be overriden by the manifestwork it is changed
OnSpokeChange defines whether the resource should be overridden by the manifestwork when it is changed
on the spoke by another actor.
enum:
- Override
Expand Down
6 changes: 5 additions & 1 deletion work/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ type ServerSideApplyConfig struct {
// IgnoreFields defines a list of json paths in the resource that will not be updated on the spoke.
IgnoreFields []string `json:"ignoreFields,omitempty"`

// OnSpokeChange defines whether the resource should be overriden by the manifestwork it is changed
// OnSpokeChange defines whether the resource should be overridden by the manifestwork when it is changed
// on the spoke by another actor.
// +kubebuilder:default=Override
// +kubebuilder:validation:Enum=Override;NoOverride
Expand Down Expand Up @@ -525,6 +525,10 @@ const (
// ensure all resource relates to appliedmanifestwork is deleted before appliedmanifestwork itself
// is deleted.
AppliedManifestWorkFinalizer = "cluster.open-cluster-management.io/applied-manifest-work-cleanup"

// ObjectSpecHash is the key of the annotation on the applied resources. The value is the computed hash
// from the resource manifests in the manifestwork.
ObjectSpecHash = "open-cluster-management.io/object-hash"
)

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
2 changes: 1 addition & 1 deletion work/v1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ spec:
onSpokeChange:
default: Override
description: |-
OnSpokeChange defines whether the resource should be overriden by the manifestwork it is changed
OnSpokeChange defines whether the resource should be overridden by the manifestwork when it is changed
on the spoke by another actor.
enum:
- Override
Expand Down

0 comments on commit 75ffcc5

Please sign in to comment.