apps: switch back to comparing encoded template config instead of com…

…paring rc template

pkg/apps/controller/deploymentconfig/deploymentconfig_controller.go

@@ -134,7 +134,7 @@ func (c *DeploymentConfigController) Handle(config *deployapi.DeploymentConfig)
 		glog.Errorf("Unable to copy deployment config: %v", err)
 		return c.updateStatus(config, existingDeployments)
 	}
-	shouldTrigger, shouldSkip := triggerActivated(configCopy, latestIsDeployed, latestDeployment)
+	shouldTrigger, shouldSkip := triggerActivated(configCopy, latestIsDeployed, latestDeployment, c.codec)
 	if !shouldSkip && shouldTrigger {
 		configCopy.Status.LatestVersion++
 		return c.updateStatus(configCopy, existingDeployments)
@@ -544,7 +544,7 @@ func (c *DeploymentConfigController) cleanupOldDeployments(existingDeployments [
 // triggers were activated (config change or image change). The first bool indicates that
 // the triggers are active and second indicates if we should skip the rollout because we
 // are waiting for the trigger to complete update (waiting for image for example).
-func triggerActivated(config *deployapi.DeploymentConfig, latestIsDeployed bool, latestDeployment *v1.ReplicationController) (bool, bool) {
+func triggerActivated(config *deployapi.DeploymentConfig, latestIsDeployed bool, latestDeployment *v1.ReplicationController, codec runtime.Codec) (bool, bool) {
 	if config.Spec.Paused {
 		return false, false
 	}
@@ -601,7 +601,7 @@ func triggerActivated(config *deployapi.DeploymentConfig, latestIsDeployed bool,
 	}
 
 	if configTrigger {
-		isLatest, changes, err := deployutil.HasLatestPodTemplate(config, latestDeployment)
+		isLatest, changes, err := deployutil.HasLatestPodTemplate(config, latestDeployment, codec)
 		if err != nil {
 			glog.Errorf("Error while checking for latest pod template in replication controller: %v", err)
 			return false, true

pkg/apps/util/util.go

@@ -32,19 +32,6 @@ var (
 	// deployment config. This is used in the ownerRef and GC client picks the appropriate
 	// client to get the deployment config.
 	DeploymentConfigControllerRefKind = deployapiv1.SchemeGroupVersion.WithKind("DeploymentConfig")
-
-	// annotationsToSkip is list of replication controller pod template annotations we skip
-	annotationsToSkip = sets.NewString(
-		deployapi.DeploymentVersionAnnotation,
-		deployapi.DeploymentConfigAnnotation,
-		deployapi.DeploymentAnnotation,
-	)
-
-	// labelsToSkip is list of replication controller pod template labels we skip
-	labelsToSkip = sets.NewString(
-		deployapi.DeploymentLabel,
-		deployapi.DeploymentConfigLabel,
-	)
 )
 
 // NewDeploymentCondition creates a new deployment condition.
@@ -358,20 +345,26 @@ func CopyPodTemplateSpecToV1PodTemplateSpec(spec *api.PodTemplateSpec) *v1.PodTe
 	return out
 }
 
-// HasLatestPodTemplate checks if the provided replication controller has the latest
-// deployment config pod template. If not it will return false and the string diff.
-func HasLatestPodTemplate(dc *deployapi.DeploymentConfig, rc *v1.ReplicationController) (bool, string, error) {
-	configTemplate := CopyPodTemplateSpecToV1PodTemplateSpec(dc.Spec.Template)
-	configTemplate = filterOutTemplateAnnotationsAndLabels(configTemplate)
-	rcCopy, err := DeploymentDeepCopyV1(rc)
+// HasLatestPodTemplate checks for differences between current deployment config
+// template and deployment config template encoded in the latest replication
+// controller. If they are different it will return an string diff containing
+// the change.
+func HasLatestPodTemplate(currentConfig *deployapi.DeploymentConfig, rc *v1.ReplicationController, codec runtime.Codec) (bool, string, error) {
+	latestConfig, err := DecodeDeploymentConfig(rc, codec)
 	if err != nil {
 		return true, "", err
 	}
-	rcTemplate := filterOutTemplateAnnotationsAndLabels(rcCopy.Spec.Template)
-	if reflect.DeepEqual(configTemplate, rcTemplate) {
+	// The latestConfig represents an encoded DC in the latest deployment (RC).
+	// TODO: This diverges from the upstream behavior where we compare deployment
+	// template vs. replicaset template. Doing that will disallow any
+	// modifications to the RC the deployment config controller create and manage
+	// as a change to the RC will cause the DC to be reconciled and ultimately
+	// trigger a new rollout because of skew between latest RC template and DC
+	// template.
+	if reflect.DeepEqual(currentConfig.Spec.Template, latestConfig.Spec.Template) {
 		return true, "", nil
 	}
-	return false, diff.ObjectReflectDiff(configTemplate, rcTemplate), nil
+	return false, diff.ObjectReflectDiff(currentConfig.Spec.Template, latestConfig.Spec.Template), nil
 }
 
 // HasUpdatedImages indicates if the deployment configuration images were updated.
@@ -392,29 +385,6 @@ func HasUpdatedImages(dc *deployapi.DeploymentConfig, rc *v1.ReplicationControll
 	return true, updatedImages
 }
 
-// filterOutTemplateAnnotationsAndLabels filters out annotations and labels we skip when
-// comparing replication controller template with deployment config template.
-func filterOutTemplateAnnotationsAndLabels(in *v1.PodTemplateSpec) *v1.PodTemplateSpec {
-	out := *in
-	out.Annotations = map[string]string{}
-	out.Labels = map[string]string{}
-	if in.Annotations != nil {
-		for k, v := range in.Annotations {
-			if !annotationsToSkip.Has(k) {
-				out.Annotations[k] = v
-			}
-		}
-	}
-	if in.Labels != nil {
-		for k, v := range in.Labels {
-			if !labelsToSkip.Has(k) {
-				out.Labels[k] = v
-			}
-		}
-	}
-	return &out
-}
-
 // DecodeDeploymentConfig decodes a DeploymentConfig from controller using codec. An error is returned
 // if the controller doesn't contain an encoded config.
 func DecodeDeploymentConfig(controller runtime.Object, decoder runtime.Decoder) (*deployapi.DeploymentConfig, error) {