@@ -61,6 +61,9 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo

 	latestDeploymentName := deployutil.LatestDeploymentNameForConfig(config)

 	deployment, err := c.changeStrategy.getDeployment(config.Namespace, latestDeploymentName)

 	if err != nil {

+		// If there's no deployment for the latest config, we have no basis of

+		// comparison. It's the responsibility of the deployment config controller

+		// to make the deployment for the config, so return early.

 		if kerrors.IsNotFound(err) {

 			glog.V(2).Infof("Ignoring change for DeploymentConfig %s; no existing Deployment found", deployutil.LabelForDeploymentConfig(config))

 			return nil

@@ -73,7 +76,8 @@ func (c *DeploymentConfigChangeController) Handle(config *deployapi.DeploymentCo

 		return fatalError(fmt.Sprintf("error decoding DeploymentConfig from Deployment %s for DeploymentConfig %s: %v", deployutil.LabelForDeployment(deployment), deployutil.LabelForDeploymentConfig(config), err))

 	}

-	if deployutil.PodSpecsEqual(config.Template.ControllerTemplate.Template.Spec, deployedConfig.Template.ControllerTemplate.Template.Spec) {

+	newSpec, oldSpec := config.Template.ControllerTemplate.Template.Spec, deployedConfig.Template.ControllerTemplate.Template.Spec

+	if kapi.Semantic.DeepEqual(oldSpec, newSpec) {

 		glog.V(2).Infof("Ignoring DeploymentConfig change for %s (latestVersion=%d); same as Deployment %s", deployutil.LabelForDeploymentConfig(config), config.LatestVersion, deployutil.LabelForDeployment(deployment))

 		return nil

 	}

@@ -7,7 +7,6 @@ import (

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

-	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

 func TestGeneration(t *testing.T) {

@@ -110,5 +109,6 @@ func hasReplicationMetaDiff(a, b *deployapi.DeploymentConfig) bool {

 }

 func hasPodTemplateDiff(a, b *deployapi.DeploymentConfig) bool {

-	return !deployutil.PodSpecsEqual(a.Template.ControllerTemplate.Template.Spec, b.Template.ControllerTemplate.Template.Spec)

+	specA, specB := a.Template.ControllerTemplate.Template.Spec, b.Template.ControllerTemplate.Template.Spec

+	return !kapi.Semantic.DeepEqual(specA, specB)

 }

@@ -1,14 +1,10 @@

 package util

 import (

-	"encoding/json"

 	"fmt"

-	"hash/adler32"

 	"strconv"

 	"strings"

-	"github.com/golang/glog"

-

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

@@ -76,30 +72,6 @@ func LabelForDeploymentConfig(config *deployapi.DeploymentConfig) string {

 	return fmt.Sprintf("%s/%s:%d", config.Namespace, config.Name, config.LatestVersion)

 }

-// HashPodSpec hashes a PodSpec into a uint64.

-// TODO: Resources are currently ignored due to the formats not surviving encoding/decoding

-// in a consistent manner (e.g. 0 is represented sometimes as 0.000)

-func HashPodSpec(t api.PodSpec) uint64 {

-	// Ignore resources by making them uniformly empty

-	for i := range t.Containers {

-		t.Containers[i].Resources = api.ResourceRequirements{}

-	}

-

-	jsonString, err := json.Marshal(t)

-	if err != nil {

-		glog.Errorf("An error occurred marshalling pod state: %v", err)

-		return 0

-	}

-	hash := adler32.New()

-	fmt.Fprintf(hash, "%s", jsonString)

-	return uint64(hash.Sum32())

-}

-

-// PodSpecsEqual returns true if the given PodSpecs are the same.

-func PodSpecsEqual(a, b api.PodSpec) bool {

-	return HashPodSpec(a) == HashPodSpec(b)

-}

-

 // DecodeDeploymentConfig decodes a DeploymentConfig from controller using codec. An error is returned

 // if the controller doesn't contain an encoded config.

 func DecodeDeploymentConfig(controller *api.ReplicationController, codec runtime.Codec) (*deployapi.DeploymentConfig, error) {

@@ -57,38 +57,6 @@ func TestPodName(t *testing.T) {

 	}

 }

-func TestPodSpecsEqualTrue(t *testing.T) {

-	result := PodSpecsEqual(podTemplateA().Spec, podTemplateA().Spec)

-

-	if !result {

-		t.Fatalf("Unexpected false result for PodSpecsEqual")

-	}

-}

-

-func TestPodSpecsJustLabelDiff(t *testing.T) {

-	result := PodSpecsEqual(podTemplateA().Spec, podTemplateB().Spec)

-

-	if !result {

-		t.Fatalf("Unexpected false result for PodSpecsEqual")

-	}

-}

-

-func TestPodSpecsEqualContainerImageChange(t *testing.T) {

-	result := PodSpecsEqual(podTemplateA().Spec, podTemplateC().Spec)

-

-	if result {

-		t.Fatalf("Unexpected true result for PodSpecsEqual")

-	}

-}

-

-func TestPodSpecsEqualAdditionalContainerInManifest(t *testing.T) {

-	result := PodSpecsEqual(podTemplateA().Spec, podTemplateD().Spec)

-

-	if result {

-		t.Fatalf("Unexpected true result for PodSpecsEqual")

-	}

-}

-

 func TestMakeDeploymentOk(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

 	deployment, err := MakeDeployment(config, kapi.Codec)