Merge pull request #133 from franvila/testRenovate2

Test renovate2

Author: franvila

.github/renovate.json

@@ -32,8 +32,9 @@
     },
     {
       "customType": "regex",
-      "fileMatch": ["kroxylicious-kms-provider-aws-kms-test-support/src/main/java/io/kroxylicious/kms/provider/aws/kms/AwsKmsTestKmsFacade.java",
-                    "kroxylicious-systemtests/src/main/resources/helm_localstack_overrides.yaml"],
+      "fileMatch": [
+        "kroxylicious-kms-provider-aws-kms-test-support/src/main/java/io/kroxylicious/kms/provider/aws/kms/AwsKmsTestKmsFacade.java",
+        "kroxylicious-systemtests/src/main/resources/helm_localstack_overrides.yaml"],
       "matchStrings": [
         "DockerImageName\\.parse\\(\"localstack/localstack:(?<currentValue>\\d+\\.\\d+.\\d+)\"\\)",
         "tag:.*(?<currentValue>\\d+\\.\\d+.\\d+)"
@@ -53,11 +54,11 @@
       "customType": "regex",
       "fileMatch": ["kroxylicious-integration-tests/src/test/java/io/kroxylicious/proxy/filter/validation/JsonSchemaRecordValidationIT.java"],
       "matchStrings": [
-        "DockerImageName\\.parse\\(\"(?<depName>quay.io/apicurio/apicurio-registry-mem):(?<currentValue>\\d+\\.\\d+\\.\\d+\\.Final)\"\\)"
+        "(?<depName>quay.io/apicurio/apicurio-registry-mem):(?<currentValue>\\d+\\.\\d+\\.\\d+\\.\\s+)"
       ],
       "datasourceTemplate": "docker",
-      "extractVersionTemplate": "^(?<version>.*)\\.Final$",
-      "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.Final$"
+      "extractVersionTemplate": "^(?<version>.*)?(\\.(?<build>.*))?$",
+      "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?(\\.(?<build>.*))?$"
     },
     {
       "customType": "regex",
@@ -71,8 +72,9 @@
     },
     {
       "customType": "regex",
-      "fileMatch": [".github/workflows/maven.yaml",
-                    ".github/workflows/sonar.yaml"],
+      "fileMatch": [
+        ".github/workflows/maven.yaml",
+        ".github/workflows/sonar.yaml"],
       "matchStrings": [
         "(?<depName>org.sonarsource.scanner.maven:sonar-maven-plugin):(?<currentValue>\\d+\\.\\d+\\.\\d+\\.\\d+)"
       ],

kroxylicious-kubernetes-api/pom.xml

@@ -27,7 +27,7 @@
     </description>
 
     <properties>
-        <josdk.version>5.1.0</josdk.version>
+        <josdk.version>5.0.4</josdk.version>
         <log4j.version>2.20.0</log4j.version>
         <fabric8-client.version>7.1.0</fabric8-client.version>
         <lombok.version>1.18.38</lombok.version>

kroxylicious-operator/pom.xml

@@ -19,7 +19,7 @@
     <artifactId>kroxylicious-operator</artifactId>
 
     <properties>
-        <josdk.version>5.1.0</josdk.version>
+        <josdk.version>5.0.4</josdk.version>
         <prometheus-metrics.version>1.3.7</prometheus-metrics.version>
         <io.kroxylicious.operator.image.name>quay.io/kroxylicious/operator:${project.version}</io.kroxylicious.operator.image.name>
         <io.kroxylicious.operator.image.archive>target/kroxylicious-operator.img.tar.gz</io.kroxylicious.operator.image.archive>

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/strimzi/KafkaType.java

@@ -15,6 +15,7 @@
 import io.strimzi.api.kafka.model.kafka.KafkaList;
 
 import io.kroxylicious.systemtests.Constants;
+import io.kroxylicious.systemtests.enums.ConditionStatus;
 import io.kroxylicious.systemtests.k8s.KubeClusterResource;
 
 /**
@@ -52,7 +53,12 @@ public void replace(Kafka resource, Consumer<Kafka> editor) {
 
     @Override
     public boolean isReady(Kafka resource) {
-        return getClient().inNamespace(resource.getMetadata().getNamespace()).resource(resource).isReady();
+        var fd = getClient().inNamespace(resource.getMetadata().getNamespace())
+                .withName(resource.getMetadata().getName())
+                .get();
+
+        return fd.getStatus().getConditions().stream()
+                .anyMatch(condition -> condition.getType().equalsIgnoreCase("Ready") && condition.getStatus().toUpperCase().equals(ConditionStatus.TRUE.toString()));
     }
 
     @Override