Skip to content

Commit 5a366a1

Browse files
authored
Fix ignored-images regex matching (deckhouse#53)
1 parent 62ab889 commit 5a366a1

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

pkg/registry_checker/checker.go

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -202,38 +202,39 @@ func (rc RegistryChecker) Tick() {
202202
func (rc *RegistryChecker) reconcile(obj interface{}) {
203203
images := ExtractImages(obj)
204204

205-
for _, image := range images {
206-
for _, ignoredImageRegex := range rc.ignoredImagesRegex {
207-
if ignoredImageRegex.MatchString(image) {
208-
continue
205+
imagesLoop:
206+
for _, image := range images {
207+
for _, ignoredImageRegex := range rc.ignoredImagesRegex {
208+
if ignoredImageRegex.MatchString(image) {
209+
continue imagesLoop
210+
}
209211
}
210-
}
211-
212-
var skipObject bool
213212

214-
switch typedObj := obj.(type) {
215-
case *appsv1.Deployment:
216-
if typedObj.Status.Replicas == 0 {
217-
skipObject = true
213+
var skipObject bool
214+
215+
switch typedObj := obj.(type) {
216+
case *appsv1.Deployment:
217+
if typedObj.Status.Replicas == 0 {
218+
skipObject = true
219+
}
220+
case *appsv1.StatefulSet:
221+
if typedObj.Status.Replicas == 0 {
222+
skipObject = true
223+
}
224+
case *appsv1.DaemonSet:
225+
if typedObj.Status.CurrentNumberScheduled == 0 {
226+
skipObject = true
227+
}
218228
}
219-
case *appsv1.StatefulSet:
220-
if typedObj.Status.Replicas == 0 {
221-
skipObject = true
222-
}
223-
case *appsv1.DaemonSet:
224-
if typedObj.Status.CurrentNumberScheduled == 0 {
225-
skipObject = true
229+
230+
if skipObject {
231+
rc.imageStore.ReconcileImage(image, []store.ContainerInfo{})
232+
continue
226233
}
227-
}
228234

229-
if skipObject {
230-
rc.imageStore.ReconcileImage(image, []store.ContainerInfo{})
231-
continue
235+
containerInfos := rc.controllerIndexers.GetContainerInfosForImage(image)
236+
rc.imageStore.ReconcileImage(image, containerInfos)
232237
}
233-
234-
containerInfos := rc.controllerIndexers.GetContainerInfosForImage(image)
235-
rc.imageStore.ReconcileImage(image, containerInfos)
236-
}
237238
}
238239

239240
func (rc *RegistryChecker) reconcileUpdate(a, b interface{}) {

0 commit comments

Comments
 (0)