Merge pull request #1005 from yeya24/same-port

v2: change metrics port to 8080, telemetry port to 8081

README.md

@@ -18,7 +18,7 @@ Kubernetes API, this way users have all the data they require and perform
 heuristics as they see fit.
 
 The metrics are exported on the HTTP endpoint `/metrics` on the listening port
-(default 80). They are served as plaintext. They are designed to be consumed
+(default 8080). They are served as plaintext. They are designed to be consumed
 either by Prometheus itself or by a scraper that is compatible with scraping a
 Prometheus client endpoint. You can also open `/metrics` in a browser to see
 the raw metrics.

docs/cli-arguments.md

@@ -45,13 +45,13 @@ Usage of ./kube-state-metrics:
       --namespace string                            Comma-separated list of namespaces to be enabled. Defaults to ""
       --pod string                                  Name of the pod that contains the kube-state-metrics container. When set, it is expected that --pod and --pod-namespace are both set. Most likely this should be passed via the downward API. This is used for auto-detecting sharding. If set, this has preference over statically configured sharding. This is experimental, it may be removed without notice.
       --pod-namespace string                        Name of the namespace of the pod specified by --pod. When set, it is expected that --pod and --pod-namespace are both set. Most likely this should be passed via the downward API. This is used for auto-detecting sharding. If set, this has preference over statically configured sharding. This is experimental, it may be removed without notice.
-      --port int                                    Port to expose metrics on. (default 80)
+      --port int                                    Port to expose metrics on. (default 8080)
       --shard int32                                 The instances shard nominal (zero indexed) within the total number of shards. (default 0)
       --skip_headers                                If true, avoid header prefixes in the log messages
       --skip_log_headers                            If true, avoid headers when opening log files
       --stderrthreshold severity                    logs at or above this threshold go to stderr (default 2)
       --telemetry-host string                       Host to expose kube-state-metrics self metrics on. (default "0.0.0.0")
-      --telemetry-port int                          Port to expose kube-state-metrics self metrics on. (default 81)
+      --telemetry-port int                          Port to expose kube-state-metrics self metrics on. (default 8081)
       --total-shards int                            The total number of shards. Sharding is disabled when total shards is set to 1. (default 1)
   -v, --v Level                                     number for the log level verbosity
       --version                                     kube-state-metrics build version information

pkg/options/options.go

@@ -80,9 +80,9 @@ func (o *Options) AddFlags() {
 	o.flags.StringVar(&o.Apiserver, "apiserver", "", `The URL of the apiserver to use as a master`)
 	o.flags.StringVar(&o.Kubeconfig, "kubeconfig", "", "Absolute path to the kubeconfig file")
 	o.flags.BoolVarP(&o.Help, "help", "h", false, "Print Help text")
-	o.flags.IntVar(&o.Port, "port", 80, `Port to expose metrics on.`)
+	o.flags.IntVar(&o.Port, "port", 8080, `Port to expose metrics on.`)
 	o.flags.StringVar(&o.Host, "host", "0.0.0.0", `Host to expose metrics on.`)
-	o.flags.IntVar(&o.TelemetryPort, "telemetry-port", 81, `Port to expose kube-state-metrics self metrics on.`)
+	o.flags.IntVar(&o.TelemetryPort, "telemetry-port", 8081, `Port to expose kube-state-metrics self metrics on.`)
 	o.flags.StringVar(&o.TelemetryHost, "telemetry-host", "0.0.0.0", `Host to expose kube-state-metrics self metrics on.`)
 	o.flags.Var(&o.Collectors, "collectors", fmt.Sprintf("Comma-separated list of collectors to be enabled. Defaults to %q", &DefaultCollectors))
 	o.flags.Var(&o.Namespaces, "namespace", fmt.Sprintf("Comma-separated list of namespaces to be enabled. Defaults to %q", &DefaultNamespaces))