From 975bd96f187250eec45d6b733366091740e8e782 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:30:23 -0500 Subject: [PATCH 1/3] Adding some additional logging --- .../tests/commons/native_client/Util.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index 55e39c70..e9d3dceb 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -41,6 +41,7 @@ import io.kubernetes.client.openapi.models.V1ClusterRole; import io.kubernetes.client.openapi.models.V1ClusterRoleBinding; import io.kubernetes.client.openapi.models.V1ConfigMap; import io.kubernetes.client.openapi.models.V1Deployment; +import io.kubernetes.client.openapi.models.V1DeploymentCondition; import io.kubernetes.client.openapi.models.V1DeploymentList; import io.kubernetes.client.openapi.models.V1Ingress; import io.kubernetes.client.openapi.models.V1LoadBalancerIngress; @@ -625,10 +626,27 @@ public final class Util { fail("No deployments with the name " + deploymentName); } V1Deployment deployment = deployments.getItems().get(0); - Integer availableReplicas = deployment.getStatus().getAvailableReplicas(); - LOG.info("Available replicas for " + deploymentName + ": " - + (availableReplicas == null ? 0 : availableReplicas)); - return availableReplicas != null && availableReplicas >= 1; + if (deployment.getStatus() != null) { + Integer availableReplicas = deployment.getStatus().getAvailableReplicas(); + logDeploymentConditions(deployment.getStatus().getConditions()); + LOG.info("Available replicas for " + deploymentName + ": " + + (availableReplicas == null ? 0 : availableReplicas)); + return availableReplicas != null && availableReplicas >= 1; + } + else { + return false; + } + } + + private void logDeploymentConditions(List conditions) { + if (conditions != null) { + for (V1DeploymentCondition condition : conditions) { + LOG.info("Deployment Condition Type: " + condition.getType()); + LOG.info("Deployment Condition Status: " + condition.getStatus()); + LOG.info("Deployment Condition Message: " + condition.getMessage()); + LOG.info("Deployment Condition Reason: " + condition.getReason()); + } + } } private static void waitForDeploymentAfterPatch(String deploymentName, String namespace, From a867cd38bf6183ede405a80d75346e467a270c4a Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:25:22 -0500 Subject: [PATCH 2/3] Changing kafka start script --- .../src/main/resources/kafka/kafka-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml index cbe261d3..3d2b0a40 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml +++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml @@ -32,7 +32,7 @@ spec: - name: kafka-start-config-script mountPath: /tmp command: - - /tmp/./kafka_start.sh + - /tmp/kafka_start.sh image: confluentinc/cp-kafka:7.2.1 ports: - containerPort: 9092 From 67e60073819aae2edd892ecbe1f2b5d6410647cd Mon Sep 17 00:00:00 2001 From: erabii Date: Mon, 6 Nov 2023 23:41:37 +0200 Subject: [PATCH 3/3] fix (#1499) --- .../src/main/resources/kafka/kafka-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml index 3d2b0a40..f0870b68 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml +++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml @@ -25,7 +25,7 @@ spec: - name: kafka-start-config-script configMap: name: kafka-start-config-script - defaultMode: 0744 + defaultMode: 0755 containers: - name: kafka-start-config-script volumeMounts: