Merge pull request #58375 from liggitt/decrypt

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Recheck if transformed data is stale when doing live lookup during update

Fixes #49565

Caching storage can pass in a cached object to `GuaranteedUpdate` as a hint for the current object.

If the hint is identical to the data we want to persist, before short-circuiting as a no-op update, we force a live lookup.

We should check two things on the result of that live lookup before short-circuiting as a no-op update:
1. the bytes we want to persist still match the transformed bytes read from etcd
2. the state read from etcd didn't report itself as stale. this would mean the transformer used to read the data would not be the transformer used to write it, and "no-op" writes should still be performed, since transformation will make the underlying content actually different.

After a live lookup, we checked byte equality, but not the stale indicator. This meant that key rotation or encrypted->decrypted, and decrypted->encrypted updates are broken.

Introduced in #54780 and picked back to 1.8 in #55294

```release-note
Fixed encryption key and encryption provider rotation
```

Kubernetes-commit: 4257f7595abbe7299cbbdaaae4fa36559892f654
This commit is contained in:
Kubernetes Publisher 2018-01-17 12:46:41 -08:00
commit ef53d4c744
3 changed files with 181 additions and 146 deletions

288
Godeps/Godeps.json generated
View File

@ -1200,579 +1200,579 @@
},
{
"ImportPath": "k8s.io/client-go/discovery",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/apps",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/batch",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/core",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/core/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/events",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/networking",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/networking/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/policy",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/settings",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/storage",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/networking/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/pkg/version",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/rest",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/rest/watch",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/testing",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/auth",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/metrics",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/pager",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/tools/reference",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/transport",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/util/buffer",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/util/cert",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/util/homedir",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/client-go/util/integer",
"Rev": "d8b352f6b2b31a09b86fa7d14b7e70ccb77590cd"
"Rev": "ce9bf2bd6c56abe0d5a993b6ac21accead8de379"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/builder",

View File

@ -332,13 +332,16 @@ func (s *store) GuaranteedUpdate(
if err != nil {
return err
}
mustCheckData = false
if !bytes.Equal(data, origState.data) {
// original data changed, restart loop
mustCheckData = false
continue
}
}
return decode(s.codec, s.versioner, origState.data, out, origState.rev)
// recheck that the data from etcd is not stale before short-circuiting a write
if !origState.stale {
return decode(s.codec, s.versioner, origState.data, out, origState.rev)
}
}
newData, err := s.transformer.TransformToStorage(data, transformContext)

View File

@ -526,6 +526,8 @@ func TestGuaranteedUpdateChecksStoredData(t *testing.T) {
t.Fatal(err)
}
store.transformer = prefixTransformer{prefix: []byte(defaultTestPrefix)}
// this update should write the canonical value to etcd because the new serialization differs
// from the stored serialization
input.ResourceVersion = strconv.FormatInt(resp.Header.Revision, 10)
@ -540,6 +542,36 @@ func TestGuaranteedUpdateChecksStoredData(t *testing.T) {
if out.ResourceVersion == strconv.FormatInt(resp.Header.Revision, 10) {
t.Errorf("guaranteed update should have updated the serialized data, got %#v", out)
}
lastVersion := out.ResourceVersion
// this update should not write to etcd because the input matches the stored data
input = out
out = &example.Pod{}
err = store.GuaranteedUpdate(ctx, key, out, true, nil,
func(_ runtime.Object, _ storage.ResponseMeta) (runtime.Object, *uint64, error) {
return input, nil, nil
}, input)
if err != nil {
t.Fatalf("Update failed: %v", err)
}
if out.ResourceVersion != lastVersion {
t.Errorf("guaranteed update should have short-circuited write, got %#v", out)
}
store.transformer = prefixTransformer{prefix: []byte(defaultTestPrefix), stale: true}
// this update should write to etcd because the transformer reported stale
err = store.GuaranteedUpdate(ctx, key, out, true, nil,
func(_ runtime.Object, _ storage.ResponseMeta) (runtime.Object, *uint64, error) {
return input, nil, nil
}, input)
if err != nil {
t.Fatalf("Update failed: %v", err)
}
if out.ResourceVersion == lastVersion {
t.Errorf("guaranteed update should have written to etcd when transformer reported stale, got %#v", out)
}
}
func TestGuaranteedUpdateWithConflict(t *testing.T) {