Merge pull request #55494 from david-mcmahon/automated-cherry-pick-of-#55353-upstream-release-1.7

Automatic merge from submit-queue. Automated cherry pick of #55353 Cherry pick of #55353 on release-1.7. #55353: Capture git export-subst strings in version.sh for 'git Kubernetes-commit: fd4d97d2fb5feb1642db7600d81aea90aee55c03
Capture git export-subst strings in version.sh for 'git archive' use.
2026-06-30 05:58:43 +00:00 · 2017-11-13 15:16:21 -08:00 · 2017-11-08 15:37:49 -08:00 · 2017-11-03 14:36:45 -04:00 · 2017-11-03 12:27:46 -04:00 · 2018-01-11 07:31:30 +00:00
28 changed files with 114 additions and 128 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,5 +1,5 @@
 {
-  "ImportPath": "k8s.io/client-go",
+  "ImportPath": "k8s.io/construct-client-go",
  "GoVersion": "go1.8",
  "GodepVersion": "v79",
  "Packages": [
@@ -312,211 +312,211 @@
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/openapi",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "0b160d81c3788c4d2050dfd0bd4d42eae448388b"
+      "Rev": "a32289191c08ce23e2d45d95e6df010c767c8640"
    }
  ]
 }
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -96,8 +96,19 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				if !resource.Namespaced {
 					scope = meta.RESTScopeRoot
 				}
-				versionMapper.Add(gv.WithKind(resource.Kind), scope)
-				// TODO only do this if it supports listing
+
+				// this is for legacy resources and servers which don't list singular forms.  For those we must still guess.
+				if len(resource.SingularName) == 0 {
+					versionMapper.Add(gv.WithKind(resource.Kind), scope)
+					// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
+					versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
+					continue
+				}
+
+				plural := gv.WithResource(resource.Name)
+				singular := gv.WithResource(resource.SingularName)
+				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
+				// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
 				versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
 			}
 			// TODO why is this type not in discovery (at least for "v1")
