diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2fa1bfa7..49f8815e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -172,931 +172,935 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/coordination/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/scheduling/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "655e4e87cb5a855657ad325d1a615cf870870c9d" + "Rev": "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" + }, + { + "ImportPath": "k8s.io/apimachinery/pkg/util/naming", + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "49fb9c9ee47ede1ead7dc90a697c0652526b072c" + "Rev": "bce280dade67588308614434551c0b865433e44d" }, { "ImportPath": "k8s.io/client-go/discovery", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/discovery/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/apps", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/apps/v1beta2", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/batch", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/batch/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/batch/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/batch/v2alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/certificates", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/certificates/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/coordination", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/coordination/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/core", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/core/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/events", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/events/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/extensions", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/extensions/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/internalinterfaces", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/networking", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/networking/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/policy", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/policy/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/rbac", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/rbac/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/scheduling", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/scheduling/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/settings", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/settings/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/storage", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/informers/storage/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/scheme", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/apps/v1beta2", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/autoscaling/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/batch/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/batch/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/batch/v2alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/certificates/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/coordination/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/core/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/events/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/extensions/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/networking/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/policy/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/rbac/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/scheduling/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/settings/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/listers/storage/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/pkg/version", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/rest", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/rest/watch", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/testing", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/auth", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/cache", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/metrics", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/pager", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/record", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/tools/reference", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/transport", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/buffer", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/cert", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/connrotation", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/flowcontrol", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/homedir", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/integer", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/retry", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/client-go/util/workqueue", - "Rev": "82b3a5753636104067ccc0759f33c870d17686dd" + "Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go index 4bde90b3..78b8a83f 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go @@ -57,7 +57,7 @@ func addToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } - scheme.AddConversionFuncs( + err := scheme.AddConversionFuncs( metav1.Convert_string_To_labels_Selector, metav1.Convert_labels_Selector_To_string, @@ -70,6 +70,9 @@ func addToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) Convert_internalversion_ListOptions_To_v1_ListOptions, Convert_v1_ListOptions_To_internalversion_ListOptions, ) + if err != nil { + return err + } // ListOptions is the only options struct which needs conversion (it exposes labels and fields // as selectors for convenience). The other types have only a single representation today. scheme.AddKnownTypes(SchemeGroupVersion, diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go index b300d370..9b8cc977 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/register.go @@ -19,6 +19,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) // GroupName is the group name for this API. @@ -53,13 +54,12 @@ func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) &GetOptions{}, &DeleteOptions{}, ) - scheme.AddConversionFuncs( + utilruntime.Must(scheme.AddConversionFuncs( Convert_versioned_Event_to_watch_Event, Convert_versioned_InternalEvent_to_versioned_Event, Convert_watch_Event_to_versioned_Event, Convert_versioned_Event_to_versioned_InternalEvent, - ) - + )) // Register Unversioned types under their own special group scheme.AddUnversionedTypes(Unversioned, &Status{}, @@ -70,8 +70,8 @@ func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion) ) // register manually. This usually goes through the SchemeBuilder, which we cannot use here. - AddConversionFuncs(scheme) - RegisterDefaults(scheme) + utilruntime.Must(AddConversionFuncs(scheme)) + utilruntime.Must(RegisterDefaults(scheme)) } // scheme is the registry for the common types that adhere to the meta v1 API spec. @@ -89,5 +89,5 @@ func init() { ) // register manually. This usually goes through the SchemeBuilder, which we cannot use here. - RegisterDefaults(scheme) + utilruntime.Must(RegisterDefaults(scheme)) } diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go b/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go index afe4fab1..6cc83208 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/conversion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Defines conversions between generic types and structs to map query strings +// Package runtime defines conversions between generic types and structs to map query strings // to struct objects. package runtime @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/conversion" ) -// DefaultFieldSelectorConversion auto-accepts metav1 values for name and namespace. +// DefaultMetaV1FieldSelectorConversion auto-accepts metav1 values for name and namespace. // A cluster scoped resource specifying namespace empty works fine and specifying a particular // namespace will return no results, as expected. func DefaultMetaV1FieldSelectorConversion(label, value string) (string, string, error) { diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/doc.go b/vendor/k8s.io/apimachinery/pkg/runtime/doc.go index a9d084d9..7bdc70a2 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/doc.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/doc.go @@ -41,5 +41,4 @@ limitations under the License. // // As a bonus, a few common types useful from all api objects and versions // are provided in types.go. - package runtime diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go b/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go index 2cdac9e1..db11eb8b 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/embedded.go @@ -31,7 +31,7 @@ type encodable struct { func (e encodable) GetObjectKind() schema.ObjectKind { return e.obj.GetObjectKind() } func (e encodable) DeepCopyObject() Object { - var out encodable = e + out := e out.obj = e.obj.DeepCopyObject() copy(out.versions, e.versions) return out @@ -46,14 +46,14 @@ func NewEncodable(e Encoder, obj Object, versions ...schema.GroupVersion) Object return encodable{e, obj, versions} } -func (re encodable) UnmarshalJSON(in []byte) error { +func (e encodable) UnmarshalJSON(in []byte) error { return errors.New("runtime.encodable cannot be unmarshalled from JSON") } // Marshal may get called on pointers or values, so implement MarshalJSON on value. // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go -func (re encodable) MarshalJSON() ([]byte, error) { - return Encode(re.E, re.obj) +func (e encodable) MarshalJSON() ([]byte, error) { + return Encode(e.E, e.obj) } // NewEncodableList creates an object that will be encoded with the provided codec on demand. @@ -70,28 +70,28 @@ func NewEncodableList(e Encoder, objects []Object, versions ...schema.GroupVersi return out } -func (re *Unknown) UnmarshalJSON(in []byte) error { - if re == nil { +func (e *Unknown) UnmarshalJSON(in []byte) error { + if e == nil { return errors.New("runtime.Unknown: UnmarshalJSON on nil pointer") } - re.TypeMeta = TypeMeta{} - re.Raw = append(re.Raw[0:0], in...) - re.ContentEncoding = "" - re.ContentType = ContentTypeJSON + e.TypeMeta = TypeMeta{} + e.Raw = append(e.Raw[0:0], in...) + e.ContentEncoding = "" + e.ContentType = ContentTypeJSON return nil } // Marshal may get called on pointers or values, so implement MarshalJSON on value. // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go -func (re Unknown) MarshalJSON() ([]byte, error) { +func (e Unknown) MarshalJSON() ([]byte, error) { // If ContentType is unset, we assume this is JSON. - if re.ContentType != "" && re.ContentType != ContentTypeJSON { + if e.ContentType != "" && e.ContentType != ContentTypeJSON { return nil, errors.New("runtime.Unknown: MarshalJSON on non-json data") } - if re.Raw == nil { + if e.Raw == nil { return []byte("null"), nil } - return re.Raw, nil + return e.Raw, nil } func Convert_runtime_Object_To_runtime_RawExtension(in *Object, out *RawExtension, s conversion.Scope) error { diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/error.go b/vendor/k8s.io/apimachinery/pkg/runtime/error.go index 77879660..322b0313 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/error.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/error.go @@ -24,46 +24,47 @@ import ( ) type notRegisteredErr struct { - gvk schema.GroupVersionKind - target GroupVersioner - t reflect.Type + schemeName string + gvk schema.GroupVersionKind + target GroupVersioner + t reflect.Type } -func NewNotRegisteredErrForKind(gvk schema.GroupVersionKind) error { - return ¬RegisteredErr{gvk: gvk} +func NewNotRegisteredErrForKind(schemeName string, gvk schema.GroupVersionKind) error { + return ¬RegisteredErr{schemeName: schemeName, gvk: gvk} } -func NewNotRegisteredErrForType(t reflect.Type) error { - return ¬RegisteredErr{t: t} +func NewNotRegisteredErrForType(schemeName string, t reflect.Type) error { + return ¬RegisteredErr{schemeName: schemeName, t: t} } -func NewNotRegisteredErrForTarget(t reflect.Type, target GroupVersioner) error { - return ¬RegisteredErr{t: t, target: target} +func NewNotRegisteredErrForTarget(schemeName string, t reflect.Type, target GroupVersioner) error { + return ¬RegisteredErr{schemeName: schemeName, t: t, target: target} } -func NewNotRegisteredGVKErrForTarget(gvk schema.GroupVersionKind, target GroupVersioner) error { - return ¬RegisteredErr{gvk: gvk, target: target} +func NewNotRegisteredGVKErrForTarget(schemeName string, gvk schema.GroupVersionKind, target GroupVersioner) error { + return ¬RegisteredErr{schemeName: schemeName, gvk: gvk, target: target} } func (k *notRegisteredErr) Error() string { if k.t != nil && k.target != nil { - return fmt.Sprintf("%v is not suitable for converting to %q", k.t, k.target) + return fmt.Sprintf("%v is not suitable for converting to %q in scheme %q", k.t, k.target, k.schemeName) } nullGVK := schema.GroupVersionKind{} if k.gvk != nullGVK && k.target != nil { - return fmt.Sprintf("%q is not suitable for converting to %q", k.gvk.GroupVersion(), k.target) + return fmt.Sprintf("%q is not suitable for converting to %q in scheme %q", k.gvk.GroupVersion(), k.target, k.schemeName) } if k.t != nil { - return fmt.Sprintf("no kind is registered for the type %v", k.t) + return fmt.Sprintf("no kind is registered for the type %v in scheme %q", k.t, k.schemeName) } if len(k.gvk.Kind) == 0 { - return fmt.Sprintf("no version %q has been registered", k.gvk.GroupVersion()) + return fmt.Sprintf("no version %q has been registered in scheme %q", k.gvk.GroupVersion(), k.schemeName) } if k.gvk.Version == APIVersionInternal { - return fmt.Sprintf("no kind %q is registered for the internal version of group %q", k.gvk.Kind, k.gvk.Group) + return fmt.Sprintf("no kind %q is registered for the internal version of group %q in scheme %q", k.gvk.Kind, k.gvk.Group, k.schemeName) } - return fmt.Sprintf("no kind %q is registered for version %q", k.gvk.Kind, k.gvk.GroupVersion()) + return fmt.Sprintf("no kind %q is registered for version %q in scheme %q", k.gvk.Kind, k.gvk.GroupVersion(), k.schemeName) } // IsNotRegisteredError returns true if the error indicates the provided diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go b/vendor/k8s.io/apimachinery/pkg/runtime/extension.go index 737e2e9f..9056397f 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/extension.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/extension.go @@ -32,7 +32,7 @@ func (re *RawExtension) UnmarshalJSON(in []byte) error { return nil } -// Marshal may get called on pointers or values, so implement MarshalJSON on value. +// MarshalJSON may get called on pointers or values, so implement MarshalJSON on value. // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go func (re RawExtension) MarshalJSON() ([]byte, error) { if re.Raw == nil { diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/helper.go b/vendor/k8s.io/apimachinery/pkg/runtime/helper.go index a6c1a8d3..33f11eb1 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/helper.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/helper.go @@ -87,7 +87,7 @@ func Field(v reflect.Value, fieldName string, dest interface{}) error { return fmt.Errorf("couldn't assign/convert %v to %v", field.Type(), destValue.Type()) } -// fieldPtr puts the address of fieldName, which must be a member of v, +// FieldPtr puts the address of fieldName, which must be a member of v, // into dest, which must be an address of a variable to which this field's // address can be assigned. func FieldPtr(v reflect.Value, fieldName string, dest interface{}) error { diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go b/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go index ba48e614..0645b660 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/interfaces.go @@ -39,14 +39,14 @@ type GroupVersioner interface { KindForGroupVersionKinds(kinds []schema.GroupVersionKind) (target schema.GroupVersionKind, ok bool) } -// Encoders write objects to a serialized form +// Encoder writes objects to a serialized form type Encoder interface { // Encode writes an object to a stream. Implementations may return errors if the versions are // incompatible, or if no conversion is defined. Encode(obj Object, w io.Writer) error } -// Decoders attempt to load an object from data. +// Decoder attempts to load an object from data. type Decoder interface { // Decode attempts to deserialize the provided data using either the innate typing of the scheme or the // default kind, group, and version provided. It returns a decoded object as well as the kind, group, and @@ -224,7 +224,7 @@ type SelfLinker interface { Namespace(obj Object) (string, error) } -// All API types registered with Scheme must support the Object interface. Since objects in a scheme are +// Object interface must be supported by all API types registered with Scheme. Since objects in a scheme are // expected to be serialized to the wire, the interface an Object must provide to the Scheme allows // serializers to set the kind, version, and group the object is represented as. An Object may choose // to return a no-op ObjectKindAccessor in cases where it is not expected to be serialized. diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go b/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go index da642fa7..5f02961d 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/schema/group_version.go @@ -85,11 +85,10 @@ func ParseGroupKind(gk string) GroupKind { // ParseGroupResource turns "resource.group" string into a GroupResource struct. Empty strings are allowed // for each field. func ParseGroupResource(gr string) GroupResource { - if i := strings.Index(gr, "."); i == -1 { - return GroupResource{Resource: gr} - } else { + if i := strings.Index(gr, "."); i >= 0 { return GroupResource{Group: gr[i+1:], Resource: gr[:i]} } + return GroupResource{Resource: gr} } // GroupVersionResource unambiguously identifies a resource. It doesn't anonymously include GroupVersion diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go b/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go index 59163d77..ae6500f0 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/scheme.go @@ -20,11 +20,12 @@ import ( "fmt" "net/url" "reflect" - "strings" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/naming" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" ) @@ -78,9 +79,13 @@ type Scheme struct { // observedVersions keeps track of the order we've seen versions during type registration observedVersions []schema.GroupVersion + + // schemeName is the name of this scheme. If you don't specify a name, the stack of the NewScheme caller will be used. + // This is useful for error reporting to indicate the origin of the scheme. + schemeName string } -// Function to convert a field selector to internal representation. +// FieldLabelConversionFunc converts a field selector to internal representation. type FieldLabelConversionFunc func(label, value string) (internalLabel, internalValue string, err error) // NewScheme creates a new Scheme. This scheme is pluggable by default. @@ -93,21 +98,16 @@ func NewScheme() *Scheme { fieldLabelConversionFuncs: map[string]map[string]FieldLabelConversionFunc{}, defaulterFuncs: map[reflect.Type]func(interface{}){}, versionPriority: map[string][]string{}, + schemeName: naming.GetNameFromCallsite(internalPackages...), } s.converter = conversion.NewConverter(s.nameFunc) - s.AddConversionFuncs(DefaultEmbeddedConversions()...) + utilruntime.Must(s.AddConversionFuncs(DefaultEmbeddedConversions()...)) // Enable map[string][]string conversions by default - if err := s.AddConversionFuncs(DefaultStringConversions...); err != nil { - panic(err) - } - if err := s.RegisterInputDefaults(&map[string][]string{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields); err != nil { - panic(err) - } - if err := s.RegisterInputDefaults(&url.Values{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields); err != nil { - panic(err) - } + utilruntime.Must(s.AddConversionFuncs(DefaultStringConversions...)) + utilruntime.Must(s.RegisterInputDefaults(&map[string][]string{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields)) + utilruntime.Must(s.RegisterInputDefaults(&url.Values{}, JSONKeyMapper, conversion.AllowDifferentFieldTypeNames|conversion.IgnoreMissingFields)) return s } @@ -255,7 +255,7 @@ func (s *Scheme) ObjectKinds(obj Object) ([]schema.GroupVersionKind, bool, error gvks, ok := s.typeToGVK[t] if !ok { - return nil, false, NewNotRegisteredErrForType(t) + return nil, false, NewNotRegisteredErrForType(s.schemeName, t) } _, unversionedType := s.unversionedTypes[t] @@ -293,7 +293,7 @@ func (s *Scheme) New(kind schema.GroupVersionKind) (Object, error) { if t, exists := s.unversionedKinds[kind.Kind]; exists { return reflect.New(t).Interface().(Object), nil } - return nil, NewNotRegisteredErrForKind(kind) + return nil, NewNotRegisteredErrForKind(s.schemeName, kind) } // AddGenericConversionFunc adds a function that accepts the ConversionFunc call pattern @@ -393,7 +393,7 @@ func (s *Scheme) RegisterInputDefaults(in interface{}, fn conversion.FieldMappin return s.converter.RegisterInputDefaults(in, fn, defaultFlags) } -// AddTypeDefaultingFuncs registers a function that is passed a pointer to an +// AddTypeDefaultingFunc registers a function that is passed a pointer to an // object and can default fields on the object. These functions will be invoked // when Default() is called. The function will never be called unless the // defaulted object matches srcType. If this function is invoked twice with the @@ -541,7 +541,7 @@ func (s *Scheme) convertToVersion(copy bool, in Object, target GroupVersioner) ( kinds, ok := s.typeToGVK[t] if !ok || len(kinds) == 0 { - return nil, NewNotRegisteredErrForType(t) + return nil, NewNotRegisteredErrForType(s.schemeName, t) } gvk, ok := target.KindForGroupVersionKinds(kinds) @@ -554,7 +554,7 @@ func (s *Scheme) convertToVersion(copy bool, in Object, target GroupVersioner) ( } return copyAndSetTargetKind(copy, in, unversionedKind) } - return nil, NewNotRegisteredErrForTarget(t, target) + return nil, NewNotRegisteredErrForTarget(s.schemeName, t, target) } // target wants to use the existing type, set kind and return (no conversion necessary) @@ -764,3 +764,11 @@ func (s *Scheme) addObservedVersion(version schema.GroupVersion) { s.observedVersions = append(s.observedVersions, version) } + +func (s *Scheme) Name() string { + return s.schemeName +} + +// internalPackages are packages that ignored when creating a default reflector name. These packages are in the common +// call chains to NewReflector, so they'd be low entropy names for reflectors +var internalPackages = []string{"k8s.io/apimachinery/pkg/runtime/scheme.go"} diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go index 7b26567e..382c4858 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go @@ -273,7 +273,7 @@ func (jsonFramer) NewFrameReader(r io.ReadCloser) io.ReadCloser { return framer.NewJSONFramedReader(r) } -// Framer is the default JSON framing behavior, with newlines delimiting individual objects. +// YAMLFramer is the default JSON framing behavior, with newlines delimiting individual objects. var YAMLFramer = yamlFramer{} type yamlFramer struct{} diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go index 7716cc42..a5ae3ac4 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go @@ -24,18 +24,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -// NewCodecForScheme is a convenience method for callers that are using a scheme. -func NewCodecForScheme( - // TODO: I should be a scheme interface? - scheme *runtime.Scheme, - encoder runtime.Encoder, - decoder runtime.Decoder, - encodeVersion runtime.GroupVersioner, - decodeVersion runtime.GroupVersioner, -) runtime.Codec { - return NewCodec(encoder, decoder, runtime.UnsafeObjectConvertor(scheme), scheme, scheme, nil, encodeVersion, decodeVersion) -} - // NewDefaultingCodecForScheme is a convenience method for callers that are using a scheme. func NewDefaultingCodecForScheme( // TODO: I should be a scheme interface? @@ -45,7 +33,7 @@ func NewDefaultingCodecForScheme( encodeVersion runtime.GroupVersioner, decodeVersion runtime.GroupVersioner, ) runtime.Codec { - return NewCodec(encoder, decoder, runtime.UnsafeObjectConvertor(scheme), scheme, scheme, scheme, encodeVersion, decodeVersion) + return NewCodec(encoder, decoder, runtime.UnsafeObjectConvertor(scheme), scheme, scheme, scheme, encodeVersion, decodeVersion, scheme.Name()) } // NewCodec takes objects in their internal versions and converts them to external versions before @@ -60,6 +48,7 @@ func NewCodec( defaulter runtime.ObjectDefaulter, encodeVersion runtime.GroupVersioner, decodeVersion runtime.GroupVersioner, + originalSchemeName string, ) runtime.Codec { internal := &codec{ encoder: encoder, @@ -71,6 +60,8 @@ func NewCodec( encodeVersion: encodeVersion, decodeVersion: decodeVersion, + + originalSchemeName: originalSchemeName, } return internal } @@ -85,6 +76,9 @@ type codec struct { encodeVersion runtime.GroupVersioner decodeVersion runtime.GroupVersioner + + // originalSchemeName is optional, but when filled in it holds the name of the scheme from which this codec originates + originalSchemeName string } // Decode attempts a decode of the object, then tries to convert it to the internal version. If into is provided and the decoding is @@ -182,7 +176,7 @@ func (c *codec) Encode(obj runtime.Object, w io.Writer) error { } targetGVK, ok := c.encodeVersion.KindForGroupVersionKinds([]schema.GroupVersionKind{objGVK}) if !ok { - return runtime.NewNotRegisteredGVKErrForTarget(objGVK, c.encodeVersion) + return runtime.NewNotRegisteredGVKErrForTarget(c.originalSchemeName, objGVK, c.encodeVersion) } if targetGVK == objGVK { return c.encoder.Encode(obj, w) diff --git a/vendor/k8s.io/apimachinery/pkg/util/mergepatch/util.go b/vendor/k8s.io/apimachinery/pkg/util/mergepatch/util.go index 9261290a..d09a939b 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/mergepatch/util.go +++ b/vendor/k8s.io/apimachinery/pkg/util/mergepatch/util.go @@ -125,7 +125,7 @@ func HasConflicts(left, right interface{}) (bool, error) { default: return true, nil } - case string, float64, bool, int, int64, nil: + case string, float64, bool, int64, nil: return !reflect.DeepEqual(left, right), nil default: return true, fmt.Errorf("unknown type: %v", reflect.TypeOf(left)) diff --git a/vendor/k8s.io/apimachinery/pkg/util/naming/from_stack.go b/vendor/k8s.io/apimachinery/pkg/util/naming/from_stack.go new file mode 100644 index 00000000..2965d5a8 --- /dev/null +++ b/vendor/k8s.io/apimachinery/pkg/util/naming/from_stack.go @@ -0,0 +1,93 @@ +/* +Copyright 2018 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 naming + +import ( + "fmt" + "regexp" + goruntime "runtime" + "runtime/debug" + "strconv" + "strings" +) + +// GetNameFromCallsite walks back through the call stack until we find a caller from outside of the ignoredPackages +// it returns back a shortpath/filename:line to aid in identification of this reflector when it starts logging +func GetNameFromCallsite(ignoredPackages ...string) string { + name := "????" + const maxStack = 10 + for i := 1; i < maxStack; i++ { + _, file, line, ok := goruntime.Caller(i) + if !ok { + file, line, ok = extractStackCreator() + if !ok { + break + } + i += maxStack + } + if hasPackage(file, append(ignoredPackages, "/runtime/asm_")) { + continue + } + + file = trimPackagePrefix(file) + name = fmt.Sprintf("%s:%d", file, line) + break + } + return name +} + +// hasPackage returns true if the file is in one of the ignored packages. +func hasPackage(file string, ignoredPackages []string) bool { + for _, ignoredPackage := range ignoredPackages { + if strings.Contains(file, ignoredPackage) { + return true + } + } + return false +} + +// trimPackagePrefix reduces duplicate values off the front of a package name. +func trimPackagePrefix(file string) string { + if l := strings.LastIndex(file, "/vendor/"); l >= 0 { + return file[l+len("/vendor/"):] + } + if l := strings.LastIndex(file, "/src/"); l >= 0 { + return file[l+5:] + } + if l := strings.LastIndex(file, "/pkg/"); l >= 0 { + return file[l+1:] + } + return file +} + +var stackCreator = regexp.MustCompile(`(?m)^created by (.*)\n\s+(.*):(\d+) \+0x[[:xdigit:]]+$`) + +// extractStackCreator retrieves the goroutine file and line that launched this stack. Returns false +// if the creator cannot be located. +// TODO: Go does not expose this via runtime https://github.com/golang/go/issues/11440 +func extractStackCreator() (string, int, bool) { + stack := debug.Stack() + matches := stackCreator.FindStringSubmatch(string(stack)) + if matches == nil || len(matches) != 4 { + return "", 0, false + } + line, err := strconv.Atoi(matches[3]) + if err != nil { + return "", 0, false + } + return matches[2], line, true +} diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go index 65e4ce71..8abbdea8 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/net/http.go +++ b/vendor/k8s.io/apimachinery/pkg/util/net/http.go @@ -179,10 +179,8 @@ func FormatURL(scheme string, host string, port int, path string) *url.URL { } func GetHTTPClient(req *http.Request) string { - if userAgent, ok := req.Header["User-Agent"]; ok { - if len(userAgent) > 0 { - return userAgent[0] - } + if ua := req.UserAgent(); len(ua) != 0 { + return ua } return "unknown" } diff --git a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS index 8e8d9fce..dbbe0de4 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS +++ b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/OWNERS @@ -1,5 +1,6 @@ approvers: - pwittrock +- mengqiy reviewers: - mengqiy - apelisse diff --git a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go index 6be328f7..ddf99817 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go +++ b/vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go @@ -1876,7 +1876,7 @@ func mergingMapFieldsHaveConflicts( return true, nil } return slicesHaveConflicts(leftType, rightType, schema, fieldPatchStrategy, fieldPatchMergeKey) - case string, float64, bool, int, int64, nil: + case string, float64, bool, int64, nil: return !reflect.DeepEqual(left, right), nil default: return true, fmt.Errorf("unknown type: %v", reflect.TypeOf(left)) diff --git a/vendor/k8s.io/client-go/discovery/doc.go b/vendor/k8s.io/client-go/discovery/doc.go new file mode 100644 index 00000000..76495588 --- /dev/null +++ b/vendor/k8s.io/client-go/discovery/doc.go @@ -0,0 +1,19 @@ +/* +Copyright 2018 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 discovery provides ways to discover server-supported +// API groups, versions and resources. +package discovery diff --git a/vendor/k8s.io/client-go/discovery/round_tripper.go b/vendor/k8s.io/client-go/discovery/round_tripper.go index 2e352b88..a195d2a2 100644 --- a/vendor/k8s.io/client-go/discovery/round_tripper.go +++ b/vendor/k8s.io/client-go/discovery/round_tripper.go @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package transport provides a round tripper capable of caching HTTP responses. package discovery import ( diff --git a/vendor/k8s.io/client-go/discovery/unstructured.go b/vendor/k8s.io/client-go/discovery/unstructured.go deleted file mode 100644 index 81913a41..00000000 --- a/vendor/k8s.io/client-go/discovery/unstructured.go +++ /dev/null @@ -1,81 +0,0 @@ -/* -Copyright 2016 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 discovery - -import ( - "reflect" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -// UnstructuredObjectTyper provides a runtime.ObjectTyper implementation for -// runtime.Unstructured object based on discovery information. -type UnstructuredObjectTyper struct { - typers []runtime.ObjectTyper -} - -// NewUnstructuredObjectTyper returns a runtime.ObjectTyper for -// unstructured objects based on discovery information. It accepts a list of fallback typers -// for handling objects that are not runtime.Unstructured. It does not delegate the Recognizes -// check, only ObjectKinds. -// TODO this only works for the apiextensions server and doesn't recognize any types. Move to point of use. -func NewUnstructuredObjectTyper(typers ...runtime.ObjectTyper) *UnstructuredObjectTyper { - dot := &UnstructuredObjectTyper{ - typers: typers, - } - return dot -} - -// ObjectKinds returns a slice of one element with the group,version,kind of the -// provided object, or an error if the object is not runtime.Unstructured or -// has no group,version,kind information. unversionedType will always be false -// because runtime.Unstructured object should always have group,version,kind -// information set. -func (d *UnstructuredObjectTyper) ObjectKinds(obj runtime.Object) (gvks []schema.GroupVersionKind, unversionedType bool, err error) { - if _, ok := obj.(runtime.Unstructured); ok { - gvk := obj.GetObjectKind().GroupVersionKind() - if len(gvk.Kind) == 0 { - return nil, false, runtime.NewMissingKindErr("object has no kind field ") - } - if len(gvk.Version) == 0 { - return nil, false, runtime.NewMissingVersionErr("object has no apiVersion field") - } - return []schema.GroupVersionKind{gvk}, false, nil - } - var lastErr error - for _, typer := range d.typers { - gvks, unversioned, err := typer.ObjectKinds(obj) - if err != nil { - lastErr = err - continue - } - return gvks, unversioned, nil - } - if lastErr == nil { - lastErr = runtime.NewNotRegisteredErrForType(reflect.TypeOf(obj)) - } - return nil, false, lastErr -} - -// Recognizes returns true if the provided group,version,kind was in the -// discovery information. -func (d *UnstructuredObjectTyper) Recognizes(gvk schema.GroupVersionKind) bool { - return false -} - -var _ runtime.ObjectTyper = &UnstructuredObjectTyper{} diff --git a/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go index 2d05ac62..c7a86f18 100644 --- a/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go +++ b/vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go @@ -36,6 +36,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/pkg/apis/clientauthentication" "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1" "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1" @@ -51,9 +52,9 @@ var codecs = serializer.NewCodecFactory(scheme) func init() { v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - v1alpha1.AddToScheme(scheme) - v1beta1.AddToScheme(scheme) - clientauthentication.AddToScheme(scheme) + utilruntime.Must(v1alpha1.AddToScheme(scheme)) + utilruntime.Must(v1beta1.AddToScheme(scheme)) + utilruntime.Must(clientauthentication.AddToScheme(scheme)) } var ( diff --git a/vendor/k8s.io/client-go/rest/request.go b/vendor/k8s.io/client-go/rest/request.go index 09ffd76d..c593a387 100644 --- a/vendor/k8s.io/client-go/rest/request.go +++ b/vendor/k8s.io/client-go/rest/request.go @@ -731,7 +731,7 @@ func (r *Request) request(fn func(*http.Request, *http.Response)) error { } } - glog.V(4).Infof("Got a Retry-After %s response for attempt %d to %v", seconds, retries, url) + glog.V(4).Infof("Got a Retry-After %ds response for attempt %d to %v", seconds, retries, url) r.backoffMgr.Sleep(time.Duration(seconds) * time.Second) return false } diff --git a/vendor/k8s.io/client-go/tools/cache/reflector.go b/vendor/k8s.io/client-go/tools/cache/reflector.go index dfe3191d..9ee7efcb 100644 --- a/vendor/k8s.io/client-go/tools/cache/reflector.go +++ b/vendor/k8s.io/client-go/tools/cache/reflector.go @@ -24,9 +24,6 @@ import ( "net" "net/url" "reflect" - "regexp" - goruntime "runtime" - "runtime/debug" "strconv" "strings" "sync" @@ -40,6 +37,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/apimachinery/pkg/util/naming" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" @@ -94,7 +92,7 @@ func NewNamespaceKeyedIndexerAndReflector(lw ListerWatcher, expectedType interfa // resyncPeriod, so that you can use reflectors to periodically process everything as // well as incrementally processing the things that change. func NewReflector(lw ListerWatcher, expectedType interface{}, store Store, resyncPeriod time.Duration) *Reflector { - return NewNamedReflector(getDefaultReflectorName(internalPackages...), lw, expectedType, store, resyncPeriod) + return NewNamedReflector(naming.GetNameFromCallsite(internalPackages...), lw, expectedType, store, resyncPeriod) } // reflectorDisambiguator is used to disambiguate started reflectors. @@ -125,74 +123,7 @@ func makeValidPrometheusMetricLabel(in string) string { // internalPackages are packages that ignored when creating a default reflector name. These packages are in the common // call chains to NewReflector, so they'd be low entropy names for reflectors -var internalPackages = []string{"client-go/tools/cache/", "/runtime/asm_"} - -// getDefaultReflectorName walks back through the call stack until we find a caller from outside of the ignoredPackages -// it returns back a shortpath/filename:line to aid in identification of this reflector when it starts logging -func getDefaultReflectorName(ignoredPackages ...string) string { - name := "????" - const maxStack = 10 - for i := 1; i < maxStack; i++ { - _, file, line, ok := goruntime.Caller(i) - if !ok { - file, line, ok = extractStackCreator() - if !ok { - break - } - i += maxStack - } - if hasPackage(file, ignoredPackages) { - continue - } - - file = trimPackagePrefix(file) - name = fmt.Sprintf("%s:%d", file, line) - break - } - return name -} - -// hasPackage returns true if the file is in one of the ignored packages. -func hasPackage(file string, ignoredPackages []string) bool { - for _, ignoredPackage := range ignoredPackages { - if strings.Contains(file, ignoredPackage) { - return true - } - } - return false -} - -// trimPackagePrefix reduces duplicate values off the front of a package name. -func trimPackagePrefix(file string) string { - if l := strings.LastIndex(file, "k8s.io/client-go/pkg/"); l >= 0 { - return file[l+len("k8s.io/client-go/"):] - } - if l := strings.LastIndex(file, "/src/"); l >= 0 { - return file[l+5:] - } - if l := strings.LastIndex(file, "/pkg/"); l >= 0 { - return file[l+1:] - } - return file -} - -var stackCreator = regexp.MustCompile(`(?m)^created by (.*)\n\s+(.*):(\d+) \+0x[[:xdigit:]]+$`) - -// extractStackCreator retrieves the goroutine file and line that launched this stack. Returns false -// if the creator cannot be located. -// TODO: Go does not expose this via runtime https://github.com/golang/go/issues/11440 -func extractStackCreator() (string, int, bool) { - stack := debug.Stack() - matches := stackCreator.FindStringSubmatch(string(stack)) - if matches == nil || len(matches) != 4 { - return "", 0, false - } - line, err := strconv.Atoi(matches[3]) - if err != nil { - return "", 0, false - } - return matches[2], line, true -} +var internalPackages = []string{"client-go/tools/cache/"} // Run starts a watch and handles watch events. Will restart the watch if it is closed. // Run will exit when stopCh is closed. diff --git a/vendor/k8s.io/client-go/tools/clientcmd/api/latest/latest.go b/vendor/k8s.io/client-go/tools/clientcmd/api/latest/latest.go index 5fbbe3f1..35bb5dde 100644 --- a/vendor/k8s.io/client-go/tools/clientcmd/api/latest/latest.go +++ b/vendor/k8s.io/client-go/tools/clientcmd/api/latest/latest.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/versioning" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api/v1" ) @@ -47,14 +48,8 @@ var ( func init() { Scheme = runtime.NewScheme() - if err := api.AddToScheme(Scheme); err != nil { - // Programmer error, detect immediately - panic(err) - } - if err := v1.AddToScheme(Scheme); err != nil { - // Programmer error, detect immediately - panic(err) - } + utilruntime.Must(api.AddToScheme(Scheme)) + utilruntime.Must(v1.AddToScheme(Scheme)) yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, Scheme, Scheme) Codec = versioning.NewDefaultingCodecForScheme( Scheme, diff --git a/vendor/k8s.io/code-generator/Godeps/Godeps.json b/vendor/k8s.io/code-generator/Godeps/Godeps.json index 445d6428..ee404a44 100644 --- a/vendor/k8s.io/code-generator/Godeps/Godeps.json +++ b/vendor/k8s.io/code-generator/Godeps/Godeps.json @@ -220,43 +220,43 @@ }, { "ImportPath": "k8s.io/gengo/args", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/examples/import-boss/generators", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/generators", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/examples/set-gen/sets", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/generator", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/namer", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/parser", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/gengo/types", - "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7" + "Rev": "fdcf9f9480fdd5bf2b3c3df9bf4ecd22b25b87e2" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", diff --git a/vendor/k8s.io/code-generator/vendor/k8s.io/gengo/generator/import_tracker.go b/vendor/k8s.io/code-generator/vendor/k8s.io/gengo/generator/import_tracker.go index bbd82137..d4ba5e90 100644 --- a/vendor/k8s.io/code-generator/vendor/k8s.io/gengo/generator/import_tracker.go +++ b/vendor/k8s.io/code-generator/vendor/k8s.io/gengo/generator/import_tracker.go @@ -49,6 +49,7 @@ func golangTrackerLocalName(tracker namer.ImportTracker, t types.Name) string { for n := len(dirs) - 1; n >= 0; n-- { // follow kube convention of not having anything between directory names name := strings.Join(dirs[n:], "") + name = strings.Replace(name, "_", "", -1) // These characters commonly appear in import paths for go // packages, but aren't legal go names. So we'll sanitize. name = strings.Replace(name, ".", "", -1)