Skip to content

Commit b420b4c

Browse files
fix(deps): update module sigs.k8s.io/yaml to v1.6.0
1 parent c96a4a1 commit b420b4c

File tree

57 files changed

+1089
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1089
-852
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
k8s.io/apimachinery v0.32.3
1414
k8s.io/client-go v0.32.3
1515
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
16-
sigs.k8s.io/yaml v1.4.0
16+
sigs.k8s.io/yaml v1.6.0
1717
)
1818

1919
require (
@@ -48,6 +48,7 @@ require (
4848
github.com/spf13/cobra v1.8.1 // indirect
4949
github.com/spf13/pflag v1.0.5 // indirect
5050
github.com/x448/float16 v0.8.4 // indirect
51+
go.yaml.in/yaml/v2 v2.4.2 // indirect
5152
golang.org/x/mod v0.21.0 // indirect
5253
golang.org/x/net v0.34.0 // indirect
5354
golang.org/x/oauth2 v0.25.0 // indirect

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
219219
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
220220
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
221221
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
222+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
223+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
222224
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
223225
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
224226
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -317,3 +319,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aN
317319
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
318320
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
319321
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
322+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
323+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

vendor/dario.cat/mergo/CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
- Using welcoming and inclusive language
12-
- Being respectful of differing viewpoints and experiences
13-
- Gracefully accepting constructive criticism
14-
- Focusing on what is best for the community
15-
- Showing empathy towards other community members
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
- Trolling, insulting/derogatory comments, and personal or political attacks
21-
- Public or private harassment
22-
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
- Other conduct which could reasonably be considered inappropriate in a professional setting
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

vendor/dario.cat/mergo/CONTRIBUTING.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
<!-- omit in toc -->
2-
32
# Contributing to mergo
43

54
First off, thanks for taking the time to contribute! ❤️
65

76
All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
87

98
> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
10-
>
119
> - Star the project
1210
> - Tweet about it
1311
> - Refer this project in your project's readme
1412
> - Mention the project at local meetups and tell your friends/colleagues
1513
1614
<!-- omit in toc -->
17-
1815
## Table of Contents
1916

2017
- [Code of Conduct](#code-of-conduct)
@@ -30,6 +27,7 @@ This project and everyone participating in it is governed by the
3027
By participating, you are expected to uphold this code. Please report unacceptable behavior
3128
to <>.
3229

30+
3331
## I Have a Question
3432

3533
> If you want to ask a question, we assume that you have read the available [Documentation](https://pkg.go.dev/github.com/imdario/mergo).
@@ -47,13 +45,11 @@ We will then take care of the issue as soon as possible.
4745
## I Want To Contribute
4846

4947
> ### Legal Notice <!-- omit in toc -->
50-
>
5148
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
5249
5350
### Reporting Bugs
5451

5552
<!-- omit in toc -->
56-
5753
#### Before Submitting a Bug Report
5854

5955
A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
@@ -70,18 +66,16 @@ A good bug report shouldn't leave others needing to chase you up for more inform
7066
- Can you reliably reproduce the issue? And can you also reproduce it with older versions?
7167

7268
<!-- omit in toc -->
73-
7469
#### How Do I Submit a Good Bug Report?
7570

7671
> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to .
77-
7872
<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
7973
8074
We use GitHub issues to track bugs and errors. If you run into an issue with the project:
8175

8276
- Open an [Issue](https://github.com/imdario/mergo/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
8377
- Explain the behavior you would expect and the actual behavior.
84-
- Please provide as much context as possible and describe the _reproduction steps_ that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
78+
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
8579
- Provide the information you collected in the previous section.
8680

8781
Once it's filed:
@@ -95,7 +89,6 @@ Once it's filed:
9589
This section guides you through submitting an enhancement suggestion for mergo, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
9690

9791
<!-- omit in toc -->
98-
9992
#### Before Submitting an Enhancement
10093

10194
- Make sure that you are using the latest version.
@@ -104,7 +97,6 @@ This section guides you through submitting an enhancement suggestion for mergo,
10497
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
10598

10699
<!-- omit in toc -->
107-
108100
#### How Do I Submit a Good Enhancement Suggestion?
109101

110102
Enhancement suggestions are tracked as [GitHub issues](https://github.com/imdario/mergo/issues).
@@ -116,7 +108,5 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/imdari
116108
- **Explain why this enhancement would be useful** to most mergo users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
117109

118110
<!-- omit in toc -->
119-
120111
## Attribution
121-
122112
This guide is based on the **contributing-gen**. [Make your own](https://github.com/bttger/contributing-gen)!

vendor/dario.cat/mergo/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Please keep in mind that a problematic PR broke [0.3.9](//github.com/imdario/mer
6666

6767
Keep in mind that in [0.3.2](//github.com/imdario/mergo/releases/tag/0.3.2), Mergo changed `Merge()`and `Map()` signatures to support [transformers](#transformers). I added an optional/variadic argument so that it won't break the existing code.
6868

69-
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with `go get -u dario.cat/mergo`. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
69+
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with ```go get -u dario.cat/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
7070

7171
### Donations
7272

@@ -79,17 +79,17 @@ If Mergo is useful to you, consider buying me a coffee, a beer, or making a mont
7979

8080
Mergo is used by [thousands](https://deps.dev/go/dario.cat%2Fmergo/v1.0.0/dependents) [of](https://deps.dev/go/github.com%2Fimdario%2Fmergo/v0.3.16/dependents) [projects](https://deps.dev/go/github.com%2Fimdario%2Fmergo/v0.3.12), including:
8181

82-
- [containerd/containerd](https://github.com/containerd/containerd)
83-
- [datadog/datadog-agent](https://github.com/datadog/datadog-agent)
84-
- [docker/cli/](https://github.com/docker/cli/)
85-
- [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
86-
- [go-micro/go-micro](https://github.com/go-micro/go-micro)
87-
- [grafana/loki](https://github.com/grafana/loki)
88-
- [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
89-
- [masterminds/sprig](github.com/Masterminds/sprig)
90-
- [moby/moby](https://github.com/moby/moby)
91-
- [slackhq/nebula](https://github.com/slackhq/nebula)
92-
- [volcano-sh/volcano](https://github.com/volcano-sh/volcano)
82+
* [containerd/containerd](https://github.com/containerd/containerd)
83+
* [datadog/datadog-agent](https://github.com/datadog/datadog-agent)
84+
* [docker/cli/](https://github.com/docker/cli/)
85+
* [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
86+
* [go-micro/go-micro](https://github.com/go-micro/go-micro)
87+
* [grafana/loki](https://github.com/grafana/loki)
88+
* [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
89+
* [masterminds/sprig](github.com/Masterminds/sprig)
90+
* [moby/moby](https://github.com/moby/moby)
91+
* [slackhq/nebula](https://github.com/slackhq/nebula)
92+
* [volcano-sh/volcano](https://github.com/volcano-sh/volcano)
9393

9494
## Install
9595

vendor/github.com/emicklei/go-restful/v3/CHANGES.md

Lines changed: 26 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)