@@ -4569,6 +4569,14 @@ _oadm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4620,6 +4628,14 @@ _oadm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4615,6 +4615,14 @@ _oc_adm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4665,6 +4673,14 @@ _oc_adm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4569,6 +4569,14 @@ _openshift_admin_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4620,6 +4628,14 @@ _openshift_admin_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -9168,6 +9184,14 @@ _openshift_cli_adm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -9219,6 +9243,14 @@ _openshift_cli_adm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -28387,6 +28419,14 @@ _openshift_kube_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -28478,6 +28518,14 @@ _openshift_kube_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4730,6 +4730,14 @@ _oadm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4781,6 +4789,14 @@ _oadm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4776,6 +4776,14 @@ _oc_adm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4826,6 +4834,14 @@ _oc_adm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4730,6 +4730,14 @@ _openshift_admin_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -4781,6 +4789,14 @@ _openshift_admin_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -9329,6 +9345,14 @@ _openshift_cli_adm_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -9380,6 +9404,14 @@ _openshift_cli_adm_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -28548,6 +28580,14 @@ _openshift_kube_top_node()

     flags_with_completion=()

     flags_completion=()

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -28639,6 +28679,14 @@ _openshift_kube_top_pod()

     local_nonpersistent_flags+=("--all-namespaces")

     flags+=("--containers")

     local_nonpersistent_flags+=("--containers")

+    flags+=("--heapster-namespace=")

+    local_nonpersistent_flags+=("--heapster-namespace=")

+    flags+=("--heapster-port=")

+    local_nonpersistent_flags+=("--heapster-port=")

+    flags+=("--heapster-scheme=")

+    local_nonpersistent_flags+=("--heapster-scheme=")

+    flags+=("--heapster-service=")

+    local_nonpersistent_flags+=("--heapster-service=")

     flags+=("--selector=")

     two_word_flags+=("-l")

     local_nonpersistent_flags+=("--selector=")

@@ -21,6 +21,22 @@ The top\-node command allows you to see the resource consumption of nodes.

 .SH OPTIONS

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -32,6 +32,22 @@ Due to the metrics pipeline delay, they may be unavailable for a few minutes sin

     If present, print usage of containers within a pod.

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -21,6 +21,22 @@ The top\-node command allows you to see the resource consumption of nodes.

 .SH OPTIONS

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -32,6 +32,22 @@ Due to the metrics pipeline delay, they may be unavailable for a few minutes sin

     If present, print usage of containers within a pod.

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -21,6 +21,22 @@ The top\-node command allows you to see the resource consumption of nodes.

 .SH OPTIONS

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -32,6 +32,22 @@ Due to the metrics pipeline delay, they may be unavailable for a few minutes sin

     If present, print usage of containers within a pod.

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -21,6 +21,22 @@ The top\-node command allows you to see the resource consumption of nodes.

 .SH OPTIONS

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -32,6 +32,22 @@ Due to the metrics pipeline delay, they may be unavailable for a few minutes sin

     If present, print usage of containers within a pod.

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -21,6 +21,22 @@ The top\-node command allows you to see the resource consumption of nodes.

 .SH OPTIONS

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -33,6 +33,22 @@ since pod creation.

     If present, print usage of containers within a pod.

 .PP

+\fB\-\-heapster\-namespace\fP="kube\-system"

+    Namespace Heapster service is located in

+

+.PP

+\fB\-\-heapster\-port\fP=""

+    Port name in service to use

+

+.PP

+\fB\-\-heapster\-scheme\fP="http"

+    Scheme (http or https) to connect to Heapster as

+

+.PP

+\fB\-\-heapster\-service\fP="heapster"

+    Name of Heapster service

+

+.PP

 \fB\-l\fP, \fB\-\-selector\fP=""

     Selector (label query) to filter on

