Add support for a 'log' command to kubectl.

duda · Nov 3, 2014 · b0c5d3b · b0c5d3b
1 parent 808be2d
commit b0c5d3b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
@@ -67,6 +67,7 @@ Find more information at https://github.com/GoogleCloudPlatform/kubernetes.`,
 	cmds.AddCommand(NewCmdUpdate(out))
 	cmds.AddCommand(NewCmdDelete(out))
 	cmds.AddCommand(NewCmdNamespace(out))
+	cmds.AddCommand(NewCmdLog(out))
 
 	if err := cmds.Execute(); err != nil {
 		os.Exit(1)

diff --git a/pkg/kubectl/cmd/log.go b/pkg/kubectl/cmd/log.go
@@ -0,0 +1,51 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"io"
+)
+
+func NewCmdLog(out io.Writer) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "log <pod> <container>",
+		Short: "Print the logs for a container in a pod",
+		Run: func(cmd *cobra.Command, args []string) {
+			if len(args) != 2 {
+				usageError(cmd, "<pod> and <container> are required for log")
+			}
+			client := getKubeClient(cmd)
+			pod, err := client.Pods("default").Get(args[0])
+			checkErr(err)
+
+			data, err := client.RESTClient.Get().
+				Path("proxy/minions").
+				Path(pod.CurrentState.Host).
+				Path("containerLogs").
+				Path(getKubeNamespace(cmd)).
+				Path(args[0]).
+				Path(args[1]).
+				Do().
+				Raw()
+			checkErr(err)
+			out.Write(data)
+
+		},
+	}
+	return cmd
+}