gardener · petersutter · Mar 29, 2023 · Mar 20, 2023 · Mar 20, 2023 · Mar 20, 2023
@@ -16,6 +16,7 @@ gardenctl ssh [NODE_NAME] [flags]
       --interactive               Open an SSH connection instead of just providing the bastion host (only if NODE_NAME is provided). (default true)
       --keep-bastion              Do not delete immediately when gardenctl exits (Bastions will be garbage-collected after some time)
       --no-keepalive              Exit after the bastion host became available without keeping the bastion alive or establishing an SSH connection. Note that this flag requires the flags --interactive=false and --keep-bastion to be set
+  -o, --output string             One of 'yaml' or 'json'.
       --project string            target the given project
       --public-key-file string    Path to the file that contains a public SSH key. If not given, a temporary keypair will be generated.
       --seed string               target the given seed cluster

@@ -17,7 +17,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
 	golang.org/x/crypto v0.7.0
-	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.25.0
 	k8s.io/apiserver v0.25.0
@@ -27,6 +26,7 @@ require (
 	k8s.io/klog/v2 v2.70.1
 	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
 	sigs.k8s.io/controller-runtime v0.13.0
+	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
@@ -119,6 +119,7 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	istio.io/api v0.0.0-20221013011440-bc935762d2b9 // indirect
 	istio.io/client-go v1.15.3 // indirect
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
@@ -131,7 +132,6 @@ require (
 	sigs.k8s.io/kustomize/api v0.12.1 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace k8s.io/client-go => k8s.io/client-go v0.25.0
@@ -20,23 +20,23 @@ import (
 // AccessRestriction is used to define an access restriction.
 type AccessRestriction struct {
 	// Key is the identifier of an access restriction
-	Key string `yaml:"key,omitempty" json:"key,omitempty"`
+	Key string `json:"key,omitempty"`
 	// NotifyIf controls which value the annotation must have for a notification to be sent
-	NotifyIf bool `yaml:"notifyIf,omitempty" json:"notifyIf,omitempty"`
+	NotifyIf bool `json:"notifyIf,omitempty"`
 	// Msg is the notification text that is sent
-	Msg string `yaml:"msg,omitempty" json:"msg,omitempty"`
+	Msg string `json:"msg,omitempty"`
 	// Options is a list of access restriction options
-	Options []AccessRestrictionOption `yaml:"options,omitempty" json:"options,omitempty"`
+	Options []AccessRestrictionOption `json:"options,omitempty"`
 }
 
 // AccessRestrictionOption is used to define an access restriction option.
 type AccessRestrictionOption struct {
 	// Key is the identifier of an access restriction option
-	Key string `yaml:"key,omitempty" json:"key,omitempty"`
+	Key string `json:"key,omitempty"`
 	// NotifyIf controls which value the annotation must have for a notification to be sent
-	NotifyIf bool `yaml:"notifyIf,omitempty" json:"notifyIf,omitempty"`
+	NotifyIf bool `json:"notifyIf,omitempty"`
 	// Msg is the notification text that is sent
-	Msg string `yaml:"msg,omitempty" json:"msg,omitempty"`
+	Msg string `json:"msg,omitempty"`
 }
 
 // AccessRestrictionHandler is a function that should display a single AccessRestrictionMessage to the user.

@@ -13,7 +13,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"gopkg.in/yaml.v3"
+	"sigs.k8s.io/yaml"
 
 	"github.com/gardener/gardenctl-v2/internal/util"
 )
@@ -72,18 +72,18 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) {
 func (o *Options) PrintObject(obj interface{}) error {
 	switch o.Output {
 	case "":
-		fmt.Fprintf(o.IOStreams.Out, "%v", obj)
-
+		if _, ok := obj.(fmt.Stringer); ok {
+			fmt.Fprintf(o.IOStreams.Out, "%s", obj)
+		} else {
+			fmt.Fprintf(o.IOStreams.Out, "%v", obj)
+		}
 	case "yaml":
-		yamlEncoder := yaml.NewEncoder(o.IOStreams.Out)
-		defer yamlEncoder.Close()
-
-		yamlEncoder.SetIndent(2)
-
-		err := yamlEncoder.Encode(&obj)
+		marshalled, err := yaml.Marshal(&obj)
 		if err != nil {
 			return err
 		}
+
+		fmt.Fprintln(o.IOStreams.Out, string(marshalled))
 	case "json":
 		marshalled, err := json.MarshalIndent(&obj, "", "  ")
 		if err != nil {

@@ -24,12 +24,12 @@ import (
 var _ = Describe("Base Options", func() {
 	Describe("given an instance", func() {
 		type barType struct {
-			Baz string
+			Baz string `json:"baz"`
 		}
 
 		type fooType struct {
-			Foo string
-			Bar barType
+			Foo string  `json:"foo"`
+			Bar barType `json:"bar"`
 		}
 
 		var (
@@ -78,9 +78,9 @@ var _ = Describe("Base Options", func() {
 				Expect(options.PrintObject(foo)).To(Succeed())
 				Expect(buf.String()).To(Equal(fmt.Sprintf(
 					`{
-  "Foo": %q,
-  "Bar": {
-    "Baz": %q
+  "foo": %q,
+  "bar": {
+    "baz": %q
   }
 }
 `, foo.Foo, foo.Bar.Baz)))
@@ -99,11 +99,12 @@ var _ = Describe("Base Options", func() {
 			It("should print with yaml format", func() {
 				Expect(options.PrintObject(foo)).To(Succeed())
 				Expect(buf.String()).To(Equal(fmt.Sprintf(
-					`foo: %s
-bar:
+					`bar:
   baz: %s
+foo: %s
+
 `,
-					foo.Foo, foo.Bar.Baz)))
+					foo.Bar.Baz, foo.Foo)))
 			})
 		})
 

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
+	"sigs.k8s.io/yaml"
 
 	cmdconfig "github.com/gardener/gardenctl-v2/pkg/cmd/config"
 	"github.com/gardener/gardenctl-v2/pkg/config"

@@ -10,9 +10,6 @@ import (
 	"context"
 	"os"
 	"time"
-
-	operationsv1alpha1 "github.com/gardener/gardener/pkg/apis/operations/v1alpha1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func SetBastionAvailabilityChecker(f func(hostname string, privateKey []byte) error) {
@@ -46,6 +43,6 @@ func SetKeepAliveInterval(d time.Duration) {
 	keepAliveInterval = d
 }
 
-func SetWaitForSignal(f func(ctx context.Context, o *SSHOptions, shootClient client.Client, bastion *operationsv1alpha1.Bastion, nodeHostname string, nodePrivateKeyFiles []string, signalChan <-chan struct{}) error) {
+func SetWaitForSignal(f func(ctx context.Context, o *SSHOptions, signalChan <-chan struct{})) {
 	waitForSignal = f
 }