add support for declarative deletion #13

Liujingfang1 · 2019-06-05T00:07:50Z

Add two annotations

kubectl.kubernetes.io/presence: PreventDeletion
kubectl.kubernetes.io/presence: EnsureDoesNotExist

In apply command, any resource annotated by EnsureDoesNotExist won't be applied.
In prune or delete command, any resource annotated by PreventDeletion won't be deleted.

k8s-ci-robot · 2019-06-05T00:07:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Liujingfang1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Liujingfang1]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Liujingfang1 · 2019-06-05T17:40:14Z

@barney-s

internal/pkg/constants/constants.go

internal/pkg/apply/apply.go

internal/pkg/apply/apply_test.go

internal/pkg/delete/delete_test.go

internal/pkg/prune/prune.go

internal/pkg/prune/prune_test.go

internal/pkg/apply/apply_test.go

pwittrock · 2019-07-01T22:00:16Z

internal/pkg/constants/constants.go

+	// - prune skips this resource
+	// - delete skips this resource
+
+	PreventDeletion = "PreventDeletion"


It has the following

pwittrock · 2019-07-01T22:00:42Z

internal/pkg/constants/constants.go

+	//  kubectl.kubernetes.io/presence: EnsureDoesNotExist
+	// Will be deleted or skipped in apply.
+	//
+	// It has following effect in each command


pwittrock · 2019-07-01T22:01:11Z

internal/pkg/util/client_util.go

+
+// HasAnnotation checks if an unstructured has a given annotation key
+func HasAnnotation(u *unstructured.Unstructured, key string) bool {
+	annotation := u.GetAnnotations()


check if the map is nil

actually I was wrong, looks like this always returns an empty map?

pwittrock · 2019-07-01T22:01:23Z

internal/pkg/util/client_util.go

+// MatchAnnotations checks if an unstructured matches a key, value pair in its annotation
+func MatchAnnotations(u *unstructured.Unstructured, annotations map[string]string) bool {
+	s := labels.SelectorFromSet(labels.Set(annotations))
+	if s.Matches(labels.Set(u.GetAnnotations())) {


check if annotations is nil

pwittrock · 2019-07-02T15:24:11Z

/lgtm

add support for declarative deletion

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 5, 2019

k8s-ci-robot requested review from seans3 and soltysh June 5, 2019 00:07

Liujingfang1 requested a review from pwittrock June 5, 2019 00:07

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 5, 2019

pwittrock reviewed Jun 8, 2019

View reviewed changes

internal/pkg/constants/constants.go Show resolved Hide resolved

pwittrock reviewed Jun 8, 2019

View reviewed changes

internal/pkg/apply/apply.go Outdated Show resolved Hide resolved

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 11, 2019

Liujingfang1 force-pushed the lifecycle branch from ddcdd2f to 605bd79 Compare June 11, 2019 18:18

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 11, 2019

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 22, 2019

Liujingfang1 added 2 commits June 24, 2019 08:49

add support for declarative deletion

480b2c8

add comments

d34d1f5

Liujingfang1 force-pushed the lifecycle branch from 605bd79 to 9d6b8c1 Compare June 24, 2019 16:15

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2019