upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 01:41:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

createPod should copy the labels, not edit them in place

Browse source
This commit is contained in:
Clayton Coleman 2014-10-23 16:55:12 -04:00
parent 2475eb06cb
commit 1ffc82dfe6
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/controller/replication_controller.go
View file

@ -53,18 +53,20 @@ type RealPodControl struct {
}
func (r RealPodControl) createReplica(ctx api.Context, controllerSpec api.ReplicationController) {
labels := controllerSpec.DesiredState.PodTemplate.Labels
// TODO: don't fail to set this label just because the map isn't created.
if labels != nil {
labels["replicationController"] = controllerSpec.Name
desiredLabels := make(labels.Set)
for k, v := range controllerSpec.DesiredState.PodTemplate.Labels {
desiredLabels[k] = v
}
desiredLabels["replicationController"] = controllerSpec.Name
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
Labels: desiredLabels,
},
DesiredState: controllerSpec.DesiredState.PodTemplate.DesiredState,
Labels: controllerSpec.DesiredState.PodTemplate.Labels,
}
_, err := r.kubeClient.CreatePod(ctx, pod)
if err != nil {
glog.Errorf("%#v\n", err)
if _, err := r.kubeClient.CreatePod(ctx, pod); err != nil {
glog.Errorf("Unable to create pod replica: %v", err)
}
}