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

Update gnostic library to point to gnostic-models #118384

Merged
merged 3 commits into from
Jun 2, 2023
Merged

Update gnostic library to point to gnostic-models #118384

merged 3 commits into from
Jun 2, 2023

Conversation

Jefftree
Copy link
Member

@Jefftree Jefftree commented Jun 1, 2023 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

gnostic OpenAPI components were moved to the gnostic-models library. gnostic is pinned on v0.5.7-v3refs because we did not want to capture the additional dependencies introduced with later versions of gnostic. The OpenAPI component has been moved to gnostic-models so update the library path to reflect that.

This PR also bumps kustomize and kube-openapi to the latest version.

It picks up kubernetes/kube-openapi#403 for a thread safe openapi cache.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

OpenAPI proto deserializations should use gnostic-models instead of the gnostic library

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/triage accepted
/assign @apelisse @sttts

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jun 1, 2023
@k8s-ci-robot k8s-ci-robot added 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. triage/accepted Indicates an issue or PR is ready to be actively worked on. 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-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/architecture Categorizes an issue or PR as relevant to SIG Architecture. 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/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 Jun 1, 2023
@Jefftree
Copy link
Member Author

Jefftree commented Jun 1, 2023

/retest

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Jun 2, 2023
skitt added a commit to skitt/kustomize that referenced this pull request Jun 20, 2023
@skitt
Switch to json-patch v5
94eeea7 
json-patch was bumped to v5 in k/k as a result of
kubernetes/kubernetes#118384; this aligns with
that, but switches to the v5 module, which is documented as
gopkg.in/evanphx/json-patch.v5.

Signed-off-by: Stephen Kitt <[email protected]>
@Jefftree Jefftree mentioned this pull request Jun 22, 2023
Open
3 tasks
@Jefftree Jefftree deleted the gnostic-models-branch branch July 31, 2023 14:02
skitt added a commit to skitt/kustomize that referenced this pull request Aug 26, 2023
@skitt
Switch to json-patch v5
b692e49 
json-patch was bumped to v5 in k/k as a result of
kubernetes/kubernetes#118384; this aligns with
that, but switches to the v5 module, which is documented as
gopkg.in/evanphx/json-patch.v5.

Signed-off-by: Stephen Kitt <[email protected]>
liggitt
liggitt reviewed Aug 31, 2023
View reviewed changes
vendor/github.com/evanphx/json-patch/patch.go
@@ -568,29 +568,6 @@ func (p Patch) replace(doc *container, op Operation) error {
return errors.Wrapf(err, "replace operation failed to decode path")
}

if path == "" {
Copy link
Member

Choose a reason for hiding this comment

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

it looks like this lost this fix: evanphx/json-patch@50fdc0b

liggitt
liggitt reviewed Aug 31, 2023
View reviewed changes
go.mod
@@ -29,7 +29,7 @@ require (
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/go-units v0.5.0
github.com/emicklei/go-restful/v3 v3.9.0
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/evanphx/json-patch v5.6.0+incompatible
Copy link
Member

@liggitt liggitt Aug 31, 2023 •
edited

Choose a reason for hiding this comment

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

v5.6.0+incompatible is older than v4.12.0+incompatible (both were tagged on master) ... this dropped the following fix:

evanphx/json-patch@v5.6.0...v4.12.0

do we care about this?

@liggitt liggitt mentioned this pull request Aug 31, 2023
Closed
@howardjohn howardjohn mentioned this pull request Dec 6, 2023
Closed
@chiukapoor chiukapoor mentioned this pull request Jan 29, 2024
Merged
1 task
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Jan 29, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
e2ce569 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Jan 29, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
c8dd266 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Jan 29, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
c283421 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Jan 29, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
82d283c 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 13, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
26f0fba 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 13, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
0cbb086 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 13, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
1d41c47 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
krunalhinguu pushed a commit to krunalhinguu/rancher that referenced this pull request Feb 13, 2024
@chiukapoor @krunalhinguu
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
4d537cf 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 13, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
005df9b 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 14, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
d4d2db5 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 14, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
ae12468 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 15, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
8a92792 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 15, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
d4bd191 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Feb 16, 2024
@chiukapoor
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
0d7e552 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
anupama2501 pushed a commit to anupama2501/rancher that referenced this pull request Mar 5, 2024
@chiukapoor @anupama2501
Update openapi2 dependecy to gnostic-models [kubernetes/kubernetes#11…
f6713e4 
…8384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Apr 10, 2024
@chiukapoor
chore: update openapi2 dependecy to gnostic-models [kubernetes/kubern…
ffd1dc8 
…etes#118384]

Signed-off-by: Chirayu Kapoor <[email protected]>
@chiukapoor chiukapoor mentioned this pull request Apr 10, 2024
Merged
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Apr 17, 2024
@chiukapoor
chore: update openapi2 dependecy to gnostic-models [kubernetes/kubern…
1e5937f 
…etes#118384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Apr 18, 2024
@chiukapoor
chore: update openapi2 dependecy to gnostic-models [kubernetes/kubern…
bae2f13 
…etes#118384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Apr 19, 2024
@chiukapoor
chore: update openapi2 dependecy to gnostic-models [kubernetes/kubern…
3da24bf 
…etes#118384]

Signed-off-by: Chirayu Kapoor <[email protected]>
chiukapoor added a commit to chiukapoor/rancher that referenced this pull request Apr 23, 2024
@chiukapoor
chore: update openapi2 dependecy to gnostic-models [kubernetes/kubern…
543b532 
…etes#118384]

Signed-off-by: Chirayu Kapoor <[email protected]>
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

@alexzielenski alexzielenski Awaiting requested review from alexzielenski

@apelisse apelisse Awaiting requested review from apelisse

Assignees

@dims dims

@sttts sttts

@apelisse apelisse

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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. 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/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 Auth
Archived in project
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Jefftree @k8s-ci-robot @sttts @dims @imjasonh @apelisse @liggitt