Skip to content

branchff: Remove hack/update-openapi-spec.sh run from tool#921

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
justaugustus:ff-rm-openapi-update
Jan 8, 2020
Merged

branchff: Remove hack/update-openapi-spec.sh run from tool#921
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
justaugustus:ff-rm-openapi-update

Conversation

@justaugustus
Copy link
Copy Markdown
Member

@justaugustus justaugustus commented Nov 1, 2019

This is an optimization, which also allows us to perform a true branch
fast-forward using "branchff".

Prior to this commit, we were running hack/update-openapi-spec.sh,
which:

  • installs a bunch of prerequisites, including etcd
  • builds the apiserver
  • runs an apiserver to retrieve the OpenAPI spec
  • rewrites a version field within the resulting swagger.json to match
    the targeted release branch

And then we commit the result before pushing to the upstream release
branch.

This is obviously wasteful and runs contrary to the definition of a
fast-forward.

A fix to "null" the version field in the swagger.json has been
submitted, so this commit removes that script logic to match.

Signed-off-by: Stephen Augustus saugustus@vmware.com

Until kubernetes/kubernetes#84654 merges:
/hold

/assign @liggitt @cpanato @Katharine @tpepper
/priority important-soon
/kind cleanup
/milestone v1.17

ref: https://kubernetes.slack.com/archives/C1TU9EB9S/p1572627769216100

This is an optimization, which also allows us to perform a true branch
fast-forward using "branchff".

Prior to this commit, we were running hack/update-openapi-spec.sh,
which:
- installs a bunch of prerequisites, including etcd
- builds the apiserver
- runs an apiserver to retrieve the OpenAPI spec
- rewrites a version field within the resulting swagger.json to match
   the targeted release branch

And then we commit the result before pushing to the upstream release
branch.

This is obviously wasteful and runs contrary to the definition of a
fast-forward.

A fix to "null" the version field in the swagger.json has been
submitted, so this commit removes that script logic to match.

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@justaugustus: Adding label: do-not-merge/blocked-paths because PR changes a protected file.

Details

Reasons for blocking this PR:

[Changes to certain release tools can affect our ability to test, build, and release Kubernetes. This PR must be explicitly approved by SIG Release repo admins.]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 1, 2019
@k8s-ci-robot k8s-ci-robot added the do-not-merge/blocked-paths Indicates that a PR should not merge because it touches files in blocked paths. label Nov 1, 2019
@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Nov 1, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Nov 1, 2019
@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 1, 2019
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. labels Nov 1, 2019
@cpanato
Copy link
Copy Markdown
Member

cpanato commented Nov 1, 2019

Do we need to wait for kubernetes/kubernetes#84654 get merged?

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Nov 1, 2019

looks much more like a fast-forward

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Nov 1, 2019

Do we need to wait for kubernetes/kubernetes#84654 get merged?

yes, that's why it is held

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Nov 1, 2019

also, for release-1.17, the first fast forward after kubernetes/kubernetes#84654 merges will not be clean. you might need to wait until after the next fast-forward to merge this

@justaugustus
Copy link
Copy Markdown
Member Author

also, for release-1.17, the first fast forward after kubernetes/kubernetes#84654 merges will not be clean. you might need to wait until after the next fast-forward to merge this

I can do a fast-forward immediately afterwards or just wait til Monday. :)

Copy link
Copy Markdown
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 24, 2019
Copy link
Copy Markdown
Member

@dougm dougm left a comment

Choose a reason for hiding this comment

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

Nice @justaugustus
/lgtm

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, dougm, justaugustus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@justaugustus
Copy link
Copy Markdown
Member Author

(Still on hold until we close the loop on kubernetes/kubernetes#84654.)

@justaugustus
Copy link
Copy Markdown
Member Author

kubernetes/kubernetes#84654 has merged.
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 8, 2020
@justaugustus justaugustus removed the do-not-merge/blocked-paths Indicates that a PR should not merge because it touches files in blocked paths. label Jan 8, 2020
@k8s-ci-robot k8s-ci-robot merged commit 7fed9c0 into kubernetes:master Jan 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/release Categorizes an issue or PR as relevant to SIG Release. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants