Bug 1366936: fix ICT matching in the trigger controller

Author: 0xmichalis

pkg/deploy/controller/generictrigger/controller.go

@@ -190,12 +190,15 @@ func triggeredByDifferentImage(ictParams deployapi.DeploymentTriggerImageChangeP
 			continue
 		}
 
-		if t.ImageChangeParams.From.Name != ictParams.From.Name &&
+		if t.ImageChangeParams.From.Name != ictParams.From.Name ||
 			t.ImageChangeParams.From.Namespace != ictParams.From.Namespace {
 			continue
 		}
-
-		return t.ImageChangeParams.LastTriggeredImage != ictParams.LastTriggeredImage
+		if t.ImageChangeParams.LastTriggeredImage != ictParams.LastTriggeredImage {
+			glog.V(4).Infof("Deployment config %q triggered by different image: %s -> %s", previous.Name, t.ImageChangeParams.LastTriggeredImage, ictParams.LastTriggeredImage)
+			return true
+		}
+		return false
 	}
 	return false
 }

test/extended/deployments/deployments.go

@@ -33,6 +33,7 @@ var _ = g.Describe("deploymentconfigs", func() {
 		brokenDeploymentFixture         = exutil.FixturePath("testdata", "test-deployment-broken.yaml")
 		historyLimitedDeploymentFixture = exutil.FixturePath("testdata", "deployment-history-limit.yaml")
 		minReadySecondsFixture          = exutil.FixturePath("testdata", "deployment-min-ready-seconds.yaml")
+		multipleICTFixture              = exutil.FixturePath("testdata", "deployment-example.yaml")
 	)
 
 	g.Describe("when run iteratively", func() {
@@ -242,6 +243,20 @@ var _ = g.Describe("deploymentconfigs", func() {
 		})
 	})
 
+	g.Describe("with multiple image change triggers", func() {
+		g.AfterEach(func() {
+			failureTrap(oc, "example", g.CurrentGinkgoTestDescription().Failed)
+		})
+
+		g.It("should run a successful deployment [Conformance]", func() {
+			_, name, err := createFixture(oc, multipleICTFixture)
+			o.Expect(err).NotTo(o.HaveOccurred())
+
+			g.By("verifying the deployment is marked complete")
+			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
+		})
+	})
+
 	g.Describe("with enhanced status", func() {
 		g.AfterEach(func() {
 			failureTrap(oc, "deployment-simple", g.CurrentGinkgoTestDescription().Failed)

test/extended/testdata/deployment-example.yaml

@@ -0,0 +1,65 @@
+apiVersion: v1
+items:
+- apiVersion: v1
+  kind: DeploymentConfig
+  metadata:
+    labels:
+      app: example
+    name: example
+  spec:
+    replicas: 1
+    template:
+      metadata:
+        labels:
+          app: example
+      spec:
+        containers:
+        - imagePullPolicy: Always
+          name: ruby
+          command:
+          - /bin/sleep
+          - "100"
+          ports:
+          - containerPort: 8080
+            protocol: TCP
+          resources: {}
+          terminationMessagePath: /dev/termination-log
+        - imagePullPolicy: Always
+          name: mongodb
+          command:
+          - /bin/sleep
+          - "100"
+          ports:
+          - containerPort: 5000
+            protocol: TCP
+          resources: {}
+          terminationMessagePath: /dev/termination-log
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        securityContext: {}
+        terminationGracePeriodSeconds: 30
+    test: false
+    triggers:
+    - type: ConfigChange
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - ruby
+        from:
+          kind: ImageStreamTag
+          name: ruby:latest
+          namespace: openshift
+      type: ImageChange
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+        - mongodb
+        from:
+          kind: ImageStreamTag
+          name: mongodb:latest
+          namespace: openshift
+      type: ImageChange
+  status:
+    observedGeneration: 1
+kind: List
+metadata: {}