Merge pull request #273 from Liujingfang1/master

add the new lifecycle annotation for deletion

Author: k8s-ci-robot

pkg/apply/prune/prune.go

@@ -175,10 +175,8 @@ func mergeObjNamespaces(objs []*unstructured.Unstructured) sets.String {
 // annotation exists within the annotation map; false otherwise.
 func preventDeleteAnnotation(annotations map[string]string) bool {
 	for annotation, value := range annotations {
-		if annotation == common.OnRemoveAnnotation {
-			if value == common.OnRemoveKeep {
-				return true
-			}
+		if common.NoDeletion(annotation, value) {
+			return true
 		}
 	}
 	return false

pkg/apply/prune/prune_test.go

@@ -268,6 +268,18 @@ func TestPreventDeleteAnnotation(t *testing.T) {
 			},
 			expected: true,
 		},
+		"Annotation key client.lifecycle.config.k8s.io/deletion without value is false": {
+			annotations: map[string]string{
+				common.LifecycleDeleteAnnotation: "any",
+			},
+			expected: false,
+		},
+		"Annotation key client.lifecycle.config.k8s.io/deletion and value is true": {
+			annotations: map[string]string{
+				common.LifecycleDeleteAnnotation: common.PreventDeletion,
+			},
+			expected: true,
+		},
 	}
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {

pkg/common/common.go

@@ -32,6 +32,13 @@ const (
 	// DefaultFieldManager is default owner of applied fields in
 	// server-side apply.
 	DefaultFieldManager = "kubectl"
+
+	// LifecycleDeletionAnnotation is the lifecycle annotation key for deletion operation.
+	LifecycleDeleteAnnotation = "client.lifecycle.config.k8s.io/deletion"
+
+	// PreventDeletion is the value used with LifecycleDeletionAnnotation
+	// to prevent deleting a resource.
+	PreventDeletion = "detach"
 )
 
 // RandomStr returns an eight-digit (with leading zeros) string of a
@@ -42,6 +49,19 @@ func RandomStr(seed int64) string {
 	return fmt.Sprintf("%08d", randomInt)
 }
 
+// NoDeletion checks the passed in annotation key and value and returns
+// true if that matches with the prevent deletion annotation.
+func NoDeletion(key, value string) bool {
+	m := map[string]string{
+		LifecycleDeleteAnnotation: PreventDeletion,
+		OnRemoveAnnotation:        OnRemoveKeep,
+	}
+	if val, found := m[key]; found {
+		return val == value
+	}
+	return false
+}
+
 var Strategies = []DryRunStrategy{DryRunClient, DryRunServer}
 
 type DryRunStrategy int