Merge pull request #37534 from smarterclayton/move_unversion
Automatic merge from submit-queue (batch tested with PRs 36816, 37534) Move pkg/api/unversioned to pkg/apis/meta/v1 This moves code from using pkg/api/unversioned to pkg/apis/meta/v1 with the `metav1` local package name. Built on top of #37532 (the first three commits related to ExportOptions) Part of #37530
This commit is contained in:
@@ -30,7 +30,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)"
|
||||
kube::swagger::gen_types_swagger_doc() {
|
||||
local group_version=$1
|
||||
local gv_dir=$2
|
||||
local TMPFILE="/tmp/types_swagger_doc_generated.$(date +%s).go"
|
||||
local TMPFILE="${TMPDIR:-/tmp}/types_swagger_doc_generated.$(date +%s).go"
|
||||
|
||||
echo "Generating swagger type docs for ${group_version} at ${gv_dir}"
|
||||
|
||||
|
@@ -87,7 +87,7 @@ pkg/api/v1
|
||||
$(
|
||||
cd ${KUBE_ROOT}
|
||||
# because client-gen doesn't do policy/v1alpha1, we have to skip it too
|
||||
find pkg/apis -name types.go | xargs dirname | sort | grep -v pkg.apis.policy.v1alpha1
|
||||
find pkg/apis -name types.go | xargs -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1
|
||||
)
|
||||
)
|
||||
|
||||
|
@@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/swagger.sh"
|
||||
|
||||
kube::golang::setup_env
|
||||
|
||||
GROUP_VERSIONS=(unversioned ${KUBE_AVAILABLE_GROUP_VERSIONS})
|
||||
GROUP_VERSIONS=(${KUBE_AVAILABLE_GROUP_VERSIONS})
|
||||
|
||||
# To avoid compile errors, remove the currently existing files.
|
||||
for group_version in "${GROUP_VERSIONS[@]}"; do
|
||||
|
Reference in New Issue
Block a user