--- a/listers/admissionregistration/v1alpha1/BUILD
+++ b/listers/admissionregistration/v1alpha1/BUILD
@@ -17,7 +17,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go
+++ b/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go
@@ -20,7 +20,6 @@ package v1alpha1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *externalAdmissionHookConfigurationLister) List(selector labels.Selector

 // Get retrieves the ExternalAdmissionHookConfiguration from the index for a given name.
 func (s *externalAdmissionHookConfigurationLister) Get(name string) (*v1alpha1.ExternalAdmissionHookConfiguration, error) {
-	key := &v1alpha1.ExternalAdmissionHookConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/admissionregistration/v1alpha1/initializerconfiguration.go
+++ b/listers/admissionregistration/v1alpha1/initializerconfiguration.go
@@ -20,7 +20,6 @@ package v1alpha1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *initializerConfigurationLister) List(selector labels.Selector) (ret []*

 // Get retrieves the InitializerConfiguration from the index for a given name.
 func (s *initializerConfigurationLister) Get(name string) (*v1alpha1.InitializerConfiguration, error) {
-	key := &v1alpha1.InitializerConfiguration{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/certificates/v1beta1/BUILD
+++ b/listers/certificates/v1beta1/BUILD
@@ -16,7 +16,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/certificates/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/certificates/v1beta1/certificatesigningrequest.go
+++ b/listers/certificates/v1beta1/certificatesigningrequest.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *certificateSigningRequestLister) List(selector labels.Selector) (ret []

 // Get retrieves the CertificateSigningRequest from the index for a given name.
 func (s *certificateSigningRequestLister) Get(name string) (*v1beta1.CertificateSigningRequest, error) {
-	key := &v1beta1.CertificateSigningRequest{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/core/v1/BUILD
+++ b/listers/core/v1/BUILD
@@ -34,7 +34,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/core/v1/componentstatus.go
+++ b/listers/core/v1/componentstatus.go
@@ -20,7 +20,6 @@ package v1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *componentStatusLister) List(selector labels.Selector) (ret []*v1.Compon

 // Get retrieves the ComponentStatus from the index for a given name.
 func (s *componentStatusLister) Get(name string) (*v1.ComponentStatus, error) {
-	key := &v1.ComponentStatus{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/core/v1/namespace.go
+++ b/listers/core/v1/namespace.go
@@ -20,7 +20,6 @@ package v1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *namespaceLister) List(selector labels.Selector) (ret []*v1.Namespace, e

 // Get retrieves the Namespace from the index for a given name.
 func (s *namespaceLister) Get(name string) (*v1.Namespace, error) {
-	key := &v1.Namespace{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/core/v1/node.go
+++ b/listers/core/v1/node.go
@@ -20,7 +20,6 @@ package v1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *nodeLister) List(selector labels.Selector) (ret []*v1.Node, err error)

 // Get retrieves the Node from the index for a given name.
 func (s *nodeLister) Get(name string) (*v1.Node, error) {
-	key := &v1.Node{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/core/v1/persistentvolume.go
+++ b/listers/core/v1/persistentvolume.go
@@ -20,7 +20,6 @@ package v1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *persistentVolumeLister) List(selector labels.Selector) (ret []*v1.Persi

 // Get retrieves the PersistentVolume from the index for a given name.
 func (s *persistentVolumeLister) Get(name string) (*v1.PersistentVolume, error) {
-	key := &v1.PersistentVolume{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/extensions/v1beta1/podsecuritypolicy.go
+++ b/listers/extensions/v1beta1/podsecuritypolicy.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *podSecurityPolicyLister) List(selector labels.Selector) (ret []*v1beta1

 // Get retrieves the PodSecurityPolicy from the index for a given name.
 func (s *podSecurityPolicyLister) Get(name string) (*v1beta1.PodSecurityPolicy, error) {
-	key := &v1beta1.PodSecurityPolicy{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/extensions/v1beta1/thirdpartyresource.go
+++ b/listers/extensions/v1beta1/thirdpartyresource.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *thirdPartyResourceLister) List(selector labels.Selector) (ret []*v1beta

 // Get retrieves the ThirdPartyResource from the index for a given name.
 func (s *thirdPartyResourceLister) Get(name string) (*v1beta1.ThirdPartyResource, error) {
-	key := &v1beta1.ThirdPartyResource{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/rbac/v1alpha1/BUILD
+++ b/listers/rbac/v1alpha1/BUILD
@@ -19,7 +19,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/rbac/v1alpha1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/rbac/v1alpha1/clusterrole.go
+++ b/listers/rbac/v1alpha1/clusterrole.go
@@ -20,7 +20,6 @@ package v1alpha1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*v1alpha1.Clus

 // Get retrieves the ClusterRole from the index for a given name.
 func (s *clusterRoleLister) Get(name string) (*v1alpha1.ClusterRole, error) {
-	key := &v1alpha1.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/rbac/v1alpha1/clusterrolebinding.go
+++ b/listers/rbac/v1alpha1/clusterrolebinding.go
@@ -20,7 +20,6 @@ package v1alpha1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*v1alph

 // Get retrieves the ClusterRoleBinding from the index for a given name.
 func (s *clusterRoleBindingLister) Get(name string) (*v1alpha1.ClusterRoleBinding, error) {
-	key := &v1alpha1.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/rbac/v1beta1/BUILD
+++ b/listers/rbac/v1beta1/BUILD
@@ -19,7 +19,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/rbac/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/rbac/v1beta1/clusterrole.go
+++ b/listers/rbac/v1beta1/clusterrole.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *clusterRoleLister) List(selector labels.Selector) (ret []*v1beta1.Clust

 // Get retrieves the ClusterRole from the index for a given name.
 func (s *clusterRoleLister) Get(name string) (*v1beta1.ClusterRole, error) {
-	key := &v1beta1.ClusterRole{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/rbac/v1beta1/clusterrolebinding.go
+++ b/listers/rbac/v1beta1/clusterrolebinding.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *clusterRoleBindingLister) List(selector labels.Selector) (ret []*v1beta

 // Get retrieves the ClusterRoleBinding from the index for a given name.
 func (s *clusterRoleBindingLister) Get(name string) (*v1beta1.ClusterRoleBinding, error) {
-	key := &v1beta1.ClusterRoleBinding{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/storage/v1/BUILD
+++ b/listers/storage/v1/BUILD
@@ -16,7 +16,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/storage/v1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/storage/v1/storageclass.go
+++ b/listers/storage/v1/storageclass.go
@@ -20,7 +20,6 @@ package v1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1 "k8s.io/client-go/pkg/apis/storage/v1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *storageClassLister) List(selector labels.Selector) (ret []*v1.StorageCl

 // Get retrieves the StorageClass from the index for a given name.
 func (s *storageClassLister) Get(name string) (*v1.StorageClass, error) {
-	key := &v1.StorageClass{ObjectMeta: meta_v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/listers/storage/v1beta1/BUILD
+++ b/listers/storage/v1beta1/BUILD
@@ -16,7 +16,6 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/client-go/pkg/apis/storage/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
--- a/listers/storage/v1beta1/storageclass.go
+++ b/listers/storage/v1beta1/storageclass.go
@@ -20,7 +20,6 @@ package v1beta1

 import (
 	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1"
 	"k8s.io/client-go/tools/cache"
@@ -55,8 +54,7 @@ func (s *storageClassLister) List(selector labels.Selector) (ret []*v1beta1.Stor

 // Get retrieves the StorageClass from the index for a given name.
 func (s *storageClassLister) Get(name string) (*v1beta1.StorageClass, error) {
-	key := &v1beta1.StorageClass{ObjectMeta: v1.ObjectMeta{Name: name}}
-	obj, exists, err := s.indexer.Get(key)
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}
--- a/pkg/apis/extensions/v1beta1/conversion.go
+++ b/pkg/apis/extensions/v1beta1/conversion.go
@@ -318,10 +318,12 @@ func Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngress
 			return err
 		}
 	}
-	out.From = make([]networking.NetworkPolicyPeer, len(in.From))
-	for i := range in.From {
-		if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-			return err
+	if in.From != nil {
+		out.From = make([]networking.NetworkPolicyPeer, len(in.From))
+		for i := range in.From {
+			if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -334,10 +336,12 @@ func Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngress
 			return err
 		}
 	}
-	out.From = make([]NetworkPolicyPeer, len(in.From))
-	for i := range in.From {
-		if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-			return err
+	if in.From != nil {
+		out.From = make([]NetworkPolicyPeer, len(in.From))
+		for i := range in.From {
+			if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
--- a/pkg/apis/networking/v1/conversion.go
+++ b/pkg/apis/networking/v1/conversion.go
@@ -85,10 +85,12 @@ func Convert_v1_NetworkPolicyIngressRule_To_extensions_NetworkPolicyIngressRule(
 			return err
 		}
 	}
-	out.From = make([]extensions.NetworkPolicyPeer, len(in.From))
-	for i := range in.From {
-		if err := Convert_v1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-			return err
+	if in.From != nil {
+		out.From = make([]extensions.NetworkPolicyPeer, len(in.From))
+		for i := range in.From {
+			if err := Convert_v1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -101,10 +103,12 @@ func Convert_extensions_NetworkPolicyIngressRule_To_v1_NetworkPolicyIngressRule(
 			return err
 		}
 	}
-	out.From = make([]NetworkPolicyPeer, len(in.From))
-	for i := range in.From {
-		if err := Convert_extensions_NetworkPolicyPeer_To_v1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-			return err
+	if in.From != nil {
+		out.From = make([]NetworkPolicyPeer, len(in.From))
+		for i := range in.From {
+			if err := Convert_extensions_NetworkPolicyPeer_To_v1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
--- a/pkg/apis/rbac/helpers.go
+++ b/pkg/apis/rbac/helpers.go
@@ -346,7 +346,7 @@ func NewRoleBindingForClusterRole(roleName, namespace string) *RoleBindingBuilde
 // Groups adds the specified groups as the subjects of the RoleBinding.
 func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
 	for _, group := range groups {
-		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: GroupKind, Name: group})
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: GroupKind, APIGroup: GroupName, Name: group})
 	}
 	return r
 }
@@ -354,7 +354,7 @@ func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
 // Users adds the specified users as the subjects of the RoleBinding.
 func (r *RoleBindingBuilder) Users(users ...string) *RoleBindingBuilder {
 	for _, user := range users {
-		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: UserKind, Name: user})
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: UserKind, APIGroup: GroupName, Name: user})
 	}
 	return r
 }
--- a/pkg/version/base.go
+++ b/pkg/version/base.go
@@ -51,9 +51,13 @@ var (
 	// semantic version is a git hash, but the version itself is no
 	// longer the direct output of "git describe", but a slight
 	// translation to be semver compliant.
-	gitVersion   string = "v1.7.7-beta.0+$Format:%h$"
-	gitCommit    string = "$Format:%H$"    // sha1 from git, output of $(git rev-parse HEAD)
-	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
+
+	// NOTE: The $Format strings are replaced during 'git archive' thanks to the
+	// companion .gitattributes file containing 'export-subst' in this same
+	// directory.  See also https://git-scm.com/docs/gitattributes
+	gitVersion   string = "v1.7.11-beta.0+$Format:%h$"
+	gitCommit    string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
+	gitTreeState string = ""            // state of git tree, either "clean" or "dirty"

 	buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
 )
Author	SHA1	Message	Date
Kubernetes Publisher	3baca37fe2	Merge pull request #55494 from david-mcmahon/automated-cherry-pick-of-#55353-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #55353 Cherry pick of #55353 on release-1.7. #55353: Capture git export-subst strings in version.sh for 'git Kubernetes-commit: fd4d97d2fb5feb1642db7600d81aea90aee55c03	2017-11-13 15:16:21 -08:00
David McMahon	4fda22f3a1	Capture git export-subst strings in version.sh for 'git archive' use. Eliminate the need to update pkg/version/base.go on release branch tagging. Kubernetes-commit: 072f8724b20251b3bcb4ba263438dcac67516f24	2017-11-08 15:37:49 -08:00
Marcin Wielgus	7fa19ae60b	Kubernetes version v1.7.11-beta.0 file updates Kubernetes-commit: 37bacbedcf603bf4a279b6c9745695656b248bf0	2017-11-03 14:36:45 -04:00
Marcin Wielgus	75aa0c0fc3	Kubernetes version v1.7.10 file updates Kubernetes-commit: bebdeb749f1fa3da9e1312c4b08e439c404b3136	2017-11-03 12:27:46 -04:00
Kubernetes Publisher	805261c343	Merge pull request #54106 from liggitt/networkpolicy-apply Automatic merge from submit-queue. Ensure network policy conversion round trips nil from fields Fixes #53906 (inability to apply network policies against v1 in 1.7) * Changes non-mutation check to API equality (which treats nil and [] slices identically) * Fixed bug in manual conversion that took an input of `nil` and produced an output of `[]` ```release-note Restores the ability to apply network policy objects against the networking.k8s.io/v1 API ``` Kubernetes-commit: 153119474bdb8875e2d4773df156cf6374fd29c4	2018-01-11 07:31:30 +00:00
Kubernetes Publisher	acd3fa9fb5	Merge pull request #54417 from tiran/automated-cherry-pick-of-#54257-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #54257 #Cherry pick of #54257 on release-1.7. #54257: Use GetByKey() in typeLister_NonNamespacedGet Release note: ``` Optimize excessive memory allocation in resource listers on GET requests ``` Kubernetes-commit: 6086f57d35055172d9b3a2e53b846ef5847887a7	2017-10-24 08:41:29 -07:00
Christian Heimes	ed5f848ba0	Regenerate auto-generated code hack/update-codegen.sh hack/update-staging-client-go.sh hack/update-bazel.sh Signed-off-by: Christian Heimes <cheimes@redhat.com> Kubernetes-commit: effcb096f3fa6927aab07d865bd572771464680d	2017-10-19 22:19:03 +02:00
Wojciech Tyczynski	8f5148371f	Kubernetes version v1.7.10-beta.0 file updates Kubernetes-commit: 4631d1da81a0e42ba5744676250a191d0c6106c9	2017-10-19 10:52:16 +02:00
Wojciech Tyczynski	fd3197e637	Kubernetes version v1.7.9 file updates Kubernetes-commit: 7f63532e4ff4fbc7cacd96f6a95b50a49a2dc41b	2018-01-11 07:31:28 +00:00
Kubernetes Publisher	c41ddd7cda	Merge pull request #53583 from sttts/automated-cherry-pick-of-#52710-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #52710 upstream release 1.7 This is necessary to consistently publish the release-1.7 branch of the staging/ repos, compare https://github.com/kubernetes/kubernetes/pull/52710. Kubernetes-commit: 5314e9bafc2a2ed0cb8de2bebe1b5e84b6b3c9ff	2018-01-11 07:31:28 +00:00
Jordan Liggitt	ec4c91bdde	Ensure network policy conversion round trips nil from fields Kubernetes-commit: 04be59c7a5957437791f35af45a470e3effe0a90	2017-10-17 19:55:02 -04:00
Dr. Stefan Schimanski	3c01efff33	Update staging godeps Kubernetes-commit: 2fea4e7b25a33eb956fdd62a305176d5349472bd	2017-10-09 11:01:41 +02:00
Wojciech Tyczynski	a7bf9ff51a	Kubernetes version v1.7.9-beta.0 file updates Kubernetes-commit: 3eab0f1d670f77b88ea83178760c170d4a903a49	2017-10-05 10:28:33 +02:00
Wojciech Tyczynski	411a703154	Kubernetes version v1.7.8 file updates Kubernetes-commit: bc6162cc70b4a39a7f39391564e0dd0be60b39e9	2017-10-05 08:33:26 +02:00
Kubernetes Publisher	84c85820d1	Merge pull request #53299 from enj/automated-cherry-pick-of-#53239-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #53239 Cherry pick of #53239 on release-1.7. #53239: Correct APIGroup for RoleBindingBuilder Subjects Kubernetes-commit: 1a4c2bfb8e06eb64c8c3e05657a25fb3a6e6789b	2018-01-11 07:30:57 +00:00
Kubernetes Publisher	caa80039ae	Merge pull request #52545 from liggitt/automated-cherry-pick-of-#50012-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #50012 Cherry pick of #50012 on release-1.7. #50012: use specified discovery information if possible ```release-note custom resources that use unconventional pluralization now work properly with kubectl ``` Kubernetes-commit: dd388c7e9bb7e85257424761541e57a297d89de9	2018-01-11 07:30:57 +00:00
Monis Khan	837e260942	Correct APIGroup for RoleBindingBuilder Subjects This change corrects RoleBindingBuilder to use the RBAC API group with users and groups as subjects (service accounts use the empty string since they are in the legacy core group). This is based on the defaulting in pkg/apis/rbac/v1/defaults.go#SetDefaults_Subject. This is required because the bootstrap RBAC data is built with these helpers and does not go through defaulting, whereas the data retrieved from the server has already gone through defaulting. This can lead to the reconciliation code incorrectly adding duplicate subjects because it believes that they are missing (since the API groups do not match). Signed-off-by: Monis Khan <mkhan@redhat.com> Kubernetes-commit: 974991b1800fcc7136e28584c729f867582f0752	2017-09-28 21:49:52 -04:00
Chao Xu	9734a791af	Kubernetes version v1.7.8-beta.0 file updates Kubernetes-commit: 81b52bda7cecd1db17bc3ba85118ab4074bb32c7	2017-09-29 03:18:37 +02:00
Chao Xu	0853ea9489	Kubernetes version v1.7.7 file updates Kubernetes-commit: 8e1552342355496b62754e61ad5f802a0f3f1fa7	2017-09-29 01:54:17 +02:00
deads2k	6c2dc43bda	use specified discovery information if possible Kubernetes-commit: dc55e3f76b392fadddd34f88c4a72f73e9f30cf6	2017-08-02 08:42:33 -04:00