Skip to content

Namespace flag #316

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

Merged
openshift-merge-robot merged 2 commits into from
May 15, 2019
Merged

Namespace flag #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3a07f4
Add namespace flag for nodelink controller
enxebre May 15, 2019
e83e21a
Add namespace flag for machine healthcheck
enxebre May 15, 2019
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
10 changes: 9 additions & 1 deletion cmd/machine-healthcheck/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"flag"
"runtime"

"k8s.io/klog"

"github.com/golang/glog"
mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
"github.com/openshift/machine-api-operator/pkg/apis/healthchecking/v1alpha1"
Expand All @@ -22,6 +24,7 @@ func printVersion() {
}

func main() {
watchNamespace := flag.String("namespace", "", "Namespace that the controller watches to reconcile machine-api objects. If unspecified, the controller watches for machine-api objects across all namespaces.")
flag.Parse()
printVersion()

Expand All @@ -31,8 +34,13 @@ func main() {
glog.Fatal(err)
}

opts := manager.Options{}
if *watchNamespace != "" {
opts.Namespace = *watchNamespace
klog.Infof("Watching machine-api objects only in namespace %q for reconciliation.", opts.Namespace)
}
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{})
mgr, err := manager.New(cfg, opts)
if err != nil {
glog.Fatal(err)
}
Expand Down
15 changes: 14 additions & 1 deletion cmd/nodelink-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ var (
func main() {

pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
watchNamespace := pflag.String("namespace", "", "Namespace that the controller watches to reconcile machine-api objects. If unspecified, the controller watches for machine-api objects across all namespaces.")
pflag.Parse()

config, err := config.GetConfig()
Expand All @@ -453,7 +454,19 @@ func main() {

// TODO(jchaloup): set the resync period reasonably
kubeSharedInformers := kubeinformers.NewSharedInformerFactory(kubeClient, 5*time.Second)
mapiInformers := mapiinformersfactory.NewSharedInformerFactory(client, 5*time.Second)

var mapiInformers mapiinformersfactory.SharedInformerFactory
if *watchNamespace != "" {
glog.Infof("Watching machine-api objects only in namespace %q for reconciliation.", *watchNamespace)
mapiInformers = mapiinformersfactory.NewSharedInformerFactoryWithOptions(
client,
5*time.Second,
mapiinformersfactory.WithNamespace(*watchNamespace))
} else {
mapiInformers = mapiinformersfactory.NewSharedInformerFactory(
client,
5*time.Second)
}

ctrl := NewController(
kubeSharedInformers.Core().V1().Nodes(),
Expand Down