Merge pull request #17444 from mfojtik/fix-deep-copy

Automatic merge from submit-queue.

Switch to use .DeepCopy() instead of kapi.Scheme.DeepCopy()

The later will not work in k8s 1.9 (@sttts to confirm). The first commit is just mechanical update.
The second commit is needed because image trigger controller used DeepCopy on interface{}.

@smarterclayton I switched that to be `runtime.Object` and nothing seems to be complaining. PTAL.

Author: openshift-merge-robot

pkg/apps/controller/deployer/deployer_controller.go

@@ -490,16 +490,7 @@ func (c *DeploymentController) setDeployerPodsOwnerRef(deployment *v1.Replicatio
 			continue
 		}
 		glog.V(4).Infof("setting ownerRef for pod %s/%s to deployment %s/%s", pod.Namespace, pod.Name, deployment.Namespace, deployment.Name)
-		objCopy, err := kapi.Scheme.DeepCopy(pod)
-		if err != nil {
-			errors = append(errors, err)
-			continue
-		}
-		newPod, ok := objCopy.(*v1.Pod)
-		if !ok {
-			errors = append(errors, fmt.Errorf("object %#+v is not a pod", objCopy))
-			continue
-		}
+		newPod := pod.DeepCopy()
 		newPod.SetOwnerReferences([]metav1.OwnerReference{{
 			APIVersion: "v1",
 			Name:       deployment.Name,

pkg/apps/strategy/support/lifecycle.go

@@ -381,20 +381,8 @@ func makeHookPod(hook *deployapi.LifecycleHook, rc *kapi.ReplicationController,
 	}
 
 	gracePeriod := int64(10)
-
-	var podSecurityContextCopy *kapi.PodSecurityContext
-	if ctx, err := kapi.Scheme.DeepCopy(rc.Spec.Template.Spec.SecurityContext); err != nil {
-		return nil, fmt.Errorf("unable to copy pod securityContext: %v", err)
-	} else {
-		podSecurityContextCopy = ctx.(*kapi.PodSecurityContext)
-	}
-
-	var securityContextCopy *kapi.SecurityContext
-	if ctx, err := kapi.Scheme.DeepCopy(baseContainer.SecurityContext); err != nil {
-		return nil, fmt.Errorf("unable to copy securityContext: %v", err)
-	} else {
-		securityContextCopy = ctx.(*kapi.SecurityContext)
-	}
+	podSecurityContextCopy := rc.Spec.Template.Spec.SecurityContext.DeepCopy()
+	securityContextCopy := baseContainer.SecurityContext.DeepCopy()
 
 	pod := &kapi.Pod{
 		ObjectMeta: metav1.ObjectMeta{

pkg/apps/strategy/support/lifecycle_test.go

@@ -109,8 +109,7 @@ func TestHookExecutor_executeExecNewPodSucceeded(t *testing.T) {
 	go func() {
 		<-podCreated
 		podsWatch.Add(createdPod)
-		podCopy, _ := kapi.Scheme.Copy(createdPod)
-		updatedPod := podCopy.(*kapi.Pod)
+		updatedPod := createdPod.DeepCopy()
 		updatedPod.Status.Phase = kapi.PodSucceeded
 		podsWatch.Modify(updatedPod)
 	}()
@@ -175,8 +174,7 @@ func TestHookExecutor_executeExecNewPodFailed(t *testing.T) {
 	go func() {
 		<-podCreated
 		podsWatch.Add(createdPod)
-		podCopy, _ := kapi.Scheme.Copy(createdPod)
-		updatedPod := podCopy.(*kapi.Pod)
+		updatedPod := createdPod.DeepCopy()
 		updatedPod.Status.Phase = kapi.PodFailed
 		podsWatch.Modify(updatedPod)
 	}()

pkg/authorization/rulevalidation/compact_rules_test.go

@@ -7,7 +7,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
-	kapi "k8s.io/kubernetes/pkg/api"
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 )
@@ -106,10 +105,9 @@ func TestCompactRules(t *testing.T) {
 
 	for k, tc := range testcases {
 		rules := tc.Rules
-		originalRules, err := kapi.Scheme.DeepCopy(tc.Rules)
-		if err != nil {
-			t.Errorf("%s: couldn't copy rules: %v", k, err)
-			continue
+		originalRules := make([]authorizationapi.PolicyRule, len(tc.Rules))
+		for i, r := range tc.Rules {
+			r.DeepCopyInto(&originalRules[i])
 		}
 		compacted, err := CompactRules(tc.Rules)
 		if err != nil {

pkg/build/apis/build/validation/validation.go

@@ -44,11 +44,7 @@ func ValidateBuildUpdate(build *buildapi.Build, older *buildapi.Build) field.Err
 	}
 
 	// lie about the old build's pushsecret value so we can allow it to be updated.
-	olderCopy, err := buildutil.BuildDeepCopy(older)
-	if err != nil {
-		glog.V(2).Infof("Error copying build for update validation: %v", err)
-		allErrs = append(allErrs, field.InternalError(field.NewPath(""), fmt.Errorf("Unable to copy build for update validation: %v", err)))
-	}
+	olderCopy := older.DeepCopy()
 	olderCopy.Spec.Output.PushSecret = build.Spec.Output.PushSecret
 
 	if !kapihelper.Semantic.DeepEqual(build.Spec, olderCopy.Spec) {

pkg/build/controller/build/build_controller.go

@@ -748,10 +748,9 @@ func (bc *BuildController) createBuildPod(build *buildapi.Build) (*buildUpdate,
 
 	// image reference resolution requires a copy of the build
 	var err error
-	build, err = buildutil.BuildDeepCopy(build)
-	if err != nil {
-		return nil, fmt.Errorf("unable to copy build %s: %v", buildDesc(build), err)
-	}
+
+	// TODO: Rename this to buildCopy
+	build = build.DeepCopy()
 
 	// Resolve all Docker image references to valid values.
 	if err := bc.resolveImageReferences(build, update); err != nil {
@@ -1085,10 +1084,7 @@ func (bc *BuildController) handleBuildConfig(bcNamespace string, bcName string)
 // and applies that patch using the REST client
 func (bc *BuildController) patchBuild(build *buildapi.Build, update *buildUpdate) (*buildapi.Build, error) {
 	// Create a patch using the buildUpdate object
-	updatedBuild, err := buildutil.BuildDeepCopy(build)
-	if err != nil {
-		return nil, fmt.Errorf("cannot create a deep copy of build %s: %v", buildDesc(build), err)
-	}
+	updatedBuild := build.DeepCopy()
 	update.apply(updatedBuild)
 
 	patch, err := validation.CreateBuildPatch(build, updatedBuild)

pkg/build/controller/build/build_controller_test.go

@@ -371,10 +371,7 @@ func TestHandleBuild(t *testing.T) {
 					t.Errorf("%s: did not get an update. Expected: %v", tc.name, tc.expectUpdate)
 					return
 				}
-				expectedBuild, err := buildutil.BuildDeepCopy(tc.build)
-				if err != nil {
-					t.Fatalf("unexpected: %v", err)
-				}
+				expectedBuild := tc.build.DeepCopy()
 				tc.expectUpdate.apply(expectedBuild)
 
 				// For start/completion/duration fields, simply validate that they are set/not set

pkg/build/controller/policy/policy.go

@@ -3,8 +3,6 @@ package policy
 import (
 	"github.com/golang/glog"
 
-	kapi "k8s.io/kubernetes/pkg/api"
-
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildclient "github.com/openshift/origin/pkg/build/client"
 	buildlister "github.com/openshift/origin/pkg/build/generated/listers/build/internalversion"
@@ -107,11 +105,3 @@ func GetNextConfigBuild(lister buildlister.BuildLister, namespace, buildConfigNa
 	}
 	return nextBuilds, hasRunningBuilds, nil
 }
-
-func copyOrDie(build *buildapi.Build) *buildapi.Build {
-	obj, err := kapi.Scheme.Copy(build)
-	if err != nil {
-		panic(err)
-	}
-	return obj.(*buildapi.Build)
-}

pkg/build/controller/policy/serial_latest_only.go

@@ -80,7 +80,7 @@ func (s *SerialLatestOnlyPolicy) cancelPreviousBuilds(build *buildapi.Build) []e
 	var result = []error{}
 	for _, b := range builds {
 		err := wait.Poll(500*time.Millisecond, 5*time.Second, func() (bool, error) {
-			b = copyOrDie(b)
+			b = b.DeepCopy()
 			b.Status.Cancelled = true
 			err := s.BuildUpdater.Update(b.Namespace, b)
 			if err != nil && errors.IsConflict(err) {

pkg/build/generator/generator.go

@@ -458,8 +458,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx apirequest.Context, bc *bui
 	// Need to copy the buildConfig here so that it doesn't share pointers with
 	// the build object which could be (will be) modified later.
 	buildName := getNextBuildName(bc)
-	obj, _ := kapi.Scheme.Copy(bc)
-	bcCopy := obj.(*buildapi.BuildConfig)
+	bcCopy := bc.DeepCopy()
 	serviceAccount := getServiceAccount(bcCopy, g.DefaultServiceAccountName)
 	t := true
 	build := &buildapi.Build{
@@ -791,8 +790,7 @@ func UpdateCustomImageEnv(strategy *buildapi.CustomBuildStrategy, newImage strin
 
 // generateBuildFromBuild creates a new build based on a given Build.
 func generateBuildFromBuild(build *buildapi.Build, buildConfig *buildapi.BuildConfig) *buildapi.Build {
-	obj, _ := kapi.Scheme.Copy(build)
-	buildCopy := obj.(*buildapi.Build)
+	buildCopy := build.DeepCopy()
 
 	newBuild := &buildapi.Build{
 		Spec: buildCopy.Spec,