From ebad418c297ee72c153d5bbae859ca7e371df73b Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Tue, 13 Feb 2018 12:34:00 +0530 Subject: [PATCH] add --go-header-file to use kube boilerplate --- hack/update-codegen.sh | 6 ++++-- hack/update-generated-protobuf-dockerized.sh | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 9c29807b438..0d258ff070b 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -72,7 +72,7 @@ INTERNAL_DIRS_CSV=$(IFS=',';echo "${INTERNAL_DIRS[*]// /,}";IFS=$) # This can be called with one flag, --verify-only, so it works for both the # update- and verify- scripts. ${clientgen} --input-base="k8s.io/kubernetes/pkg/apis" --input="${INTERNAL_DIRS_CSV}" "$@" -${clientgen} --output-base "${KUBE_ROOT}/vendor" --output-package="k8s.io/client-go" --clientset-name="kubernetes" --input-base="k8s.io/kubernetes/vendor/k8s.io/api" --input="${GV_DIRS_CSV}" "$@" +${clientgen} --output-base "${KUBE_ROOT}/vendor" --output-package="k8s.io/client-go" --clientset-name="kubernetes" --input-base="k8s.io/kubernetes/vendor/k8s.io/api" --input="${GV_DIRS_CSV}" --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.go.txt "$@" listergen_internal_apis=( $( @@ -91,7 +91,7 @@ $( ) ) listergen_external_apis_csv=$(IFS=,; echo "${listergen_external_apis[*]}") -${listergen} --output-base "${KUBE_ROOT}/vendor" --output-package "k8s.io/client-go/listers" --input-dirs "${listergen_external_apis_csv}" "$@" +${listergen} --output-base "${KUBE_ROOT}/vendor" --output-package "k8s.io/client-go/listers" --input-dirs "${listergen_external_apis_csv}" --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.go.txt "$@" informergen_internal_apis=( $( @@ -105,6 +105,7 @@ ${informergen} \ --input-dirs "${informergen_internal_apis_csv}" \ --internal-clientset-package k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset \ --listers-package k8s.io/kubernetes/pkg/client/listers \ + --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.go.txt \ "$@" informergen_external_apis=( @@ -124,6 +125,7 @@ ${informergen} \ --input-dirs "${informergen_external_apis_csv}" \ --versioned-clientset-package k8s.io/client-go/kubernetes \ --listers-package k8s.io/client-go/listers \ + --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.go.txt \ "$@" # You may add additional calls of code generators like set-gen above. diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh index fda5a1c82aa..cb1839dd23c 100755 --- a/hack/update-generated-protobuf-dockerized.sh +++ b/hack/update-generated-protobuf-dockerized.sh @@ -92,5 +92,6 @@ PATH="${KUBE_ROOT}/_output/bin:${PATH}" \ "${gotoprotobuf}" \ --proto-import="${KUBE_ROOT}/vendor" \ --proto-import="${KUBE_ROOT}/third_party/protobuf" \ - --packages=$(IFS=, ; echo "${PACKAGES[*]}") + --packages=$(IFS=, ; echo "${PACKAGES[*]}") \ + --go-header-file ${KUBE_ROOT}/hack/boilerplate/boilerplate.go.txt \ "$@"