Skip to content
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
2 changes: 1 addition & 1 deletion cmd/gen-qbec-swagger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"time"

"github.com/ghodss/yaml"
"sigs.k8s.io/yaml"
)

func main() {
Expand Down
8 changes: 3 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.24.6
require (
github.com/bmatcuk/doublestar/v4 v4.9.1
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/spec v0.22.0
github.com/go-openapi/strfmt v0.24.0
github.com/go-openapi/validate v0.25.0
Expand All @@ -20,15 +19,16 @@ require (
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
github.com/tidwall/pretty v1.2.1
go.yaml.in/yaml/v3 v3.0.4
google.golang.org/protobuf v1.36.10
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/cli-runtime v0.34.1
k8s.io/client-go v0.34.1
k8s.io/gengo v0.0.0-20250922181213-ec3ebc5fd46b
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
k8s.io/kubectl v0.34.1
sigs.k8s.io/yaml v1.6.0
)

require (
Expand Down Expand Up @@ -86,7 +86,6 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.42.0 // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
Expand All @@ -97,7 +96,7 @@ require (
golang.org/x/time v0.9.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.34.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
Expand All @@ -106,5 +105,4 @@ require (
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
Expand Down Expand Up @@ -250,8 +248,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWM
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"strings"
"sync"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
Expand All @@ -32,6 +31,7 @@ import (
"github.com/splunk/qbec/internal/remote"
"github.com/splunk/qbec/internal/sio"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/yaml"
)

// ctxProvider provides standard configuration available to all commands
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"sync"
"testing"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/splunk/qbec/internal/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func TestRunInParallelNoObjects(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"io"
"strings"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"github.com/splunk/qbec/internal/diff"
"github.com/splunk/qbec/internal/model"
"sigs.k8s.io/yaml"
)

func newComponentCommand(cp ctxProvider) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"sort"
"sync"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"github.com/splunk/qbec/internal/diff"
Expand All @@ -31,6 +30,7 @@ import (
"github.com/splunk/qbec/internal/sio"
"github.com/splunk/qbec/internal/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/yaml"
)

type diffIgnores struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"sort"
"strings"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"sigs.k8s.io/yaml"
)

func newEnvCommand(cp ctxProvider) *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/fmtutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/google/go-jsonnet/formatter"
"github.com/tidwall/pretty"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)

func format(in []byte, filename string) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"os"
"path/filepath"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"github.com/splunk/qbec/internal/model"
"github.com/splunk/qbec/internal/remote"
"github.com/splunk/qbec/internal/sio"
"sigs.k8s.io/yaml"
)

type initCommandConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/param.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"io"
"sort"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"github.com/splunk/qbec/internal/diff"
"github.com/splunk/qbec/internal/eval"
"github.com/splunk/qbec/internal/model"
"github.com/splunk/qbec/internal/sio"
"sigs.k8s.io/yaml"
)

var maxDisplayValueLength = 1024
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/show.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"io"
"strings"

"github.com/ghodss/yaml"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
"github.com/splunk/qbec/internal/model"
"github.com/splunk/qbec/internal/objsort"
"github.com/splunk/qbec/internal/sio"
"github.com/splunk/qbec/internal/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/yaml"
)

type metaOnly struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"strings"
"testing"

yamllib "github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/splunk/qbec/internal/cmd"
Expand All @@ -41,6 +40,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/client-go/dynamic"
yamllib "sigs.k8s.io/yaml"
)

type objectKey struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/diff/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package diff
import (
"strings"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
godiff "github.com/pmezard/go-difflib/difflib"
"sigs.k8s.io/yaml"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/model/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"strings"
"time"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/splunk/qbec/internal/filematcher"
"github.com/splunk/qbec/internal/sio"
"sigs.k8s.io/yaml"
)

// Baseline is a special environment name that represents the baseline environment with no customizations.
Expand Down
2 changes: 1 addition & 1 deletion internal/model/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (
"text/template"
"time"

"github.com/ghodss/yaml"
"github.com/splunk/qbec/internal/sio"
"github.com/splunk/qbec/internal/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

func setPwd(t *testing.T, dir string) func() {
Expand Down
2 changes: 1 addition & 1 deletion internal/model/k8s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"testing"

"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
)

var cm = `
Expand Down
2 changes: 1 addition & 1 deletion internal/model/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"fmt"
"strings"

"github.com/ghodss/yaml"
"github.com/go-openapi/spec"
"github.com/go-openapi/strfmt"
"github.com/go-openapi/validate"
"github.com/pkg/errors"
"sigs.k8s.io/yaml"
)

// LatestAPIVersion is the latest version of the API we support.
Expand Down
2 changes: 1 addition & 1 deletion internal/remote/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"strings"
"time"

"github.com/ghodss/yaml"
"github.com/jonboulle/clockwork"
"github.com/pkg/errors"
"github.com/splunk/qbec/internal/model"
Expand All @@ -35,6 +34,7 @@ import (
apiTypes "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"sigs.k8s.io/yaml"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/remote/pristine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"path/filepath"
"testing"

"github.com/ghodss/yaml"
"github.com/splunk/qbec/internal/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/yaml"
)

func TestZipRoundTrip(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/types/secrets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"testing"

"github.com/ghodss/yaml"
"github.com/splunk/qbec/internal/model"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"
)

var cm = `
Expand Down
2 changes: 1 addition & 1 deletion vm/internal/natives/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"

"github.com/ghodss/yaml"
"github.com/pkg/errors"
"sigs.k8s.io/yaml"
)

// helmOptions are options that can be passed to the helm template command as well
Expand Down
2 changes: 1 addition & 1 deletion vm/internal/natives/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package natives
import (
"io"

v3yaml "gopkg.in/yaml.v3"
v3yaml "go.yaml.in/yaml/v3"
"k8s.io/apimachinery/pkg/util/yaml"
)

Expand Down
Loading