Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e100e899
Commit
e100e899
authored
Jan 17, 2017
by
deads2k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update generation bash to handle vendor dir
parent
a6b655fb
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
13 deletions
+36
-13
.linted_packages
hack/.linted_packages
+16
-0
util.sh
hack/lib/util.sh
+12
-6
update-api-reference-docs.sh
hack/update-api-reference-docs.sh
+1
-1
update-codegen.sh
hack/update-codegen.sh
+2
-1
update-federation-api-reference-docs.sh
hack/update-federation-api-reference-docs.sh
+2
-2
update-federation-generated-swagger-docs.sh
hack/update-federation-generated-swagger-docs.sh
+1
-1
update-generated-swagger-docs.sh
hack/update-generated-swagger-docs.sh
+2
-2
No files found.
hack/.linted_packages
View file @
e100e899
...
@@ -68,6 +68,7 @@ pkg/api/annotations
...
@@ -68,6 +68,7 @@ pkg/api/annotations
pkg/api/errors
pkg/api/errors
pkg/api/events
pkg/api/events
pkg/api/install
pkg/api/install
pkg/api/meta
pkg/api/resource
pkg/api/resource
pkg/api/service
pkg/api/service
pkg/api/v1
pkg/api/v1
...
@@ -173,6 +174,7 @@ pkg/controller/volume/cache
...
@@ -173,6 +174,7 @@ pkg/controller/volume/cache
pkg/controller/volume/populator
pkg/controller/volume/populator
pkg/controller/volume/reconciler
pkg/controller/volume/reconciler
pkg/controller/volume/statusupdater
pkg/controller/volume/statusupdater
pkg/conversion
pkg/conversion/queryparams
pkg/conversion/queryparams
pkg/credentialprovider/aws
pkg/credentialprovider/aws
pkg/genericapiserver/api/audit
pkg/genericapiserver/api/audit
...
@@ -199,6 +201,7 @@ pkg/kubelet/volumemanager
...
@@ -199,6 +201,7 @@ pkg/kubelet/volumemanager
pkg/kubelet/volumemanager/cache
pkg/kubelet/volumemanager/cache
pkg/kubelet/volumemanager/populator
pkg/kubelet/volumemanager/populator
pkg/kubelet/volumemanager/reconciler
pkg/kubelet/volumemanager/reconciler
pkg/labels
pkg/proxy/config
pkg/proxy/config
pkg/proxy/healthcheck
pkg/proxy/healthcheck
pkg/quota
pkg/quota
...
@@ -236,8 +239,12 @@ pkg/registry/serviceaccount
...
@@ -236,8 +239,12 @@ pkg/registry/serviceaccount
pkg/registry/thirdpartyresource
pkg/registry/thirdpartyresource
pkg/registry/thirdpartyresource/storage
pkg/registry/thirdpartyresource/storage
pkg/runtime
pkg/runtime
pkg/runtime/serializer
pkg/runtime/serializer/json
pkg/runtime/serializer/json
pkg/runtime/serializer/protobuf
pkg/runtime/serializer/recognizer
pkg/runtime/serializer/recognizer/testing
pkg/runtime/serializer/recognizer/testing
pkg/runtime/serializer/streaming
pkg/runtime/serializer/versioning
pkg/runtime/serializer/versioning
pkg/runtime/serializer/yaml
pkg/runtime/serializer/yaml
pkg/security
pkg/security
...
@@ -248,11 +255,14 @@ pkg/serviceaccount
...
@@ -248,11 +255,14 @@ pkg/serviceaccount
pkg/storage
pkg/storage
pkg/storage/etcd3
pkg/storage/etcd3
pkg/storage/storagebackend/factory
pkg/storage/storagebackend/factory
pkg/types
pkg/util/async
pkg/util/async
pkg/util/cert
pkg/util/cert
pkg/util/codeinspector
pkg/util/codeinspector
pkg/util/errors
pkg/util/flock
pkg/util/flock
pkg/util/flushwriter
pkg/util/flushwriter
pkg/util/framer
pkg/util/goroutinemap
pkg/util/goroutinemap
pkg/util/hash
pkg/util/hash
pkg/util/homedir
pkg/util/homedir
...
@@ -264,14 +274,20 @@ pkg/util/limitwriter
...
@@ -264,14 +274,20 @@ pkg/util/limitwriter
pkg/util/logs
pkg/util/logs
pkg/util/maps
pkg/util/maps
pkg/util/metrics
pkg/util/metrics
pkg/util/net
pkg/util/netsh
pkg/util/netsh
pkg/util/rand
pkg/util/rand
pkg/util/ratelimit
pkg/util/ratelimit
pkg/util/replicaset
pkg/util/replicaset
pkg/util/restoptions
pkg/util/restoptions
pkg/util/runtime
pkg/util/sets
pkg/util/validation
pkg/util/validation/field
pkg/util/validation/field
pkg/util/version
pkg/util/version
pkg/util/wait
pkg/util/workqueue
pkg/util/workqueue
pkg/util/yaml
pkg/version/prometheus
pkg/version/prometheus
pkg/volume
pkg/volume
pkg/volume/downwardapi
pkg/volume/downwardapi
...
...
hack/lib/util.sh
View file @
e100e899
...
@@ -313,22 +313,28 @@ kube::util::group-version-to-pkg-path() {
...
@@ -313,22 +313,28 @@ kube::util::group-version-to-pkg-path() {
case
"
${
group_version
}
"
in
case
"
${
group_version
}
"
in
# both group and version are "", this occurs when we generate deep copies for internal objects of the legacy v1 API.
# both group and version are "", this occurs when we generate deep copies for internal objects of the legacy v1 API.
__internal
)
__internal
)
echo
"api"
echo
"
pkg/
api"
;;
;;
v1
)
v1
)
echo
"api/v1"
echo
"pkg/api/v1"
;;
federation/v1beta1
)
echo
"federation/apis/federation/v1beta1"
;;
meta/v1
)
echo
"vendor/k8s.io/apimachinery/pkg/apis/meta/v1"
;;
;;
unversioned
)
unversioned
)
echo
"api/unversioned"
echo
"
pkg/
api/unversioned"
;;
;;
*
.k8s.io
)
*
.k8s.io
)
echo
"apis/
${
group_version
%.*k8s.io
}
"
echo
"
pkg/
apis/
${
group_version
%.*k8s.io
}
"
;;
;;
*
.k8s.io/
*
)
*
.k8s.io/
*
)
echo
"apis/
${
group_version
/.*k8s.io/
}
"
echo
"
pkg/
apis/
${
group_version
/.*k8s.io/
}
"
;;
;;
*
)
*
)
echo
"apis/
${
group_version
%__internal
}
"
echo
"
pkg/
apis/
${
group_version
%__internal
}
"
;;
;;
esac
esac
}
}
...
...
hack/update-api-reference-docs.sh
View file @
e100e899
...
@@ -44,7 +44,7 @@ for gv in "${ALL_GROUP_VERSIONS[@]}"; do
...
@@ -44,7 +44,7 @@ for gv in "${ALL_GROUP_VERSIONS[@]}"; do
fi
fi
INTERESTING_GROUP_VERSIONS+
=(
${
gv
}
)
INTERESTING_GROUP_VERSIONS+
=(
${
gv
}
)
GV_DIRS+
=(
"
${
REPO_DIR
}
/
pkg/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
GV_DIRS+
=(
"
${
REPO_DIR
}
/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
done
done
GROUP_VERSIONS
=
"
${
INTERESTING_GROUP_VERSIONS
[@]
}
"
GV_DIRS
=
"
${
GV_DIRS
[@]
}
"
kube::swagger::gen_api_ref_docs
"
${
SWAGGER_SPEC_PATH
}
"
"
${
OUTPUT
}
"
GROUP_VERSIONS
=
"
${
INTERESTING_GROUP_VERSIONS
[@]
}
"
GV_DIRS
=
"
${
GV_DIRS
[@]
}
"
kube::swagger::gen_api_ref_docs
"
${
SWAGGER_SPEC_PATH
}
"
"
${
OUTPUT
}
"
...
...
hack/update-codegen.sh
View file @
e100e899
...
@@ -45,7 +45,8 @@ GV_DIRS=()
...
@@ -45,7 +45,8 @@ GV_DIRS=()
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
# add items, but strip off any leading apis/ you find to match command expectations
# add items, but strip off any leading apis/ you find to match command expectations
api_dir
=
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
api_dir
=
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
pkg_dir
=
${
api_dir
#apis/
}
nopkg_dir
=
${
api_dir
#pkg/
}
pkg_dir
=
${
nopkg_dir
#apis/
}
# skip groups that aren't being served, clients for these don't matter
# skip groups that aren't being served, clients for these don't matter
if
[[
"
${
KUBE_NONSERVER_GROUP_VERSIONS
}
"
==
*
"
${
gv
}
"
*
]]
;
then
if
[[
"
${
KUBE_NONSERVER_GROUP_VERSIONS
}
"
==
*
"
${
gv
}
"
*
]]
;
then
...
...
hack/update-federation-api-reference-docs.sh
View file @
e100e899
...
@@ -39,9 +39,9 @@ GROUP_VERSIONS=("federation/v1beta1" "v1" "extensions/v1beta1")
...
@@ -39,9 +39,9 @@ GROUP_VERSIONS=("federation/v1beta1" "v1" "extensions/v1beta1")
GV_DIRS
=()
GV_DIRS
=()
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
if
[[
${
gv
}
==
"federation/v1beta1"
]]
;
then
if
[[
${
gv
}
==
"federation/v1beta1"
]]
;
then
GV_DIRS+
=(
"
${
REPO_DIR
}
/
federation/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
GV_DIRS+
=(
"
${
REPO_DIR
}
/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
else
else
GV_DIRS+
=(
"
${
REPO_DIR
}
/
pkg/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
GV_DIRS+
=(
"
${
REPO_DIR
}
/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
fi
fi
done
done
...
...
hack/update-federation-generated-swagger-docs.sh
View file @
e100e899
...
@@ -31,7 +31,7 @@ kube::golang::setup_env
...
@@ -31,7 +31,7 @@ kube::golang::setup_env
GROUP_VERSIONS
=(
federation/v1beta1
)
GROUP_VERSIONS
=(
federation/v1beta1
)
GV_DIRS
=()
GV_DIRS
=()
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
for
gv
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
GV_DIRS+
=(
"
federation/
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
GV_DIRS+
=(
"
$(
kube::util::group-version-to-pkg-path
"
${
gv
}
"
)
"
)
done
done
# To avoid compile errors, remove the currently existing files.
# To avoid compile errors, remove the currently existing files.
...
...
hack/update-generated-swagger-docs.sh
View file @
e100e899
...
@@ -32,8 +32,8 @@ GROUP_VERSIONS=(meta/v1 ${KUBE_AVAILABLE_GROUP_VERSIONS})
...
@@ -32,8 +32,8 @@ GROUP_VERSIONS=(meta/v1 ${KUBE_AVAILABLE_GROUP_VERSIONS})
# To avoid compile errors, remove the currently existing files.
# To avoid compile errors, remove the currently existing files.
for
group_version
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
for
group_version
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
rm
-f
"
pkg/
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
/types_swagger_doc_generated.go"
rm
-f
"
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
/types_swagger_doc_generated.go"
done
done
for
group_version
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
for
group_version
in
"
${
GROUP_VERSIONS
[@]
}
"
;
do
kube::swagger::gen_types_swagger_doc
"
${
group_version
}
"
"
pkg/
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
"
kube::swagger::gen_types_swagger_doc
"
${
group_version
}
"
"
$(
kube::util::group-version-to-pkg-path
"
${
group_version
}
"
)
"
done
done
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment