Skip to content

Commit 46b6ac9

Browse files
authored
Merge pull request #448 from teszes/logging
Change logging references to CR name
2 parents eab41a1 + a909dea commit 46b6ac9

File tree

6 files changed

+28
-19
lines changed

6 files changed

+28
-19
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/CustomResourceCache.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.javaoperatorsdk.operator.processing;
22

3+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
4+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
5+
36
import com.fasterxml.jackson.core.JsonProcessingException;
47
import com.fasterxml.jackson.databind.ObjectMapper;
58
import io.fabric8.kubernetes.client.CustomResource;
@@ -42,8 +45,8 @@ public void cacheResource(CustomResource resource, Predicate<CustomResource> pre
4245
try {
4346
lock.lock();
4447
if (predicate.test(resources.get(KubernetesResourceUtils.getUID(resource)))) {
45-
log.trace("Update cache after condition is true: {}", resource);
46-
resources.put(resource.getMetadata().getUid(), resource);
48+
log.trace("Update cache after condition is true: {}", getName(resource));
49+
resources.put(getUID(resource), resource);
4750
}
4851
} finally {
4952
lock.unlock();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.javaoperatorsdk.operator.processing;
22

33
import static io.javaoperatorsdk.operator.EventListUtils.containsCustomResourceDeletedEvent;
4-
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
4+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
55
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
66

77
import io.fabric8.kubernetes.client.CustomResource;
@@ -208,7 +208,8 @@ private void handleRetryOnException(ExecutionScope executionScope) {
208208

209209
private void markSuccessfulExecutionRegardingRetry(ExecutionScope executionScope) {
210210
log.debug(
211-
"Marking successful execution for resource: {}", executionScope.getCustomResourceUid());
211+
"Marking successful execution for resource: {}",
212+
getName(executionScope.getCustomResource()));
212213
retryState.remove(executionScope.getCustomResourceUid());
213214
eventSourceManager
214215
.getRetryTimerEventSource()
@@ -247,8 +248,8 @@ private void cacheUpdatedResourceIfChanged(
247248
String originalResourceVersion = getVersion(originalCustomResource);
248249

249250
log.debug(
250-
"Trying to update resource cache from update response for resource uid: {} new version: {} old version: {}",
251-
getUID(originalCustomResource),
251+
"Trying to update resource cache from update response for resource: {} new version: {} old version: {}",
252+
getName(originalCustomResource),
252253
getVersion(customResourceAfterExecution),
253254
getVersion(originalCustomResource));
254255
eventSourceManager.cacheResource(

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator.processing;
22

33
import static io.javaoperatorsdk.operator.EventListUtils.containsCustomResourceDeletedEvent;
4+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
45
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
56
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
67

@@ -62,13 +63,12 @@ public PostExecutionControl handleExecution(ExecutionScope<R> executionScope) {
6263

6364
private PostExecutionControl handleDispatch(ExecutionScope<R> executionScope) {
6465
R resource = executionScope.getCustomResource();
65-
log.debug(
66-
"Handling events: {} for resource {}", executionScope.getEvents(), resource.getMetadata());
66+
log.debug("Handling events: {} for resource {}", executionScope.getEvents(), getName(resource));
6767

6868
if (containsCustomResourceDeletedEvent(executionScope.getEvents())) {
6969
log.debug(
7070
"Skipping dispatch processing because of a Delete event: {} with version: {}",
71-
getUID(resource),
71+
getName(resource),
7272
getVersion(resource));
7373
return PostExecutionControl.defaultDispatch();
7474
}
@@ -77,7 +77,7 @@ private PostExecutionControl handleDispatch(ExecutionScope<R> executionScope) {
7777
if (markedForDeletion && shouldNotDispatchToDelete(resource)) {
7878
log.debug(
7979
"Skipping delete of resource {} because finalizer(s) {} don't allow processing yet",
80-
resource.getMetadata().getName(),
80+
getName(resource),
8181
resource.getMetadata().getFinalizers());
8282
return PostExecutionControl.defaultDispatch();
8383
}
@@ -119,7 +119,7 @@ private PostExecutionControl handleCreateOrUpdate(
119119
} else {
120120
log.debug(
121121
"Executing createOrUpdate for resource {} with version: {} with execution scope: {}",
122-
getUID(resource),
122+
getName(resource),
123123
getVersion(resource),
124124
executionScope);
125125
UpdateControl<R> updateControl = controller.createOrUpdateResource(resource, context);
@@ -150,7 +150,7 @@ private PostExecutionControl handleCreateOrUpdate(
150150
private PostExecutionControl handleDelete(R resource, Context<R> context) {
151151
log.debug(
152152
"Executing delete for resource: {} with version: {}",
153-
getUID(resource),
153+
getName(resource),
154154
getVersion(resource));
155155
// todo: this is be executed in a try-catch statement, in case this fails
156156
DeleteControl deleteControl = controller.deleteResource(resource, context);
@@ -197,7 +197,7 @@ private R removeFinalizer(R resource) {
197197
private R replace(R resource) {
198198
log.debug(
199199
"Trying to replace resource {}, version: {}",
200-
resource.getMetadata().getName(),
200+
getName(resource),
201201
resource.getMetadata().getResourceVersion());
202202
return customResourceFacade.replaceWithLock(resource);
203203
}
@@ -216,14 +216,14 @@ public R updateStatus(R resource) {
216216
log.trace("Updating status for resource: {}", resource);
217217
return resourceOperation
218218
.inNamespace(resource.getMetadata().getNamespace())
219-
.withName(resource.getMetadata().getName())
219+
.withName(getName(resource))
220220
.updateStatus(resource);
221221
}
222222

223223
public R replaceWithLock(R resource) {
224224
return resourceOperation
225225
.inNamespace(resource.getMetadata().getNamespace())
226-
.withName(resource.getMetadata().getName())
226+
.withName(getName(resource))
227227
.lockResourceVersion(resource.getMetadata().getResourceVersion())
228228
.replace(resource);
229229
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/KubernetesResourceUtils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
public class KubernetesResourceUtils {
66

7+
public static String getName(HasMetadata customResource) {
8+
return customResource.getMetadata().getName();
9+
}
10+
711
public static String getUID(HasMetadata customResource) {
812
return customResource.getMetadata().getUid();
913
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEvent.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.javaoperatorsdk.operator.processing.event.internal;
22

3+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
4+
35
import io.fabric8.kubernetes.client.CustomResource;
46
import io.fabric8.kubernetes.client.Watcher;
57
import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
@@ -33,7 +35,7 @@ public String toString() {
3335
+ "action="
3436
+ action
3537
+ ", resource=[ name="
36-
+ getCustomResource().getMetadata().getName()
38+
+ getName(getCustomResource())
3739
+ ", kind="
3840
+ getCustomResource().getKind()
3941
+ ", apiVersion="

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.javaoperatorsdk.operator.processing.event.internal;
22

3+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
34
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
45
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
56

@@ -113,9 +114,7 @@ public void close() {
113114
@Override
114115
public void eventReceived(Watcher.Action action, T customResource) {
115116
log.debug(
116-
"Event received for action: {}, resource: {}",
117-
action.name(),
118-
customResource.getMetadata().getName());
117+
"Event received for action: {}, resource: {}", action.name(), getName(customResource));
119118

120119
// cache the latest version of the CR
121120
customResourceCache.cacheResource(customResource);

0 commit comments

Comments
 (0)