github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Switch generator logic to use pkg/apis/meta/v1

Browse Source
This commit is contained in:
Clayton Coleman 2016-11-27 19:40:49 -05:00
parent 12801e8bbb
commit 138267c876
No known key found for this signature in database
GPG Key ID: 3D16906B4F1C5CB3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/libs/go2idl/conversion-gen/main.go
View File

@ -56,7 +56,7 @@ func main() {
ExtraPeerDirs: []string{ ExtraPeerDirs: []string{
"k8s.io/kubernetes/pkg/api", "k8s.io/kubernetes/pkg/api",
"k8s.io/kubernetes/pkg/api/v1", "k8s.io/kubernetes/pkg/api/v1",
"k8s.io/kubernetes/pkg/api/unversioned", "k8s.io/kubernetes/pkg/apis/meta/v1",
"k8s.io/kubernetes/pkg/conversion", "k8s.io/kubernetes/pkg/conversion",
"k8s.io/kubernetes/pkg/runtime", "k8s.io/kubernetes/pkg/runtime",
}, },

2
cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go
View File

@ -65,7 +65,7 @@ func New() *Generator {
`+k8s.io/kubernetes/pkg/runtime/schema`, `+k8s.io/kubernetes/pkg/runtime/schema`,
`+k8s.io/kubernetes/pkg/runtime`, `+k8s.io/kubernetes/pkg/runtime`,
`+k8s.io/kubernetes/pkg/watch/versioned`, `+k8s.io/kubernetes/pkg/watch/versioned`,
`k8s.io/kubernetes/pkg/api/unversioned`, `k8s.io/kubernetes/pkg/apis/meta/v1`,
`k8s.io/kubernetes/pkg/api/v1`, `k8s.io/kubernetes/pkg/api/v1`,
`k8s.io/kubernetes/pkg/apis/policy/v1beta1`, `k8s.io/kubernetes/pkg/apis/policy/v1beta1`,
`k8s.io/kubernetes/pkg/apis/extensions/v1beta1`, `k8s.io/kubernetes/pkg/apis/extensions/v1beta1`,

2
hack/lib/swagger.sh
View File

@ -30,7 +30,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)"
kube::swagger::gen_types_swagger_doc() { kube::swagger::gen_types_swagger_doc() {
local group_version=$1 local group_version=$1
local gv_dir=$2 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}" echo "Generating swagger type docs for ${group_version} at ${gv_dir}"

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

@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/swagger.sh"
kube::golang::setup_env 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. # To avoid compile errors, remove the currently existing files.
for group_version in "${GROUP_VERSIONS[@]}"; do for group_version in "${GROUP_VERSIONS[@]}"; do