Skip to content

Commit 8a5d8fc

Browse files
authored
Log warning when no ingresses using secret (#145)
1 parent 1792242 commit 8a5d8fc

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

src/main/java/app/services/ApplicationIngressesService.java

+19-16
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
import io.fabric8.kubernetes.client.Watch;
1010
import io.fabric8.kubernetes.client.Watcher;
1111
import io.fabric8.kubernetes.client.WatcherException;
12+
import lombok.extern.slf4j.Slf4j;
13+
import org.bouncycastle.util.io.pem.PemObject;
14+
import org.bouncycastle.util.io.pem.PemReader;
15+
import org.springframework.lang.NonNull;
16+
import org.springframework.scheduling.TaskScheduler;
17+
import org.springframework.stereotype.Service;
18+
import reactor.core.publisher.Flux;
19+
import reactor.core.publisher.Mono;
20+
1221
import java.io.ByteArrayInputStream;
1322
import java.io.Closeable;
1423
import java.io.IOException;
@@ -19,23 +28,10 @@
1928
import java.security.cert.X509Certificate;
2029
import java.time.Duration;
2130
import java.time.Instant;
22-
import java.util.Base64;
31+
import java.util.*;
2332
import java.util.Base64.Decoder;
24-
import java.util.Collections;
25-
import java.util.HashSet;
26-
import java.util.Map;
27-
import java.util.Objects;
28-
import java.util.Set;
2933
import java.util.concurrent.ConcurrentHashMap;
3034
import java.util.concurrent.ScheduledFuture;
31-
import lombok.extern.slf4j.Slf4j;
32-
import org.bouncycastle.util.io.pem.PemObject;
33-
import org.bouncycastle.util.io.pem.PemReader;
34-
import org.springframework.lang.NonNull;
35-
import org.springframework.scheduling.TaskScheduler;
36-
import org.springframework.stereotype.Service;
37-
import reactor.core.publisher.Flux;
38-
import reactor.core.publisher.Mono;
3935

4036
@Service
4137
@Slf4j
@@ -142,9 +138,16 @@ public void checkCertRenewalsForSecret(@NonNull String secretName) {
142138
.anyMatch(ingressTLS -> Objects.equals(ingressTLS.getSecretName(), secretName)))
143139
)
144140
.flatMap(this::reconcileIngress)
141+
.switchIfEmpty(Mono.error(MissingResourceException::new))
145142
.subscribe(secret -> {
146-
}, throwable ->
147-
log.error("Failed to process cert renewals for secret={}", secretName, throwable)
143+
}, throwable -> {
144+
if (throwable instanceof MissingResourceException) {
145+
log.warn("No ingress(es) found using secret: {}", secretName);
146+
}
147+
else {
148+
log.error("Failed to process cert renewals for secret={}", secretName, throwable);
149+
}
150+
}
148151
);
149152

150153
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package app.services;
2+
3+
public class MissingResourceException extends RuntimeException {
4+
public MissingResourceException() {
5+
super();
6+
}
7+
8+
}

0 commit comments

Comments
 (0)