Skip to content

Commit 6964476

Browse files
committed
align with kubevela-v1.10.2 from commit 424e433963551eac070b4369829c4c674fce7ff1
1 parent 57c05b0 commit 6964476

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

apis/core.oam.dev/v1alpha1/garbagecollect_policy_types.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ func (in *GarbageCollectPolicySpec) FindStrategy(manifest *unstructured.Unstruct
102102
}
103103

104104
// FindDeleteOption find delete option for target resource
105-
func (in *GarbageCollectPolicySpec) FindDeleteOption(manifest *unstructured.Unstructured) []client.DeleteOption {
105+
func (in *GarbageCollectPolicySpec) FindDeleteOption(manifest *unstructured.Unstructured) (bool, []client.DeleteOption) {
106106
for _, rule := range in.Rules {
107107
if rule.Selector.Match(manifest) && rule.Propagation != nil {
108108
switch *rule.Propagation {
109109
case GarbageCollectPropagationOrphan:
110-
return []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationOrphan)}
110+
return true, []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationOrphan)}
111111
case GarbageCollectPropagationCascading:
112-
return []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationBackground)}
112+
return false, []client.DeleteOption{client.PropagationPolicy(metav1.DeletePropagationBackground)}
113113
}
114114
}
115115
}
116-
return nil
116+
return false, nil
117117
}

pkg/generated/client/applyconfiguration/core.oam.dev/v1beta1/applicationrevisioncompression.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/client/applyconfiguration/core.oam.dev/v1beta1/managedresource.go

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/client/applyconfiguration/core.oam.dev/v1beta1/resourcetrackercompression.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)