Merge pull request #3937 from arghya88/un-deprecate

✨ Un-deprecate WithOwnedConditions and OwnedConditions
kubernetes-sigs · Nov 20, 2020 · ace4e24 · ace4e24
2 parents 6998088 + 0b10f5c
commit ace4e24
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/util/patch/options.go b/util/patch/options.go
@@ -36,8 +36,6 @@ type HelperOptions struct {
 
 	// OwnedConditions defines condition types owned by the controller.
 	// In case of conflicts for the owned conditions, the patch helper will always use the value provided by the controller.
-	//
-	// DEPRECATED: Use ForceOverwriteConditions.
 	OwnedConditions []clusterv1.ConditionType
 }
 
@@ -61,8 +59,6 @@ func (w WithStatusObservedGeneration) ApplyToHelper(in *HelperOptions) {
 
 // WithOwnedConditions allows to define condition types owned by the controller.
 // In case of conflicts for the owned conditions, the patch helper will always use the value provided by the controller.
-//
-// DEPRECATED: Use WithForceOverwriteConditions.
 type WithOwnedConditions struct {
 	Conditions []clusterv1.ConditionType
 }