Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update verify-openapi-spec script to check for extra generated spec #35841

Merged
merged 2 commits into from
Nov 2, 2016

Conversation

mbohlool
Copy link
Contributor

@mbohlool mbohlool commented Oct 29, 2016

hack/verify-openapi-spec.sh only check for existing spec changes. If for some reason (here most probably I forgot to delete a file in api/openapi-spec folder in #35388 after a rebase) there is an old spec exists in the spec folder, it won't panic but it should. This resulted in an unused out of date v1.spec file in the api/openapi-spec folder that this PR also removes.


This change is Reviewable

@mbohlool mbohlool added this to the v1.5 milestone Oct 29, 2016
@mbohlool mbohlool added the release-note-none Denotes a PR that doesn't merit a release note. label Oct 29, 2016
@k8s-github-robot k8s-github-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 29, 2016
cp -a "${SPECROOT}" "${TMP_SPECROOT}"
trap "cp -a ${TMP_SPECROOT} \"${KUBE_ROOT}/api\"; rm -rf ${_tmp}" EXIT SIGINT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will cp -a ${TMP_SPECROOT}/* ${SPECROOT} or cp -a ${TMP_SPECROOT} ${SPECROOT}/.. work?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is works and better. I just (blindly) copy/paster the command on (old) line 42. Would use your first suggestion.

@caesarxuchao
Copy link
Member

One comment and adding back the -N, then lgtm. Feel free to self apply the label.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2016
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 31, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit af76a70d9ba7107e5fb75e81bf39c033be89c546. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 1, 2016
@mbohlool mbohlool added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 1, 2016
@mbohlool
Copy link
Contributor Author

mbohlool commented Nov 1, 2016

@k8s-bot node e2e test this issue #ignore

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit c2f99d2. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@mbohlool
Copy link
Contributor Author

mbohlool commented Nov 1, 2016

@k8s-bot node e2e test this issue #35004

@nikhiljindal
Copy link
Contributor

@mbohlool Dont you need to make the same change in verify-federation-openapi-spec?

@nikhiljindal
Copy link
Contributor

ok I see, we dont have verify-federation-openapi-spec, only update-federation-openapi-spec :)
We should add it!

@mbohlool
Copy link
Contributor Author

mbohlool commented Nov 1, 2016

yep, we should add federation verify script but let me add it in another PR. This PR get rebased often because people edit v1.json spec file.

@nikhiljindal
Copy link
Contributor

oh yes, dont need to block this PR :)

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 46dc7e5 into kubernetes:master Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants