github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-30 23:14:30 +00:00
Code Issues Projects Releases Wiki Activity

Pass addressable values to DeepCopy

Browse Source
This commit is contained in:
Jordan Liggitt
2016-12-04 15:51:44 -05:00
parent 8f11cc78a8
commit 6819706adf
46 changed files with 89 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ import (
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
"k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/watch"
@@ -338,7 +337,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
}
// Create a copy before modifying the namespace to prevent race condition with
// other readers of namespace from store.
namespaceObj, err := conversion.NewCloner().DeepCopy(namespaceObjFromStore)
namespaceObj, err := api.Scheme.DeepCopy(namespaceObjFromStore)
baseNamespace, ok := namespaceObj.(*apiv1.Namespace)
if err != nil || !ok {
glog.Errorf("Error in retrieving obj from store: %v, %v", ok, err)
@@ -390,7 +389,7 @@ func (nc *NamespaceController) reconcileNamespace(namespace string) {
// The object should not be modified.
desiredNamespace := &apiv1.Namespace{
ObjectMeta: util.DeepCopyRelevantObjectMeta(baseNamespace.ObjectMeta),
Spec: util.DeepCopyApiTypeOrPanic(baseNamespace.Spec).(apiv1.NamespaceSpec),
Spec: *(util.DeepCopyApiTypeOrPanic(&baseNamespace.Spec).(*apiv1.NamespaceSpec)),
}
glog.V(5).Infof("Desired namespace in underlying clusters: %+v", desiredNamespace)