github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

manually fix hack/verify-staging-imports.sh

Browse Source 
manually fix hack/godep-save.sh

manually fix .linted_packages

squash, manually fix lint

manually fix hack/update-staging-godeps.sh

manually fix update-staging-godeps.sh; let it update godep of client-go
This commit is contained in:
Chao Xu 2017-06-11 15:18:51 -07:00
parent 945593d4de
commit 83235f940a
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/.linted_packages
View File

@ -178,7 +178,6 @@ pkg/client/listers/imagepolicy/v1alpha1
pkg/client/listers/networking/internalversion
pkg/client/listers/networking/v1
pkg/client/listers/policy/internalversion
pkg/client/listers/policy/v1alpha1
pkg/client/listers/policy/v1beta1
pkg/client/listers/rbac/internalversion
pkg/client/listers/rbac/v1alpha1
@ -418,6 +417,11 @@ staging/src/k8s.io/client-go/informers/storage/v1
staging/src/k8s.io/client-go/informers/storage/v1beta1
staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1
staging/src/k8s.io/client-go/listers/apps/v1beta1
staging/src/k8s.io/client-go/listers/authentication/v1
staging/src/k8s.io/client-go/listers/authentication/v1beta1
staging/src/k8s.io/client-go/listers/authorization/v1
staging/src/k8s.io/client-go/listers/authorization/v1beta1
staging/src/k8s.io/client-go/listers/authorization/v1beta1
staging/src/k8s.io/client-go/listers/autoscaling/v1
staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1
staging/src/k8s.io/client-go/listers/batch/v1
@ -425,6 +429,7 @@ staging/src/k8s.io/client-go/listers/batch/v2alpha1
staging/src/k8s.io/client-go/listers/certificates/v1beta1
staging/src/k8s.io/client-go/listers/core/v1
staging/src/k8s.io/client-go/listers/extensions/v1beta1
staging/src/k8s.io/client-go/listers/imagepolicy/v1alpha1
staging/src/k8s.io/client-go/listers/networking/v1
staging/src/k8s.io/client-go/listers/policy/v1beta1
staging/src/k8s.io/client-go/listers/rbac/v1alpha1

3
hack/godep-save.sh
View File

@ -38,6 +38,9 @@ pushd "${KUBE_ROOT}" > /dev/null
# create a symlink in vendor directory pointing to the staging client. This
# let other packages use the staging client as if it were vendored.
if [ ! -e "vendor/k8s.io/api" ]; then
ln -s ../../staging/src/k8s.io/api vendor/k8s.io/api
fi
if [ ! -e "vendor/k8s.io/client-go" ]; then
ln -s ../../staging/src/k8s.io/client-go vendor/k8s.io/client-go
fi

4
hack/update-staging-godeps.sh
View File

@ -79,8 +79,8 @@ function updateGodepManifest() {
# move into staging and save the dependencies for everything in order
mkdir -p "${TMP_GOPATH}/src/k8s.io"
for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do
# we have to skip client-go because it does unusual manipulation of its godeps
if [ "${repo}" == "client-go" ]; then
# we have to skip api because it does not depend on anything
if [ "${repo}" == "api" ]; then
continue
fi
# we skip metrics because it's synced to the real repo manually

11
hack/verify-staging-imports.sh
View File

@ -66,11 +66,12 @@ function print_forbidden_imports () {
RC=0
print_forbidden_imports apimachinery || RC=1
print_forbidden_imports client-go k8s.io/apimachinery || RC=1
print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go || RC=1
print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver || RC=1
print_forbidden_imports api k8s.io/apimachinery || RC=1
print_forbidden_imports client-go k8s.io/apimachinery k8s.io/api || RC=1
print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
if [ ${RC} != 0 ]; then
exit ${RC}
fi