Merge branch 'main' into fixCertManager

Author: franvila

kroxylicious-kubernetes-api/src/main/resources/META-INF/fabric8/kafkaproxyingresses.kroxylicious.io-v1.yml

@@ -68,7 +68,7 @@ spec:
                 clusterIP:
                   type: object
                   description: |-
-                    clusterIP specifies that this ingress is for access within the same Kubernetes cluster using 
+                    specifies that this ingress is for access within the same Kubernetes cluster using 
                     ClusterIP Kubernetes Services.
                   required: [ "protocol" ]
                   properties:
@@ -79,8 +79,8 @@ spec:
                 loadBalancer:
                   type: object
                   description: |-
-                    clusterIP specifies that this ingress is for access within the same Kubernetes cluster using 
-                    ClusterIP Kubernetes Services.
+                    specifies that this ingress is for access from outside the Kubernetes cluster
+                    via a LoadBalancer Kubernetes Services.
                   required: [ "bootstrapAddress", "advertisedBrokerAddressPattern"]
                   x-kubernetes-validations:
                     - rule: "self.advertisedBrokerAddressPattern.contains('$(nodeId)')"

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Constants.java

@@ -29,7 +29,6 @@ private Constants() {
     public static final String KROXYLICIOUS_TLS_CA_NAME = "ca.pem";
     public static final String KROXYLICIOUS_OPERATOR_SUBSCRIPTION_NAME = Environment.KROXYLICIOUS_OLM_DEPLOYMENT_NAME + "-v" + Environment.KROXYLICIOUS_OPERATOR_VERSION
             + "-sub";
-    public static final String KROXYLICIOUS_OPERATOR_OLM_LABEL = Environment.KROXYLICIOUS_OLM_DEPLOYMENT_NAME + "-operator-v" + Environment.KROXYLICIOUS_OPERATOR_VERSION;
 
     /**
      * Strimzi cluster operator deployment name

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/operator/KroxyliciousOperatorOlmBundleInstaller.java

@@ -36,6 +36,8 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+import static io.kroxylicious.systemtests.k8s.KubeClusterResource.kubeClient;
+
 /**
  * KroxyliciousOperatorOlmBundleInstaller encapsulates the whole OLM installation process of Kroxylicious Operator. Based on the @code{Environment}
  * values, this class installs Kroxylicious Operator using bundle olm.
@@ -167,8 +169,10 @@ private CompletableFuture<Void> install(String operatorName, String operatorName
     @SuppressFBWarnings("REC_CATCH_EXCEPTION")
     private boolean isOperatorReady(String ns) {
         try {
+            String label = kubeClient().listPodsByPrefixInName(ns, Environment.KROXYLICIOUS_OLM_DEPLOYMENT_NAME).get(0).getMetadata()
+                    .getLabels().get("app.kubernetes.io/instance");
             PodUtils.waitForPodsReadyWithRestart(ns, new LabelSelectorBuilder()
-                    .withMatchLabels(Map.of("app.kubernetes.io/instance", Constants.KROXYLICIOUS_OPERATOR_OLM_LABEL)).build(),
+                    .withMatchLabels(Map.of("app.kubernetes.io/instance", label)).build(),
                     1, true);
             LOGGER.info("Kroxylicious operator in namespace {} is ready", ns);
             return true;