From a0c9d126e416f8b6822c8cc7e732b6e4766124dd Mon Sep 17 00:00:00 2001 From: Zhao Yuwei Date: Thu, 27 Dec 2018 10:52:34 +0800 Subject: [PATCH 1/2] Fix a test file log error --- staging/src/k8s.io/client-go/rest/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/client-go/rest/config_test.go b/staging/src/k8s.io/client-go/rest/config_test.go index 22c18d77ed4..65dc394a552 100644 --- a/staging/src/k8s.io/client-go/rest/config_test.go +++ b/staging/src/k8s.io/client-go/rest/config_test.go @@ -287,7 +287,7 @@ func TestAnonymousConfig(t *testing.T) { _, actualError := actual.Dial(context.Background(), "", "") _, expectedError := expected.Dial(context.Background(), "", "") if !reflect.DeepEqual(expectedError, actualError) { - t.Fatalf("CopyConfig dropped the Dial field") + t.Fatalf("AnonymousClientConfig dropped the Dial field") } } else { actual.Dial = nil From 1a2b4fb60ff14f82d4aa514c8e957e30901a3b2f Mon Sep 17 00:00:00 2001 From: Zhao Yuwei Date: Wed, 16 Jan 2019 17:00:10 +0800 Subject: [PATCH 2/2] word Signed-off-by: Zhao Yuwei --- pkg/kubectl/cmd/logs/logs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index 5f8f3162b19..1a5aa5d6865 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -140,7 +140,7 @@ func NewCmdLogs(f cmdutil.Factory, streams genericclioptions.IOStreams) *cobra.C }, Aliases: []string{"log"}, } - cmd.Flags().BoolVar(&o.AllContainers, "all-containers", o.AllContainers, "Get all containers's logs in the pod(s).") + cmd.Flags().BoolVar(&o.AllContainers, "all-containers", o.AllContainers, "Get all containers' logs in the pod(s).") cmd.Flags().BoolVarP(&o.Follow, "follow", "f", o.Follow, "Specify if the logs should be streamed.") cmd.Flags().BoolVar(&o.Timestamps, "timestamps", o.Timestamps, "Include timestamps on each line in the log output") cmd.Flags().Int64Var(&o.LimitBytes, "limit-bytes", o.LimitBytes, "Maximum bytes of logs to return. Defaults to no limit.")