scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kubelet reports node related events with empty namespace for now.

Browse Source
This commit is contained in:
Dawn Chen
2015-03-26 16:30:23 -07:00
parent 9e5c0e3b3b
commit f662d7d11c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/validation/events.go
View File

@@ -25,7 +25,9 @@ import (
// ValidateEvent makes sure that the event makes sense. // ValidateEvent makes sure that the event makes sense.
func ValidateEvent(event *api.Event) errs.ValidationErrorList { func ValidateEvent(event *api.Event) errs.ValidationErrorList {
allErrs := errs.ValidationErrorList{} allErrs := errs.ValidationErrorList{}
if event.Namespace != event.InvolvedObject.Namespace { // TODO: There is no namespace required for minion
if event.InvolvedObject.Kind != "Node" &&
event.Namespace != event.InvolvedObject.Namespace {
allErrs = append(allErrs, errs.NewFieldInvalid("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace does not match involvedObject")) allErrs = append(allErrs, errs.NewFieldInvalid("involvedObject.namespace", event.InvolvedObject.Namespace, "namespace does not match involvedObject"))
} }
if !util.IsDNS1123Subdomain(event.Namespace) { if !util.IsDNS1123Subdomain(event.Namespace) {

5
pkg/kubelet/kubelet.go
View File

@@ -2131,11 +2131,12 @@ func (kl *Kubelet) BirthCry() {
// Make an event that kubelet restarted. // Make an event that kubelet restarted.
// TODO: get the real minion object of ourself, // TODO: get the real minion object of ourself,
// and use the real minion name and UID. // and use the real minion name and UID.
// TODO: what is namespace for node?
ref := &api.ObjectReference{ ref := &api.ObjectReference{
Kind: "Minion", Kind: "Node",
Name: kl.hostname, Name: kl.hostname,
UID: types.UID(kl.hostname), UID: types.UID(kl.hostname),
Namespace: api.NamespaceDefault, Namespace: "",
} }
kl.recorder.Eventf(ref, "starting", "Starting kubelet.") kl.recorder.Eventf(ref, "starting", "Starting kubelet.")
} }