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 #778

Merged
merged 1 commit into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require (
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
github.com/cppforlife/go-patch v0.2.0
github.com/ghodss/yaml v1.0.0
github.com/hashicorp/go-version v1.3.0
github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57
github.com/k14s/ytt v0.36.0
Expand All @@ -21,6 +20,7 @@ require (
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
sigs.k8s.io/yaml v1.3.0
)

require (
Expand Down Expand Up @@ -65,5 +65,4 @@ require (
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/cmd/serviceaccount/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package serviceaccount

import (
"github.com/ghodss/yaml"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"sigs.k8s.io/yaml"
)

type ServiceAccount struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package config
import (
"fmt"

"github.com/ghodss/yaml"
semver "github.com/hashicorp/go-version"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version"
"github.com/vmware-tanzu/carvel-kapp/pkg/kapp/yttresmod"
"sigs.k8s.io/yaml"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/resources/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"
"time"

"github.com/ghodss/yaml"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/yaml"
)

type Resource interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/resourcesmisc/api_extensions_vx_crd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package resourcesmisc

import (
"github.com/ghodss/yaml"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"sigs.k8s.io/yaml"
)

type APIExtensionsVxCRD struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/resourcesmisc/wait_rule_contract_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package resourcesmisc
import (
"fmt"

"github.com/ghodss/yaml"
cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"sigs.k8s.io/yaml"
)

type WaitRuleContractV1 struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/yttresmod/overlay_contract_v1_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package yttresmod
import (
"fmt"

"github.com/ghodss/yaml"
cmdtpl "github.com/k14s/ytt/pkg/cmd/template"
"github.com/k14s/ytt/pkg/cmd/ui"
"github.com/k14s/ytt/pkg/files"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"sigs.k8s.io/yaml"
)

type OverlayContractV1Mod struct {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"testing"

uitest "github.com/cppforlife/go-cli-ui/ui/test"
"github.com/ghodss/yaml"
"github.com/stretchr/testify/require"
ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources"
"sigs.k8s.io/yaml"
)

func TestConfig(t *testing.T) {
Expand Down Expand Up @@ -856,7 +856,7 @@ rules:
}

func RandomString(n int) string {
var letters = []rune("abcdefghijklmnopqrstuvwxyz0123456789")
letters := []rune("abcdefghijklmnopqrstuvwxyz0123456789")

s := make([]rune, n)
for i := range s {
Expand Down
20 changes: 0 additions & 20 deletions vendor/github.com/ghodss/yaml/.gitignore

This file was deleted.

7 changes: 0 additions & 7 deletions vendor/github.com/ghodss/yaml/.travis.yml

This file was deleted.

50 changes: 0 additions & 50 deletions vendor/github.com/ghodss/yaml/LICENSE

This file was deleted.

121 changes: 0 additions & 121 deletions vendor/github.com/ghodss/yaml/README.md

This file was deleted.

Loading