Skip to content

Commit cda584a

Browse files
committed
Fix DC image reactor to reconcile on DC dc.Spec.Template.Spec.Containers changes
1 parent f0913b2 commit cda584a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/image/trigger/deploymentconfigs/deploymentconfigs.go

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

@@ -187,9 +193,6 @@ func UpdateDeploymentConfigImages(dc *appsapi.DeploymentConfig, tagRetriever tri
187193
glog.V(4).Infof("trigger %#v in deployment %s is not resolveable", p, dc.Name)
188194
return nil, false, nil
189195
}
190-
if ref == p.LastTriggeredImage {
191-
continue
192-
}
193196

194197
if len(ref) == 0 {
195198
ref = p.LastTriggeredImage

0 commit comments

Comments
 (0)