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-22 17:54:57 +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
26 changed files with 48 additions and 73 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
-  "ImportPath": "k8s.io/client-go",
-  "GoVersion": "go1.9",
+  "ImportPath": "k8s.io/construct-client-go",
+  "GoVersion": "go1.8",
  "GodepVersion": "v79",
  "Packages": [
    "./..."
--- 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/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.10-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
Jordan Liggitt	ec4c91bdde	Ensure network policy conversion round trips nil from fields Kubernetes-commit: 04be59c7a5957437791f35af45a470e3effe0a90	2017-10-17 19:55:02 -04:00