diff --git a/pkg/api/types.go b/pkg/api/types.go index 40a21019..6b3dbfc4 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -3090,8 +3090,9 @@ type DeleteOptions struct { OrphanDependents *bool // Whether and how garbage collection will be performed. - // Defaults to Default. // Either this field or OrphanDependents may be set, but not both. + // The default policy is decided by the existing finalizer set in the + // metadata.finalizers and the resource-specific default policy. // +optional PropagationPolicy *DeletionPropagation } diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index dbaae863..c5e86044 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -688,8 +688,9 @@ message DeleteOptions { optional bool orphanDependents = 3; // Whether and how garbage collection will be performed. - // Defaults to Default. // Either this field or OrphanDependents may be set, but not both. + // The default policy is decided by the existing finalizer set in the + // metadata.finalizers and the resource-specific default policy. // +optional optional string propagationPolicy = 4; } diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 86e508f5..e7f59f64 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -3530,8 +3530,9 @@ type DeleteOptions struct { OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"` // Whether and how garbage collection will be performed. - // Defaults to Default. // Either this field or OrphanDependents may be set, but not both. + // The default policy is decided by the existing finalizer set in the + // metadata.finalizers and the resource-specific default policy. // +optional PropagationPolicy *DeletionPropagation `protobuf:"bytes,4,opt,name=propagationPolicy,casttype=DeletionPropagation"` } diff --git a/pkg/api/v1/types_swagger_doc_generated.go b/pkg/api/v1/types_swagger_doc_generated.go index 29a2a227..cbc16be2 100644 --- a/pkg/api/v1/types_swagger_doc_generated.go +++ b/pkg/api/v1/types_swagger_doc_generated.go @@ -356,7 +356,7 @@ var map_DeleteOptions = map[string]string{ "gracePeriodSeconds": "The duration in seconds before the object should be deleted. Value must be non-negative integer. The value zero indicates delete immediately. If this value is nil, the default grace period for the specified type will be used. Defaults to a per object value if not specified. zero means delete immediately.", "preconditions": "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.", "orphanDependents": "Deprecated: please use the PropagationPolicy, this field will be deprecated in 1.7. Should the dependent objects be orphaned. If true/false, the \"orphan\" finalizer will be added to/removed from the object's finalizers list. Either this field or PropagationPolicy may be set, but not both.", - "PropagationPolicy": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "PropagationPolicy": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", } func (DeleteOptions) SwaggerDoc() map[string]string {