github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14392 from caesarxuchao/fix-swagger-docs-move-v1alpha1 

simplify group-version-to-pkg-path
pull/6/head
Brian Grant 2015-09-25 11:02:52 -07:00
parent b90797d941 d599d07bc3
commit d6c3ac54b8
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hack/lib/util.sh
View File

@ -243,11 +243,9 @@ kube::util::analytics-link() {
# Takes a group/version and returns the path to its location on disk, sans
# "pkg". E.g.:
# * default behavior: experimental/v1alpha1 -> apis/experimental/v1alpha1
# * legacy behavior: api/v1 -> api/v1
# * Special handling for only a group: experimental -> apis/experimental
# * Special handling for only "api" group: api -> api
# * Special handling for when both group and version are "": / -> api
# * Very special handling for "v1": v1 -> api/v1
# * default behavior for only a group: experimental -> apis/experimental
# * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned
# * Very special handling for when both group and version are "": / -> api
kube::util::group-version-to-pkg-path() {
local group_version="$1"
# Special cases first.
@ -261,14 +259,8 @@ kube::util::group-version-to-pkg-path() {
v1)
echo "api/v1"
;;
api)
echo "api/v1"
;;
api/*)
echo "${group_version}"
;;
api/*)
echo "${group_version}"
unversioned)
echo "api/unversioned"
;;
*)
echo "apis/${group_version}"

2
hack/update-generated-swagger-docs.sh
View File

@ -56,7 +56,7 @@ EOF
mv "$TMPFILE" "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"
}
GROUP_VERSIONS=(api/unversioned api/v1 experimental/v1alpha1)
GROUP_VERSIONS=(unversioned v1 experimental/v1alpha1)
# To avoid compile errors, remove the currently existing files.
for group_version in "${GROUP_VERSIONS[@]}"; do
rm -f "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"