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

chore: replace github.com/ghodss/yaml with sigs.k8s.io/yaml #13292

Merged
merged 1 commit into from
May 4, 2023
Merged

chore: replace github.com/ghodss/yaml with sigs.k8s.io/yaml #13292

merged 1 commit into from
May 4, 2023

Conversation

Juneezee
Copy link
Contributor

The github.com/ghodss/yaml package is no longer actively maintained. sigs.k8s.io/yaml is a permanent fork of github.com/ghodss/yaml. It is actively maintained by Kubernetes SIG, and also widely used in K8s projects.

The notable change is that github.com/ghodss/yaml uses gopkg.in/yaml.v2 v2.2.2, but sigs.k8s.io/yaml uses gopkg.in/yaml.v2 v2.4.0. Changes can be seen here v2.2.2...v2.4.0, mostly bug fixes.

I also ran go mod tidy.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
@codecov
Copy link

codecov bot commented Apr 19, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (ceed653) 49.01% compared to head (c3926b3) 49.01%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13292      +/-   ##
==========================================
- Coverage   49.01%   49.01%   -0.01%     
==========================================
  Files         247      247              
  Lines       42685    42685              
==========================================
- Hits        20924    20921       -3     
- Misses      19645    19647       +2     
- Partials     2116     2117       +1     
Impacted Files Coverage Δ
cmd/argocd/commands/account.go 0.00% <ø> (ø)
cmd/argocd/commands/admin/admin.go 15.33% <ø> (ø)
cmd/argocd/commands/admin/app.go 31.12% <ø> (ø)
cmd/argocd/commands/admin/backup.go 0.00% <ø> (ø)
cmd/argocd/commands/admin/generatespec_utils.go 59.15% <ø> (ø)
cmd/argocd/commands/admin/project_allowlist.go 32.07% <ø> (ø)
cmd/argocd/commands/admin/settings.go 67.50% <ø> (ø)
cmd/argocd/commands/admin/settings_rbac.go 24.48% <ø> (ø)
cmd/argocd/commands/app.go 22.00% <ø> (ø)
cmd/argocd/commands/app_actions.go 0.00% <ø> (ø)
... and 13 more

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@blakepettersson
Copy link
Member

Looks great! It would also be good to update the notification-engine as well.

@Juneezee
Copy link
Contributor Author

Juneezee commented Apr 20, 2023

Looks great! It would also be good to update the notification-engine as well.

@blakepettersson Please also review argoproj/notifications-engine#175. I'll update this PR once that has been merged. Thanks

Copy link
Collaborator

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Thanks, @Juneezee!

@crenshaw-dev crenshaw-dev merged commit e8331b4 into argoproj:master May 4, 2023
29 checks passed
@crenshaw-dev
Copy link
Collaborator

@Juneezee once the notifications-engine fix is in, we can open another PR to bump the notifications-engine version. :-)

zachaller pushed a commit to argoproj/notifications-engine that referenced this pull request May 5, 2023
At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Reference: argoproj/argo-cd#13292 (comment)

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
mayzhang2000 pushed a commit to argoproj/notifications-engine that referenced this pull request May 9, 2023
At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Reference: argoproj/argo-cd#13292 (comment)

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
blakepettersson added a commit to alexef/argo-cd that referenced this pull request Jun 13, 2023
In the same vein as argoproj#13292, since `github.com/ghodss/yaml` is no longer
maintained.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
crenshaw-dev added a commit that referenced this pull request Jun 26, 2023
* feat: values can be either a string or a map

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Allow viewing and editing values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix golang lint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen make build green

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add special cases for handling nil/empty string. strip newline at end of generated yaml. fix unittests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add tests. Fix e2e marshalJSON

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen. make codegen and make codegen-local give different results to me

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Update helm_test.go

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix UI - validate input

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* change implementation; introduce valuesObject instead of values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* More generated files. Fix tests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix eslint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: use sigs.k8s.io/yaml

In the same vein as #13292, since `github.com/ghodss/yaml` is no longer
maintained.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: compact values

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make manifests

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: add to helm user guide

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: remove any deprecation mentions

Remove any mentions that `Values` is deprecated, for now.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: add assertion

verify that valuesobject overrides values by checking the number of
replicas.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: remove assertion

This wasn't meant to be in there, was a typo.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: minor nit fix

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

---------

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
zachaller added a commit to argoproj/notifications-engine that referenced this pull request Jul 12, 2023
* self-service from event

* chore: replace github.com/ghodss/yaml with sigs.k8s.io/yaml (#175)

At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Reference: argoproj/argo-cd#13292 (comment)

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* feat: Adding new PagerDuty integration based on Events API v2 (#105)

Signed-off-by: Eric Tendian <erictendian@gmail.com>

* self-service from event

* self-service from event

* self-service from event

* self-service from event

* self-service from event

* clean up factory.go

* error handleing in factory.go

* error handleing in factory.go

* error handleing in factory.go

* error handleing in factory.go

* error handleing in factory.go

* error handleing in factory.go

* error handleing in factory.go

* better caching

* better caching

* refactor

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* unused

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* lint

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* bump ci

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* small fixes

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* rename

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* rename

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* rename

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* change log line

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* update tests

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* continue on error

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* continue on errors

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* add godoc

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* continue on error

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* fix error by going back to non namespace support

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* fix log

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

* improve log on error

Signed-off-by: zachaller <zachaller@users.noreply.github.com>

---------

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Signed-off-by: Eric Tendian <erictendian@gmail.com>
Signed-off-by: zachaller <zachaller@users.noreply.github.com>
Co-authored-by: May Zhang <may_zhang@intuit.com>
Co-authored-by: Eng Zer Jun <engzerjun@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Eric Tendian <erictendian@gmail.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
…proj#13292)

At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
… (argoproj#11538)

* feat: values can be either a string or a map

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Allow viewing and editing values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix golang lint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen make build green

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add special cases for handling nil/empty string. strip newline at end of generated yaml. fix unittests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add tests. Fix e2e marshalJSON

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen. make codegen and make codegen-local give different results to me

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Update helm_test.go

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix UI - validate input

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* change implementation; introduce valuesObject instead of values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* More generated files. Fix tests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix eslint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: use sigs.k8s.io/yaml

In the same vein as argoproj#13292, since `github.com/ghodss/yaml` is no longer
maintained.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: compact values

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make manifests

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: add to helm user guide

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: remove any deprecation mentions

Remove any mentions that `Values` is deprecated, for now.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: add assertion

verify that valuesobject overrides values by checking the number of
replicas.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: remove assertion

This wasn't meant to be in there, was a typo.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: minor nit fix

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

---------

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
… (argoproj#11538)

* feat: values can be either a string or a map

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Allow viewing and editing values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix golang lint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen make build green

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add special cases for handling nil/empty string. strip newline at end of generated yaml. fix unittests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Add tests. Fix e2e marshalJSON

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* fix codegen. make codegen and make codegen-local give different results to me

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Update helm_test.go

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix UI - validate input

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* change implementation; introduce valuesObject instead of values

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* More generated files. Fix tests

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* Fix eslint

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: use sigs.k8s.io/yaml

In the same vein as argoproj#13292, since `github.com/ghodss/yaml` is no longer
maintained.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: compact values

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make manifests

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: add to helm user guide

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* docs: remove any deprecation mentions

Remove any mentions that `Values` is deprecated, for now.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: make codegen

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: add assertion

verify that valuesobject overrides values by checking the number of
replicas.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* test: remove assertion

This wasn't meant to be in there, was a typo.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

* chore: minor nit fix

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

---------

Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants