SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-11-06 19:12:18 -05:00
parent 7fc790065f 67e6007381
commit efd417af42
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
View File

@@ -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<V1DeploymentCondition> 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,

4
spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml
View File

@@ -25,14 +25,14 @@ spec:
- name: kafka-start-config-script
configMap:
name: kafka-start-config-script
defaultMode: 0744
defaultMode: 0755
containers:
- name: kafka-start-config-script
volumeMounts:
- 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