Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
08ba23b07b Fix Godeps.json to point to kubernetes-1.11.7 tags 2019-01-26 16:17:03 +00:00
Kubernetes Publisher
4022682532 Merge pull request #72839 from liggitt/automated-cherry-pick-of-#72825-upstream-release-1.11
Automated cherry pick of #72825: Find current resourceVersion for waiting for

Kubernetes-commit: 0bc3747c9bb458bc4495547d4a24452702efcd6b
2019-01-17 15:34:10 -08:00
Jordan Liggitt
0a8c852f46 Find current resourceVersion for waiting for deletion/conditions
Kubernetes-commit: b980266971c60df921cf311fa4d4a5b7ba07ae1a
2019-01-11 10:38:18 -05:00
2 changed files with 81 additions and 80 deletions

160
Godeps/Godeps.json generated
View File

@@ -268,323 +268,323 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "16e3e9a3868f6d08c046fdecf276244f87b568ba"
"Rev": "e86510ea3fe79b17eda7b8b3bb5cf8811d3af968"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "3d8ee2261517413977a62256b7d79644d7ffdc43"
"Rev": "1525e4dadd2df06debdeb27ee24ac7db5b6413b1"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@@ -303,6 +303,7 @@ func (c *dynamicResourceClient) List(opts metav1.ListOptions) (*unstructured.Uns
}
list := &unstructured.UnstructuredList{}
list.SetResourceVersion(entireList.GetResourceVersion())
for i := range entireList.Items {
item := &entireList.Items[i]
metadata, err := meta.Accessor(item)