This repository has been archived by the owner on Apr 25, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 531
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1355 from RolandMa1986/feat/kubefed-deleteoption
Feature: support DeleteOptions when deleting resources in member clusters
- Loading branch information
Showing
8 changed files
with
303 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/pkg/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| const ( | ||
| // DeleteOptionAnnotation contains options for delete | ||
| // while deleting resources for member clusters. | ||
| DeleteOptionAnnotation = "kubefed.io/deleteoption" | ||
| ) | ||
|
|
||
| // GetDeleteOptions return delete options from the annotation | ||
| func GetDeleteOptions(obj *unstructured.Unstructured) ([]client.DeleteOption, error) { | ||
| options := make([]client.DeleteOption, 0) | ||
| annotations := obj.GetAnnotations() | ||
| if annotations == nil { | ||
| return options, nil | ||
| } | ||
|
|
||
| if optStr, ok := annotations[DeleteOptionAnnotation]; ok { | ||
| opt := &metav1.DeleteOptions{} | ||
| if err := json.Unmarshal([]byte(optStr), opt); err != nil { | ||
| return nil, errors.Wrapf(err, "could not deserialize delete options from annotation value '%s'", optStr) | ||
| } | ||
| clientOpt := &client.DeleteOptions{} | ||
| clientOpt.GracePeriodSeconds = opt.GracePeriodSeconds | ||
| clientOpt.PropagationPolicy = opt.PropagationPolicy | ||
| clientOpt.Preconditions = opt.Preconditions | ||
| options = append(options, clientOpt) | ||
| } | ||
| return options, nil | ||
| } | ||
|
|
||
| // ApplyDeleteOptions set the DeleteOptions on the annotation | ||
| func ApplyDeleteOptions(obj *unstructured.Unstructured, opts ...client.DeleteOption) error { | ||
| opt := client.DeleteOptions{} | ||
| opt.ApplyOptions(opts) | ||
| deleteOpts := opt.AsDeleteOptions() | ||
| optBytes, err := json.Marshal(deleteOpts) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "could not serialize delete options from object '%v'", deleteOpts) | ||
| } | ||
|
|
||
| annotations := obj.GetAnnotations() | ||
| if annotations == nil { | ||
| annotations = make(map[string]string) | ||
| } | ||
| annotations[DeleteOptionAnnotation] = string(optBytes) | ||
| obj.SetAnnotations(annotations) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| func TestDeleteOptions(t *testing.T) { | ||
| fedObj := &unstructured.Unstructured{} | ||
|
|
||
| fedObjOrphan := &unstructured.Unstructured{ | ||
| Object: map[string]interface{}{ | ||
| "metadata": map[string]interface{}{ | ||
| "annotations": map[string]interface{}{ | ||
| DeleteOptionAnnotation: "{\"propagationPolicy\":\"Orphan\"}", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| fedObjGrace := &unstructured.Unstructured{ | ||
| Object: map[string]interface{}{ | ||
| "metadata": map[string]interface{}{ | ||
| "annotations": map[string]interface{}{ | ||
| DeleteOptionAnnotation: "{\"gracePeriodSeconds\":5}", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| fedObjGraceAndOrphan := &unstructured.Unstructured{ | ||
| Object: map[string]interface{}{ | ||
| "metadata": map[string]interface{}{ | ||
| "annotations": map[string]interface{}{ | ||
| DeleteOptionAnnotation: "{\"propagationPolicy\":\"Orphan\",\"gracePeriodSeconds\":5}", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| actOpt0 := client.DeleteOptions{} | ||
| opt0, _ := GetDeleteOptions(fedObj) | ||
| actOpt0.ApplyOptions(opt0) | ||
| expOpt0 := client.DeleteOptions{} | ||
| assert.Equal(t, expOpt0.AsDeleteOptions(), actOpt0.AsDeleteOptions()) | ||
|
|
||
| actOpt1 := client.DeleteOptions{} | ||
| opt1, _ := GetDeleteOptions(fedObjOrphan) | ||
| actOpt1.ApplyOptions(opt1) | ||
| prop := metav1.DeletePropagationOrphan | ||
| expOpt1 := client.DeleteOptions{PropagationPolicy: &prop} | ||
| assert.Equal(t, expOpt1.AsDeleteOptions(), actOpt1.AsDeleteOptions()) | ||
|
|
||
| actOpt2 := client.DeleteOptions{} | ||
| opt2, _ := GetDeleteOptions(fedObjGrace) | ||
| actOpt2.ApplyOptions(opt2) | ||
| seconds := int64(5) | ||
| expOpt2 := client.DeleteOptions{GracePeriodSeconds: &seconds} | ||
| assert.Equal(t, expOpt2.AsDeleteOptions(), actOpt2.AsDeleteOptions()) | ||
|
|
||
| actOpt3 := client.DeleteOptions{} | ||
| opt3, _ := GetDeleteOptions(fedObjGraceAndOrphan) | ||
| actOpt3.ApplyOptions(opt3) | ||
| expOpt3 := client.DeleteOptions{GracePeriodSeconds: &seconds, PropagationPolicy: &prop} | ||
| assert.Equal(t, expOpt3.AsDeleteOptions(), actOpt3.AsDeleteOptions()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.