Skip to content

Commit 3e84340

Browse files
committed
Fix DC image reactor to reconcile on DC dc.Spec.Template.Spec.Containers changes
1 parent 5e2cc59 commit 3e84340

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/image/trigger/deploymentconfigs/deploymentconfigs.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,19 @@ func (i deploymentConfigTriggerIndexer) Index(obj, old interface{}) (string, *tr
127127
default:
128128
// updated
129129
dc = obj.(*appsapi.DeploymentConfig)
130+
oldDC := old.(*appsapi.DeploymentConfig)
130131
triggers = calculateDeploymentConfigTriggers(dc)
131-
oldTriggers := calculateDeploymentConfigTriggers(old.(*appsapi.DeploymentConfig))
132+
oldTriggers := calculateDeploymentConfigTriggers(oldDC)
132133
switch {
133134
case len(oldTriggers) == 0:
134135
change = cache.Added
135136
case !reflect.DeepEqual(oldTriggers, triggers):
136137
change = cache.Updated
138+
// We need to react on image changes as well. Image names could change,
139+
// images could be set to different value or resetted to "" e.g. by oc apply
140+
// and we need to make sure those changes get reconciled by re-resolving images
141+
case !reflect.DeepEqual(dc.Spec.Template.Spec.Containers, oldDC.Spec.Template.Spec.Containers):
142+
change = cache.Updated
137143
}
138144
}
139145

@@ -190,9 +196,6 @@ func UpdateDeploymentConfigImages(dc *appsapi.DeploymentConfig, tagRetriever tri
190196
glog.V(4).Infof("trigger %#v in deployment %s is not resolveable", p, dc.Name)
191197
return nil, false, nil
192198
}
193-
if ref == p.LastTriggeredImage {
194-
continue
195-
}
196199

197200
if len(ref) == 0 {
198201
ref = p.LastTriggeredImage

0 commit comments

Comments
 (0)