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

Make objects in fed controller reconcilation function fully writable

Browse Source
This commit is contained in:
Marcin Wielgus
2016-11-08 00:07:06 +01:00
committed by Marcin
parent 15fa0df93e
commit f91b3feee4
10 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
federation/pkg/federation-controller/namespace/namespace_controller.go
View File

@@ -391,9 +391,10 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
nc.deliverNamespace(namespace, 0, true)
return
}
// The object should not be modified.
desiredNamespace := &api_v1.Namespace{
ObjectMeta: util.CopyObjectMeta(baseNamespace.ObjectMeta),
Spec: baseNamespace.Spec,
ObjectMeta: util.DeepCopyRelevantObjectMeta(baseNamespace.ObjectMeta),
Spec: util.DeepCopyApiTypeOrPanic(baseNamespace.Spec).(api_v1.NamespaceSpec),
}
glog.V(5).Infof("Desired namespace in underlying clusters: %+v", desiredNamespace)