Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port commit '8168f74afc2508e5b10fba5fc4eb1c69e89c32e4' to the new controller main.go #349

Merged
merged 1 commit into from
Jun 15, 2018
Merged

Port commit '8168f74afc2508e5b10fba5fc4eb1c69e89c32e4' to the new controller main.go #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cloud/google/cmd/gce-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"sigs.k8s.io/cluster-api/cloud/google/cmd/gce-controller/machine-controller-app"
machineoptions "sigs.k8s.io/cluster-api/cloud/google/cmd/gce-controller/machine-controller-app/options"
"sigs.k8s.io/cluster-api/pkg/controller/config"
"flag"
)

func main() {
Expand All @@ -34,6 +35,8 @@ func main() {
fs.StringVar(&controllerType, "controller", controllerType, "specify whether this should run the machine or cluster controller")
fs.StringVar(&machineSetupConfigsPath, "machinesetup", machineSetupConfigsPath, "path to machine setup configs file")
config.ControllerConfig.AddFlags(pflag.CommandLine)
// the following line exists to make glog happy, for more information, see: https://github.com/kubernetes/kubernetes/issues/17162
flag.CommandLine.Parse([]string{})
pflag.Parse()

logs.InitLogs()
Expand Down