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

use our own fork of go-yaml #511

Merged
merged 1 commit into from
Oct 9, 2024
Merged

use our own fork of go-yaml #511

merged 1 commit into from
Oct 9, 2024

Conversation

aojea
Copy link
Member

@aojea aojea commented Oct 5, 2024

We have our own fork of go-yaml kubernetes-sigs/yaml#76 so we can simplify the dependency graph in kubernetes if we end the path in kubernetes-sigs/yaml

go mod why gopkg.in/yaml.v3
# gopkg.in/yaml.v3
k8s.io/apimachinery/pkg/util/managedfields
k8s.io/kube-openapi/pkg/util/pro

Ref kubernetes-sigs/structured-merge-diff#264

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 5, 2024
@aojea
Copy link
Member Author

aojea commented Oct 5, 2024

/assign @liggitt

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 5, 2024
go.mod Outdated
@@ -48,4 +46,5 @@ require (
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Copy link
Member Author

@aojea aojea Oct 5, 2024

Choose a reason for hiding this comment

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

this is coming from

go mod why gopkg.in/yaml.v3
# gopkg.in/yaml.v3
k8s.io/kube-openapi/cmd/openapi2smd
github.com/google/gnostic-models/openapiv2
gopkg.in/yaml.v3

Copy link
Member Author

Choose a reason for hiding this comment

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

I See, and the type is required, breaking this PR 😢

Error: pkg/util/proto/document_v3.go:291:31: cannot use s.GetDefault().ToRawInfo() (value of type *"gopkg.in/yaml.v3".Node) as *"sigs.k8s.io/yaml/goyaml.v3".Node value in argument to parseV3Interface

Copy link
Member Author

Choose a reason for hiding this comment

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

@jpbetz should we move github.com/google/gnostic-models/openapiv2 to our fork too?

Copy link
Member

Choose a reason for hiding this comment

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

Changing gnostic models into another repo will cause import breakage (kubernetes/kubernetes#118340 and https://kubernetes.slack.com/archives/C0EG7JC6T/p1687271483899979) because client-go depends on it, and I would prefer not doing unless absolutely necessary. seeking some opinions from others, cc: @liggitt @sttts

Copy link
Member Author

Choose a reason for hiding this comment

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

@Jefftree tried to mean, move the yaml imported version, not the package :)

@aojea
Copy link
Member Author

aojea commented Oct 8, 2024

/assign @jpbetz

@sttts
Copy link
Contributor

sttts commented Oct 9, 2024

/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 Oct 9, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aojea, sttts

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 Oct 9, 2024
@sttts
Copy link
Contributor

sttts commented Oct 9, 2024

/retest

What do we do with the 1.20 CI failure?

@aojea
Copy link
Member Author

aojea commented Oct 9, 2024

it is legit, I will investigate more

Change-Id: Ic7dee4c0a08704a899194247dae9a1e97b5ffdae
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 9, 2024
@aojea
Copy link
Member Author

aojea commented Oct 9, 2024

@sttts it should be fixed now, I somehow added unnecessarely the dependency to test/integration/go.mod

@sttts
Copy link
Contributor

sttts commented Oct 9, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 9, 2024
@k8s-ci-robot k8s-ci-robot merged commit 67ed584 into kubernetes:master Oct 9, 2024
6 of 7 checks passed
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants