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

Merge pull request #75339 from roycaihw/fix/apiextensions-compile

Browse Source 
apiextensions: commit generated openapi definitions
This commit is contained in:
Kubernetes Prow Robot 2019-03-14 09:52:26 -07:00 committed by GitHub
commit 58021216b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2682 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -111,6 +111,8 @@ kubernetes.tar.gz
# TODO(thockin): uncomment this when we stop committing the generated files. # TODO(thockin): uncomment this when we stop committing the generated files.
#zz_generated.* #zz_generated.*
zz_generated.openapi.go zz_generated.openapi.go
# TODO(roycaihw): remove this when we stop committing the generated definition
!staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go
zz_generated_*_test.go zz_generated_*_test.go
# make-related metadata # make-related metadata

2
hack/make-rules/clean.sh
View File

@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
CLEAN_PATTERNS=( CLEAN_PATTERNS=(
"_tmp" "_tmp"
"doc_tmp" "doc_tmp"
".*/zz_generated.openapi.go" "((?!staging\/src\/k8s\.io\/apiextensions-apiserver\/pkg\/generated\/openapi).)*/zz_generated.openapi.go"
"test/e2e/generated/bindata.go" "test/e2e/generated/bindata.go"
) )

2
hack/verify-godeps.sh
View File

@ -101,7 +101,7 @@ pushd "${KUBE_ROOT}" > /dev/null 2>&1
ret=1 ret=1
fi fi
if ! _out="$(diff -Naupr -x "BUILD" -x "zz_generated.openapi.go" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor "${_kubetmp}/vendor")"; then if ! _out="$(diff -Naupr -x "BUILD" -x "AUTHORS*" -x "CONTRIBUTORS*" vendor "${_kubetmp}/vendor")"; then
echo "Your vendored results are different:" >&2 echo "Your vendored results are different:" >&2
echo "${_out}" >&2 echo "${_out}" >&2
echo "Godeps Verify failed." >&2 echo "Godeps Verify failed." >&2

2678
staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/zz_generated.openapi.go generated Normal file
View File

File diff suppressed because it is too large Load Diff