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

Use upstream go-yaml fork and remove our internal one #5412

Merged
merged 4 commits into from Oct 25, 2023
Merged

Use upstream go-yaml fork and remove our internal one #5412

merged 4 commits into from Oct 25, 2023

Conversation

natasha41575
Copy link
Contributor

@natasha41575 natasha41575 commented Oct 23, 2023 •
edited

kubernetes-sigs/yaml#76 is merged, so we can get rid of our internal fork of go-yaml and use the upstream one instead.

@k8s-ci-robot
Copy link
Contributor

This PR has multiple commits, and the default merge method is: merge.
You can request commits to be squashed using the label: tide/merge-method-squash

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 23, 2023
@natasha41575 natasha41575 marked this pull request as draft October 23, 2023 16:40
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: natasha41575

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2023
@natasha41575
Copy link
Contributor Author

/retest

1 similar comment
@natasha41575
Copy link
Contributor Author

/retest

@natasha41575 natasha41575 marked this pull request as ready for review October 23, 2023 16:58
@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 Oct 23, 2023
@natasha41575 natasha41575 changed the title test new go-yaml fork WIP: test new go yaml fork Oct 23, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2023
@natasha41575 natasha41575 changed the title WIP: test new go yaml fork Use upstream go-yaml fork and remove our internal one Oct 25, 2023
@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 Oct 25, 2023
@natasha41575 natasha41575 mentioned this pull request Oct 25, 2023
Closed
@natasha41575 natasha41575 added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Oct 25, 2023
ncapps
ncapps reviewed Oct 25, 2023
View reviewed changes
go.work.sum Outdated
@@ -145,6 +145,7 @@ github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 h1:F9x/1yl3T2AeKLr2AMdilSD8+f9bvMnNN8VS5iDtovc=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
github.com/natasha41575/yaml-1 v1.3.1-0.20231023160344-f2c02299d455/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this meant to point to your fork of yaml?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh my bad, no it isn't. Let me try to fix that, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

ncapps
ncapps reviewed Oct 25, 2023
View reviewed changes
Copy link
Contributor

@ncapps ncapps left a comment

Choose a reason for hiding this comment

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

I'm not technically a reviewer but this LGTM.

@rayandas
Copy link
Member

Went through the changes. It looks good.
/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 25, 2023
@k8s-ci-robot k8s-ci-robot merged commit 96ad106 into kubernetes-sigs:master Oct 25, 2023
9 checks passed
@rayandas
Copy link
Member

Why did it merge the PR (with lgtm from a non-approver) ?? 😢

@natasha41575 natasha41575 deleted the test branch October 25, 2023 18:24
@ncapps ncapps mentioned this pull request Nov 13, 2023
Closed
9 tasks
@ncapps ncapps mentioned this pull request Dec 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncapps ncapps ncapps left review comments

@koba1t koba1t Awaiting requested review from koba1t

@yuwenma yuwenma Awaiting requested review from yuwenma

Assignees

@rayandas rayandas

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
Kustomize CI, release Improvements, telemetry, & refactors
Status: Done
Kustomize Core Usability Bugs
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@natasha41575 @k8s-ci-robot @rayandas @ncapps