Skip to content

K
k3s
Commit e2ccd5dc authored by Josh Horwitz's avatar Josh Horwitz Committed by Andrew Pryde
Browse files
Options

Changes the node cloud controller to use its name for events

parent 6f242f68
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
pkg/controller/cloud/node_controller.go
View file @ e2ccd5dc
...@@ -79,7 +79,7 @@ func NewCloudNodeController( ...@@ -79,7 +79,7 @@ func NewCloudNodeController(
nodeStatusUpdateFrequency time.Duration) *CloudNodeController { nodeStatusUpdateFrequency time.Duration) *CloudNodeController {
eventBroadcaster := record.NewBroadcaster() eventBroadcaster := record.NewBroadcaster()
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloudcontrollermanager"}) recorder := eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"})
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
if kubeClient != nil { if kubeClient != nil {
glog.V(0).Infof("Sending events to api server.") glog.V(0).Infof("Sending events to api server.")
......
pkg/controller/cloud/node_controller_test.go
View file @ e2ccd5dc
...@@ -227,7 +227,7 @@ func TestNodeDeleted(t *testing.T) { ...@@ -227,7 +227,7 @@ func TestNodeDeleted(t *testing.T) {
Err: nil, Err: nil,
}, },
nodeMonitorPeriod: 1 * time.Second, nodeMonitorPeriod: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -307,7 +307,7 @@ func TestNodeInitialized(t *testing.T) { ...@@ -307,7 +307,7 @@ func TestNodeInitialized(t *testing.T) {
nodeInformer: factory.Core().V1().Nodes(), nodeInformer: factory.Core().V1().Nodes(),
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 1 * time.Second, nodeMonitorPeriod: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -378,7 +378,7 @@ func TestNodeIgnored(t *testing.T) { ...@@ -378,7 +378,7 @@ func TestNodeIgnored(t *testing.T) {
nodeInformer: factory.Core().V1().Nodes(), nodeInformer: factory.Core().V1().Nodes(),
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -455,7 +455,7 @@ func TestGCECondition(t *testing.T) { ...@@ -455,7 +455,7 @@ func TestGCECondition(t *testing.T) {
nodeInformer: factory.Core().V1().Nodes(), nodeInformer: factory.Core().V1().Nodes(),
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 1 * time.Second, nodeMonitorPeriod: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -551,7 +551,7 @@ func TestZoneInitialized(t *testing.T) { ...@@ -551,7 +551,7 @@ func TestZoneInitialized(t *testing.T) {
nodeInformer: factory.Core().V1().Nodes(), nodeInformer: factory.Core().V1().Nodes(),
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -649,7 +649,7 @@ func TestNodeAddresses(t *testing.T) { ...@@ -649,7 +649,7 @@ func TestNodeAddresses(t *testing.T) {
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -769,7 +769,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) { ...@@ -769,7 +769,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) {
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -997,7 +997,7 @@ func TestNodeProviderID(t *testing.T) { ...@@ -997,7 +997,7 @@ func TestNodeProviderID(t *testing.T) {
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
...@@ -1085,7 +1085,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) { ...@@ -1085,7 +1085,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) {
cloud: fakeCloud, cloud: fakeCloud,
nodeMonitorPeriod: 5 * time.Second, nodeMonitorPeriod: 5 * time.Second,
nodeStatusUpdateFrequency: 1 * time.Second, nodeStatusUpdateFrequency: 1 * time.Second,
recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-controller-manager"}), recorder: eventBroadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cloud-node-controller"}),
} }
eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartLogging(glog.Infof)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment