From f6f71c32b673feaea8808fb29011cde9deb281e7 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Mon, 5 Dec 2016 09:15:59 -0800
Subject: [PATCH] change release_1_5 to clientset in staging/copy.sh modify
 update-codegen.sh

---
 cmd/kubernetes-discovery/hack/update-codegen.sh | 4 ++--
 hack/update-codegen.sh                          | 6 +++---
 staging/copy.sh                                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/kubernetes-discovery/hack/update-codegen.sh b/cmd/kubernetes-discovery/hack/update-codegen.sh
index 6ae3323daaf..d58d2002ab8 100755
--- a/cmd/kubernetes-discovery/hack/update-codegen.sh
+++ b/cmd/kubernetes-discovery/hack/update-codegen.sh
@@ -44,7 +44,7 @@ INPUT="--input ${INPUT_APIS[@]}"
 CLIENTSET_PATH="--clientset-path k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated"
 
 ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} 
-${CLIENTGEN} --clientset-name="release_1_5" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} 
+${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1alpha1 ${CLIENTSET_PATH} 
 
 
 echo "Building lister-gen"
@@ -62,7 +62,7 @@ go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
 
 ${informergen} \
   --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration --input-dirs k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration/v1alpha1 \
-  --versioned-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5 \
+  --versioned-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset \
   --internal-clientset-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/internalclientset \
   --listers-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers \
   --output-package k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index d5571ced70c..79129081cdf 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -61,10 +61,10 @@ GV_DIRS_CSV=$(IFS=',';echo "${GV_DIRS[*]// /,}";IFS=$)
 # update- and verify- scripts.
 ${clientgen} "$@"
 ${clientgen} -t "$@"
-${clientgen} --clientset-name="release_1_5" --input="${GV_DIRS_CSV}" "$@"
+${clientgen} --clientset-name="clientset" --input="${GV_DIRS_CSV}" "$@"
 # Clientgen for federation clientset.
 ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event"   "$@"
-${clientgen} --clientset-name=federation_release_1_5 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event"   "$@"
+${clientgen} --clientset-name=federation_clientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,extensions/v1beta1/Deployment,extensions/v1beta1/DaemonSet,api/v1/ConfigMap,api/v1/Event"   "$@"
 ${setgen} "$@"
 
 LISTERGEN_APIS=(
@@ -95,7 +95,7 @@ INFORMERGEN_APIS=(${INFORMERGEN_APIS[@]/#/k8s.io/kubernetes/})
 INFORMERGEN_APIS=$(IFS=,; echo "${INFORMERGEN_APIS[*]}")
 ${informergen} \
   --input-dirs "${INFORMERGEN_APIS}" \
-  --versioned-clientset-package k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 \
+  --versioned-clientset-package k8s.io/kubernetes/pkg/client/clientset_generated/clientset \
   --internal-clientset-package k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset \
   --listers-package k8s.io/kubernetes/pkg/client/listers \
   "$@"
diff --git a/staging/copy.sh b/staging/copy.sh
index 758593a82de..0b272ccb832 100755
--- a/staging/copy.sh
+++ b/staging/copy.sh
@@ -33,7 +33,7 @@ readonly VERIFYONLY
 
 echo "**PLEASE** run \"godep restore\" before running this script"
 # PREREQUISITES: run `godep restore` in the main repo before calling this script.
-CLIENTSET="release_1_5"
+CLIENTSET="clientset"
 MAIN_REPO_FROM_SRC="k8s.io/kubernetes"
 MAIN_REPO="${GOPATH%:*}/src/${MAIN_REPO_FROM_SRC}"
 CLIENT_REPO_FROM_SRC="k8s.io/client-go"