import yaml.v2 as it used to be (#262)

Signed-off-by: Nandor Kracser <[email protected]>
banzaicloud · Jun 3, 2020 · 620988d · 620988d
1 parent 74bc090
commit 620988d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -29,6 +29,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
 	gopkg.in/square/go-jose.v2 v2.3.1 // indirect
+	gopkg.in/yaml.v2 v2.2.8
 	gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71
 	k8s.io/apimachinery v0.18.2
 	k8s.io/client-go v0.18.2

diff --git a/internal/cli/command/cluster/helm.go b/internal/cli/command/cluster/helm.go
@@ -34,7 +34,7 @@ import (
 	"github.com/banzaicloud/banzai-cli/internal/cli"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	yaml "gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v2"
 
 	serviceutils "github.com/banzaicloud/banzai-cli/internal/cli/command/cluster/integratedservice/utils"
 )

diff --git a/internal/cli/command/controlplane/init.go b/internal/cli/command/controlplane/init.go
@@ -30,7 +30,7 @@ import (
 	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 const (

diff --git a/internal/cli/command/controlplane/installer_options.go b/internal/cli/command/controlplane/installer_options.go
@@ -28,7 +28,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 const (

diff --git a/internal/cli/command/controlplane/utils.go b/internal/cli/command/controlplane/utils.go
@@ -27,7 +27,7 @@ import (
 	"github.com/banzaicloud/banzai-cli/internal/cli/input"
 	"github.com/imdario/mergo"
 	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v2"
 )
 
 func fileExists(filename string) bool {

diff --git a/internal/cli/input/secret.go b/internal/cli/input/secret.go
@@ -26,7 +26,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 
-	// "gopkg.in/yaml.v3" -- could not be used for kubernetes types
+	// "gopkg.in/yaml.v2" -- could not be used for kubernetes types
 	"github.com/ghodss/yaml"
 	v1 "k8s.io/client-go/tools/clientcmd/api/v1"
 

diff --git a/internal/cli/output/output.go b/internal/cli/output/output.go
@@ -20,7 +20,7 @@ import (
 	"io"
 
 	"emperror.dev/errors"
-	yaml "gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v2"
 
 	"github.com/banzaicloud/banzai-cli/pkg/formatting"
 )