Skip to content

Commit

Permalink
Merge pull request #56 from smarterclayton/port
Browse files Browse the repository at this point in the history
metrics: Default metrics port conflicts with node-exporter
  • Loading branch information
openshift-merge-robot authored Nov 20, 2018
2 parents 60b6450 + 0bb98c9 commit 10d0edb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var (

func init() {
rootCmd.AddCommand(startCmd)
startCmd.PersistentFlags().StringVar(&startOpts.listenAddr, "listen", "0.0.0.0:9101", "Address to listen on for metrics")
startCmd.PersistentFlags().StringVar(&startOpts.listenAddr, "listen", "0.0.0.0:9099", "Address to listen on for metrics")
startCmd.PersistentFlags().StringVar(&startOpts.kubeconfig, "kubeconfig", "", "Kubeconfig file to access a remote cluster (testing only)")
startCmd.PersistentFlags().StringVar(&startOpts.nodeName, "node-name", "", "kubernetes node name CVO is scheduled on.")
startCmd.PersistentFlags().BoolVar(&startOpts.enableAutoUpdate, "enable-auto-update", true, "Enables the autoupdate controller.")
Expand Down Expand Up @@ -234,9 +234,9 @@ func createControllerContext(cb *clientBuilder, stop <-chan struct{}) *controlle
InformerFactory: sharedInformers,
KubeInformerFactory: kubeSharedInformer,
APIExtInformerFactory: apiExtSharedInformer,
Stop: stop,
InformersStarted: make(chan struct{}),
ResyncPeriod: resyncPeriod(),
Stop: stop,
InformersStarted: make(chan struct{}),
ResyncPeriod: resyncPeriod(),
}
}

Expand Down
2 changes: 1 addition & 1 deletion install/0001_00_cluster-version-operator_03_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ spec:
k8s-app: cluster-version-operator
ports:
- name: metrics
port: 9101 # chosen to be in the internal open range
port: 9099 # chosen to be in the internal open range

0 comments on commit 10d0edb

Please sign in to comment.