Merge pull request #73138 from liggitt/deletionTimestamp

Do not move deletionTimestamp to the future

Kubernetes-commit: 56172863598bf435cd08f2ee0d77e9b635975dba
This commit is contained in:
Kubernetes Publisher 2019-01-21 17:58:44 -08:00
commit b6aa1175da
3 changed files with 228 additions and 180 deletions

350
Godeps/Godeps.json generated
View File

@ -1288,703 +1288,703 @@
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/dynamic",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/apps",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/auditregistration",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/auditregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/batch",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/coordination",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/coordination/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/coordination/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/core",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/core/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/events",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/networking",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/networking/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/policy",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/settings",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/storage",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/auditregistration/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/auditregistration/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta2",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/coordination/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/coordination/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/networking/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/scheduling/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/pkg/version",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/rest/watch",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/auth",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/metrics",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/pager",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/record",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/record/util",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/tools/reference",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/transport",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/buffer",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/connrotation",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/homedir",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/integer",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/client-go/util/retry",
"Rev": "68a55fba7cd4d186eaf0bec9ad6c28aad7fabbb8"
"Rev": "e3fddcc5acabb08061dcc079a39b4fcc32440df5"
},
{
"ImportPath": "k8s.io/component-base/logs",

View File

@ -841,21 +841,25 @@ func deletionFinalizersForGarbageCollection(ctx context.Context, e *Store, acces
}
// markAsDeleting sets the obj's DeletionGracePeriodSeconds to 0, and sets the
// DeletionTimestamp to "now". Finalizers are watching for such updates and will
// DeletionTimestamp to "now" if there is no existing deletionTimestamp or if the existing
// deletionTimestamp is further in future. Finalizers are watching for such updates and will
// finalize the object if their IDs are present in the object's Finalizers list.
func markAsDeleting(obj runtime.Object) (err error) {
func markAsDeleting(obj runtime.Object, now time.Time) (err error) {
objectMeta, kerr := meta.Accessor(obj)
if kerr != nil {
return kerr
}
now := metav1.NewTime(time.Now())
// This handles Generation bump for resources that don't support graceful
// deletion. For resources that support graceful deletion is handle in
// pkg/api/rest/delete.go
if objectMeta.GetDeletionTimestamp() == nil && objectMeta.GetGeneration() > 0 {
objectMeta.SetGeneration(objectMeta.GetGeneration() + 1)
}
objectMeta.SetDeletionTimestamp(&now)
existingDeletionTimestamp := objectMeta.GetDeletionTimestamp()
if existingDeletionTimestamp == nil || existingDeletionTimestamp.After(now) {
metaNow := metav1.NewTime(now)
objectMeta.SetDeletionTimestamp(&metaNow)
}
var zero int64 = 0
objectMeta.SetDeletionGracePeriodSeconds(&zero)
return nil
@ -910,7 +914,7 @@ func (e *Store) updateForGracefulDeletionAndFinalizers(ctx context.Context, name
// set the DeleteGracePeriods to 0 if the object has pendingFinalizers but not supporting graceful deletion
if pendingFinalizers {
klog.V(6).Infof("update the DeletionTimestamp to \"now\" and GracePeriodSeconds to 0 for object %s, because it has pending finalizers", name)
err = markAsDeleting(existing)
err = markAsDeleting(existing, time.Now())
if err != nil {
return nil, err
}

View File

@ -2108,3 +2108,47 @@ func TestDeletionFinalizersForGarbageCollection(t *testing.T) {
}
}
}
func TestMarkAsDeleting(t *testing.T) {
now := time.Now()
soon := now.Add(time.Second)
past := now.Add(-time.Second)
newTimePointer := func(t time.Time) *metav1.Time {
metaTime := metav1.NewTime(t)
return &metaTime
}
testcases := []struct {
name string
deletionTimestamp *metav1.Time
expectDeletionTimestamp *metav1.Time
}{
{
name: "unset",
deletionTimestamp: nil,
expectDeletionTimestamp: newTimePointer(now),
},
{
name: "set to future",
deletionTimestamp: newTimePointer(soon),
expectDeletionTimestamp: newTimePointer(now),
},
{
name: "set to past",
deletionTimestamp: newTimePointer(past),
expectDeletionTimestamp: newTimePointer(past),
},
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
rs := &example.ReplicaSet{}
rs.DeletionTimestamp = tc.deletionTimestamp
if err := markAsDeleting(rs, now); err != nil {
t.Error(err)
}
if reflect.DeepEqual(*rs.DeletionTimestamp, tc.expectDeletionTimestamp) {
t.Errorf("expected %v, got %v", tc.expectDeletionTimestamp, *rs.DeletionTimestamp)
}
})
}
}