This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0fe267fa7d Fix possible NPE
0fe267fa7d is described below
commit 0fe267fa7d21af2d916cea16b51098ef2bc14ba9
Author: remm <[email protected]>
AuthorDate: Thu Sep 14 10:11:21 2023 +0200
Fix possible NPE
---
.../tribes/membership/cloud/KubernetesMembershipProvider.java | 7 +++++--
.../catalina/tribes/membership/cloud/LocalStrings.properties | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
index 92bef68b82..98dd6eccd8 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
@@ -89,6 +89,10 @@ public class KubernetesMembershipProvider extends
CloudMembershipProvider {
protocol = "http";
}
String clientKeyFile = getEnv("KUBERNETES_CLIENT_KEY_FILE");
+ if (clientKeyFile == null) {
+ log.error(sm.getString("kubernetesMembershipProvider.noKey"));
+ return;
+ }
String clientKeyPassword =
getEnv("KUBERNETES_CLIENT_KEY_PASSWORD");
String clientKeyAlgo = getEnv("KUBERNETES_CLIENT_KEY_ALGO");
if (clientKeyAlgo == null) {
@@ -183,7 +187,6 @@ public class KubernetesMembershipProvider extends
CloudMembershipProvider {
log.warn(sm.getString("kubernetesMembershipProvider.invalidPod", "uid"));
continue;
}
- String creationTimestamp = creationTimestampObject.toString();
// "status" contains "phase" (which must be "Running") and
"podIP"
Object statusObject = pod.get("status");
if (!(statusObject instanceof LinkedHashMap<?, ?>)) {
@@ -213,7 +216,7 @@ public class KubernetesMembershipProvider extends
CloudMembershipProvider {
continue;
}
- long aliveTime =
Duration.between(Instant.parse(creationTimestamp), startTime).toMillis();
+ long aliveTime =
Duration.between(Instant.parse(creationTimestampObject.toString()),
startTime).toMillis();
MemberImpl member = null;
try {
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
index c0da6bec16..33816e5b2f 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/cloud/LocalStrings.properties
@@ -27,6 +27,7 @@ kubernetesMembershipProvider.invalidPod=Pod is missing some
required attributes:
kubernetesMembershipProvider.invalidPodsList=Invalid pods list: [{0}]
kubernetesMembershipProvider.jsonError=JSON error
kubernetesMembershipProvider.memberError=Error creating member
+kubernetesMembershipProvider.noKey=Client certificate key was not specified in
the environment
kubernetesMembershipProvider.noNamespace=Namespace not set
kubernetesMembershipProvider.streamError=Failed to open stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