@@ -25,16 +25,32 @@ import (

 	"github.com/renstrom/dedent"

 	"github.com/spf13/cobra"

+	"github.com/spf13/pflag"

 	"k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/labels"

 )

 // TopNodeOptions contains all the options for running the top-node cli command.

 type TopNodeOptions struct {

-	ResourceName string

-	Selector     string

-	Client       *metricsutil.HeapsterMetricsClient

-	Printer      *metricsutil.TopCmdPrinter

+	ResourceName    string

+	Selector        string

+	HeapsterOptions HeapsterTopOptions

+	Client          *metricsutil.HeapsterMetricsClient

+	Printer         *metricsutil.TopCmdPrinter

+}

+

+type HeapsterTopOptions struct {

+	Namespace string

+	Service   string

+	Scheme    string

+	Port      string

+}

+

+func (o *HeapsterTopOptions) Bind(flags *pflag.FlagSet) {

+	flags.StringVar(&o.Namespace, "heapster-namespace", metricsutil.DefaultHeapsterNamespace, "Namespace Heapster service is located in")

+	flags.StringVar(&o.Service, "heapster-service", metricsutil.DefaultHeapsterService, "Name of Heapster service")

+	flags.StringVar(&o.Scheme, "heapster-scheme", metricsutil.DefaultHeapsterScheme, "Scheme (http or https) to connect to Heapster as")

+	flags.StringVar(&o.Port, "heapster-port", metricsutil.DefaultHeapsterPort, "Port name in service to use")

 }

 var (

@@ -73,6 +89,7 @@ func NewCmdTopNode(f *cmdutil.Factory, out io.Writer) *cobra.Command {

 		Aliases: []string{"nodes"},

 	}

 	cmd.Flags().StringVarP(&options.Selector, "selector", "l", "", "Selector (label query) to filter on")

+	options.HeapsterOptions.Bind(cmd.Flags())

 	return cmd

 }

@@ -88,7 +105,7 @@ func (o *TopNodeOptions) Complete(f *cmdutil.Factory, cmd *cobra.Command, args [

 	if err != nil {

 		return err

 	}

-	o.Client = metricsutil.DefaultHeapsterMetricsClient(cli)

+	o.Client = metricsutil.NewHeapsterMetricsClient(cli, o.HeapsterOptions.Namespace, o.HeapsterOptions.Scheme, o.HeapsterOptions.Service, o.HeapsterOptions.Port)

 	o.Printer = metricsutil.NewTopCmdPrinter(out)

 	return nil

 }

@@ -38,6 +38,7 @@ type TopPodOptions struct {

 	Selector        string

 	AllNamespaces   bool

 	PrintContainers bool

+	HeapsterOptions HeapsterTopOptions

 	Client          *metricsutil.HeapsterMetricsClient

 	Printer         *metricsutil.TopCmdPrinter

 }

@@ -88,6 +89,7 @@ func NewCmdTopPod(f *cmdutil.Factory, out io.Writer) *cobra.Command {

 	cmd.Flags().StringVarP(&options.Selector, "selector", "l", "", "Selector (label query) to filter on")

 	cmd.Flags().BoolVar(&options.PrintContainers, "containers", false, "If present, print usage of containers within a pod.")

 	cmd.Flags().BoolVar(&options.AllNamespaces, "all-namespaces", false, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.")

+	options.HeapsterOptions.Bind(cmd.Flags())

 	return cmd

 }

@@ -107,7 +109,7 @@ func (o *TopPodOptions) Complete(f *cmdutil.Factory, cmd *cobra.Command, args []

 	if err != nil {

 		return err

 	}

-	o.Client = metricsutil.DefaultHeapsterMetricsClient(cli)

+	o.Client = metricsutil.NewHeapsterMetricsClient(cli, o.HeapsterOptions.Namespace, o.HeapsterOptions.Scheme, o.HeapsterOptions.Service, o.HeapsterOptions.Port)

 	o.Printer = metricsutil.NewTopCmdPrinter(out)

 	return nil

 }