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

fix (#1029)

Browse Source
This commit is contained in:
erabii
2022-06-11 17:46:35 +03:00
committed by GitHub
parent c726004c8a
commit 18a6f409c1
5 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

@@ -136,17 +136,8 @@ jobs:
key: spring-cloud-kubernetes-{{ .Branch }}-{{ checksum "pom.xml" }}
fabric8_istio:
machine:
image: ubuntu-2004:202201-02
image: ubuntu-2204:2022.04.1
steps:
- run:
name: Install OpenJDK 17
command: |
wget -qO - https://adoptium.jfrog.io/adoptium/api/gpg/key/public | sudo apt-key add -
sudo add-apt-repository --yes https://adoptium.jfrog.io/adoptium/deb/
sudo apt-get update && sudo apt-get install temurin-17-jdk
sudo update-alternatives --set java /usr/lib/jvm/temurin-17-jdk-amd64/bin/java
sudo update-alternatives --set javac /usr/lib/jvm/temurin-17-jdk-amd64/bin/javac
java -version
- checkout
- restore_cache:
keys:
@@ -159,7 +150,6 @@ jobs:
# we need to run some test, so that K3s container is started and then all other instances will re-use this one.
# otherwise (since we use static ports) there might be two instances starting at the same time, and ports might conflict
# this also deals with a slightly more involved istio set-up that is needed for this test
###########################################################################################################################
######################################## Build test support dependency and Run test #######################################

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshKafkaIT.java
View File

@@ -72,8 +72,6 @@ class ActuatorRefreshKafkaIT {
private static final String ZOOKEEPER_DEPLOYMENT = "zookeeper";
private static final String KAFKA_IMAGE = "wurstmeister/kafka";
private static CoreV1Api api;
private static AppsV1Api appsApi;

2
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java
View File

@@ -48,7 +48,7 @@ public final class Commons {
public static final String RANCHER = "rancher/k3s:v1.21.10-k3s1";
/**
* Command to use when starting rancher. Without "server" option, traefik si not
* Command to use when starting rancher. Without "server" option, traefik is not
* installed
*/
public static final String RANCHER_COMMAND = "server";

2
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Fabric8Utils.java
View File

@@ -67,7 +67,7 @@ public final class Fabric8Utils {
Deployment deployment = client.apps().deployments().inNamespace(namespace).withName(deploymentName).get();
Integer availableReplicas = deployment.getStatus().getAvailableReplicas();
LOG.info("Available replicas for " + deploymentName + ": " + availableReplicas);
LOG.info("Available replicas for " + deploymentName + ": " + ((availableReplicas == null) ? 0 : 1));
return availableReplicas != null && availableReplicas >= 1;
}

2
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/K8SUtils.java
View File

@@ -376,7 +376,7 @@ public class K8SUtils {
private void innerDeployWiremock(String namespace, boolean rootPath, K3sContainer container) throws Exception {
V1Deployment deployment = getWiremockDeployment();
String[] image = getImageFromDeployment(deployment).split(":");
String[] image = getImageFromDeployment(deployment).split(":", 2);
Commons.pullImage(image[0], image[1], container);
Commons.loadImage(image[0], image[1], "wiremock", container);
appsApi.createNamespacedDeployment(namespace, getWiremockDeployment(), null, null, null);