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.

Sign up for GitHub

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

Jump to bottom

eliminate dependency on go-openapi/spec #101234

Merged
merged 2 commits into from
Apr 21, 2021
Merged

eliminate dependency on go-openapi/spec #101234

merged 2 commits into from
Apr 21, 2021

Conversation

gautierdelorme
Copy link
Contributor

@gautierdelorme gautierdelorme commented Apr 19, 2021 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

We don't need to rely on github.com/go-openapi/spec anymore since k8s.io/kube-openapi supports all the features required by Kubernetes (kubernetes/kube-openapi#234).

Which issue(s) this PR fixes:

Fixes #96303

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Gautier Delorme gautier.delorme@gmail.com

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 19, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @gautierdelorme. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/test sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 19, 2021
@k8s-ci-robot k8s-ci-robot requested review from adtac, apelisse and a team April 19, 2021 09:17
@ehashman ehashman added this to Triage in SIG Node PR Triage Apr 19, 2021
@gautierdelorme
Copy link
Contributor Author

/test pull-kubernetes-integration

flake #100556

@gautierdelorme
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind

flake #101275

@gautierdelorme gautierdelorme mentioned this pull request Apr 21, 2021
Merged
@gautierdelorme
bump k8s.io/kube-openapi
bcdde6b 
Signed-off-by: Gautier Delorme <gautier.delorme@gmail.com>
@gautierdelorme gautierdelorme changed the title [WIP] eliminate dependency on go-openapi/spec eliminate dependency on go-openapi/spec Apr 21, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 21, 2021
@gautierdelorme
Copy link
Contributor Author

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 21, 2021
@gautierdelorme
remove go-openapi/spec
34b0fce 
Signed-off-by: Gautier Delorme <gautier.delorme@gmail.com>
@gautierdelorme
Copy link
Contributor Author

/test pull-kubernetes-integration

flake #100556

@gautierdelorme
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@dims
Copy link
Member

dims commented Apr 21, 2021

/assign @sttts @liggitt

thanks @gautierdelorme assigning to the right folks. looks very mechanical so i am happy to lgtm after approval

liggitt
liggitt reviewed Apr 21, 2021
View reviewed changes
vendor/modules.txt
@@ -419,7 +419,6 @@ github.com/go-openapi/jsonreference
# github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.4
# github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.4
# github.com/go-openapi/spec v0.19.5 => github.com/go-openapi/spec v0.19.5
## explicit
github.com/go-openapi/spec
Copy link
Member

Choose a reason for hiding this comment

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

we didn't actually drop anything under vendor/github.com/go-openapi/spec as part of this, so we actually increased our dependencies... what is requiring github.com/go-openapi/spec now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@liggitt this is what I shared in Slack:

github.com/go-openapi/spec is still being pulled in by kustomize though (but k/k doesn't depend on it anymore).

$ go mod why github.com/go-openapi/spec
# github.com/go-openapi/spec
k8s.io/kubernetes/pkg/kubectl/cmd/convert
k8s.io/cli-runtime/pkg/resource
sigs.k8s.io/kustomize/api/krusty
sigs.k8s.io/kustomize/kyaml/openapi
github.com/go-openapi/spec

Not sure if that's something we want to change in the future (https://github.com/kubernetes-sigs/kustomize/blob/f93cee94404bf0b60ff82785be9ff2af9797463f/kyaml/openapi/openapi.go#L14).

Copy link
Member

Choose a reason for hiding this comment

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

ah, right... #98946 (comment)

tracked in kubernetes-sigs/kustomize#3705

@liggitt liggitt mentioned this pull request Apr 21, 2021
Closed
@liggitt
Copy link
Member

liggitt commented Apr 21, 2021

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 21, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gautierdelorme, liggitt

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit 565d5f4 into kubernetes:master Apr 21, 2021
SIG Node PR Triage automation moved this from Waiting on Author to Done Apr 21, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Apr 21, 2021
@gautierdelorme gautierdelorme deleted the rm-go-openapi-spec branch April 21, 2021 14:07
@liggitt liggitt mentioned this pull request Apr 22, 2021
Closed
@liggitt
Copy link
Member

liggitt commented Apr 22, 2021

generated openapi files still reference this, xref #101375

@nikhita nikhita mentioned this pull request May 19, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@apelisse apelisse apelisse left review comments

@adtac adtac Awaiting requested review from adtac

@kevindelgado kevindelgado Awaiting requested review from kevindelgado

Assignees

@sttts sttts

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/test 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

Eliminate dependency on go-openapi/spec
7 participants
@gautierdelorme @k8s-ci-robot @dims @fedebongio @liggitt @apelisse @sttts