Merge pull request #18524 from tnozicka/backport-dc-trigger-reconciliation-on-image-change-release-3.7

Automatic merge from submit-queue.

[3.7] Backport dc trigger reconciliation on image change release

- fixup import and variable names to avoid conflicts with backports
- backport https://github.com/openshift/origin/pull/17539/commits
- backport https://github.com/openshift/origin/pull/18118/commits

/cc @mfojtik @ironcladlou

Author: openshift-merge-robot

pkg/apps/controller/deployer/deployer_controller.go

@@ -127,13 +127,19 @@ func (i deploymentConfigTriggerIndexer) Index(obj, old interface{}) (string, *tr
 	default:
 		// updated
 		dc = obj.(*appsapi.DeploymentConfig)
+		oldDC := old.(*appsapi.DeploymentConfig)
 		triggers = calculateDeploymentConfigTriggers(dc)
-		oldTriggers := calculateDeploymentConfigTriggers(old.(*appsapi.DeploymentConfig))
+		oldTriggers := calculateDeploymentConfigTriggers(oldDC)
 		switch {
 		case len(oldTriggers) == 0:
 			change = cache.Added
 		case !reflect.DeepEqual(oldTriggers, triggers):
 			change = cache.Updated
+		// We need to react on image changes as well. Image names could change,
+		// images could be set to different value or resetted to "" e.g. by oc apply
+		// and we need to make sure those changes get reconciled by re-resolving images
+		case !reflect.DeepEqual(dc.Spec.Template.Spec.Containers, oldDC.Spec.Template.Spec.Containers):
+			change = cache.Updated
 		}
 	}
 
@@ -190,9 +196,6 @@ func UpdateDeploymentConfigImages(dc *appsapi.DeploymentConfig, tagRetriever tri
 			glog.V(4).Infof("trigger %#v in deployment %s is not resolveable", p, dc.Name)
 			return nil, false, nil
 		}
-		if ref == p.LastTriggeredImage {
-			continue
-		}
 
 		if len(ref) == 0 {
 			ref = p.LastTriggeredImage

pkg/apps/controller/deployer/deployer_controller_test.go

@@ -1,32 +1,29 @@
 apiVersion: v1
-kind: List
-items:
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    labels:
-      app: example
-    name: example
-  spec:
-    replicas: 1
-    template:
-      metadata:
-        labels:
-          app: example
-      spec:
-        containers:
-        - imagePullPolicy: Always
-          name: test
-          command:
-          - /bin/sleep
-          - "100"
-    test: false
-    triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-        - test
-        from:
-          kind: ImageStreamTag
-          name: test:v1
-      type: ImageChange
+kind: DeploymentConfig
+metadata:
+  labels:
+    app: example
+  name: example
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: example
+    spec:
+      containers:
+      - imagePullPolicy: Always
+        name: test
+        command:
+        - /bin/sleep
+        - "100"
+  test: false
+  triggers:
+  - imageChangeParams:
+      automatic: true
+      containerNames:
+      - test
+      from:
+        kind: ImageStreamTag
+        name: test:v1
+    type: ImageChange