Support bridge release 0.34.0

Signed-off-by: Gantigmaa Selenge <tina.selenge@gmail.com>

Author: tinaselenge

CHANGELOG.md

@@ -7,6 +7,9 @@
 * The `ServerSideApplyPhase1` feature gate moves to beta stage and is enabled by default.
   If needed, `ServerSideApplyPhase1` can be disabled in the feature gates configuration in the Cluster Operator.
 * Fixed auto-rebalancing on scale up not running anymore when Cruise Control is not ready yet on the first attempt.
+* Update HTTP bridge to 0.34.0.
+  * `/metrics` endpoint is no longer available on the regular HTTP interface (port 8080 by default). It is now available on the HTTP management interface, 8081.
+    Users upgrading to Strimzi 0.51.0+ should check all monitoring configurations that scrape Kafka Bridge metrics and update them to use port 8081 instead of 8080 or any other non-default port before or immediately after the upgrade to avoid metrics collection failures.
 
 ### Major changes, deprecations, and removals
 

bridge.version

@@ -1 +1 @@
-0.33.1
+0.34.0

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java

@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.LocalObjectReference;
 import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServicePort;
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
@@ -88,6 +89,8 @@ public class KafkaBridgeCluster extends AbstractModel implements SupportsLogging
 
     /* test */ static final String COMPONENT_TYPE = "kafka-bridge";
     protected static final String REST_API_PORT_NAME = "rest-api";
+    /* test */ static final String REST_API_MANAGEMENT_PORT_NAME = "rest-api-mgmt";
+    /* test */ static final int REST_API_MANAGEMENT_PORT = 8081;
     protected static final String TLS_CERTS_BASE_VOLUME_MOUNT = "/opt/strimzi/bridge-certs/";
     protected static final String PASSWORD_VOLUME_MOUNT = "/opt/strimzi/bridge-password/";
     protected static final String ENV_VAR_KAFKA_INIT_INIT_FOLDER_KEY = "INIT_FOLDER";
@@ -251,13 +254,17 @@ public Service generateService() {
             port = http.getPort();
         }
 
+        List<ServicePort> ports = new ArrayList<>();
+        ports.add(ServiceUtils.createServicePort(REST_API_PORT_NAME, port, REST_API_PORT_NAME, "TCP"));
+        ports.add(ServiceUtils.createServicePort(REST_API_MANAGEMENT_PORT_NAME, REST_API_MANAGEMENT_PORT, REST_API_MANAGEMENT_PORT_NAME, "TCP"));
+
         return ServiceUtils.createDiscoverableClusterIpService(
                 KafkaBridgeResources.serviceName(cluster),
                 namespace,
                 labels,
                 ownerReference,
                 templateService,
-                List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, port, REST_API_PORT_NAME, "TCP")),
+                ports,
                 labels.strimziSelectorLabels(),
                 ModelUtils.getCustomLabelsOrAnnotations(CO_ENV_VAR_CUSTOM_SERVICE_LABELS),
                 Util.mergeLabelsOrAnnotations(getDiscoveryAnnotation(port), ModelUtils.getCustomLabelsOrAnnotations(CO_ENV_VAR_CUSTOM_SERVICE_ANNOTATIONS))
@@ -270,15 +277,23 @@ public Service generateService() {
      * @return  JSON with discovery annotation
      */
     /*test*/ Map<String, String> getDiscoveryAnnotation(int port) {
+        JsonArray anno = new JsonArray();
+
         JsonObject discovery = new JsonObject();
         discovery.put("port", port);
         discovery.put("tls", false);
         discovery.put("auth", "none");
         discovery.put("protocol", "http");
 
-        JsonArray anno = new JsonArray();
         anno.add(discovery);
 
+        JsonObject managementDiscovery = new JsonObject();
+        discovery.put("port", REST_API_MANAGEMENT_PORT);
+        discovery.put("tls", false);
+        discovery.put("auth", "none");
+        discovery.put("protocol", "http");
+        anno.add(managementDiscovery);
+
         return Collections.singletonMap(Labels.STRIMZI_DISCOVERY_LABEL, anno.encodePrettily());
     }
 
@@ -291,6 +306,7 @@ protected List<ContainerPort> getContainerPortList() {
         }
 
         portList.add(ContainerUtils.createContainerPort(REST_API_PORT_NAME, port));
+        portList.add(ContainerUtils.createContainerPort(REST_API_MANAGEMENT_PORT_NAME, REST_API_MANAGEMENT_PORT));
 
         return portList;
     }
@@ -413,8 +429,8 @@ private Container createContainer(ImagePullPolicy imagePullPolicy) {
                 getEnvVars(),
                 getContainerPortList(),
                 getVolumeMounts(),
-                ProbeUtils.httpProbe(livenessProbeOptions, "/healthy", REST_API_PORT_NAME),
-                ProbeUtils.httpProbe(readinessProbeOptions, "/ready", REST_API_PORT_NAME),
+                ProbeUtils.httpProbe(livenessProbeOptions, "/healthy", REST_API_MANAGEMENT_PORT_NAME),
+                ProbeUtils.httpProbe(readinessProbeOptions, "/ready", REST_API_MANAGEMENT_PORT_NAME),
                 imagePullPolicy
         );
     }

cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaBridgeClusterTest.java

@@ -188,10 +188,13 @@ public void testGenerateService()   {
         assertThat(svc.getSpec().getType(), is("ClusterIP"));
         assertThat(svc.getMetadata().getLabels(), is(expectedServiceLabels(kbc.getComponentName())));
         assertThat(svc.getSpec().getSelector(), is(expectedSelectorLabels()));
-        assertThat(svc.getSpec().getPorts().size(), is(1));
+        assertThat(svc.getSpec().getPorts().size(), is(2));
         assertThat(svc.getSpec().getPorts().get(0).getPort(), is(KafkaBridgeCluster.DEFAULT_REST_API_PORT));
         assertThat(svc.getSpec().getPorts().get(0).getName(), is(KafkaBridgeCluster.REST_API_PORT_NAME));
         assertThat(svc.getSpec().getPorts().get(0).getProtocol(), is("TCP"));
+        assertThat(svc.getSpec().getPorts().get(1).getPort(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT));
+        assertThat(svc.getSpec().getPorts().get(1).getName(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME));
+        assertThat(svc.getSpec().getPorts().get(1).getProtocol(), is("TCP"));
         assertThat(svc.getSpec().getIpFamilyPolicy(), is(nullValue()));
         assertThat(svc.getSpec().getIpFamilies(), is(nullValue()));
 
@@ -219,10 +222,13 @@ public void testGenerateDeployment()   {
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getLivenessProbe().getTimeoutSeconds(), is(healthTimeout));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getReadinessProbe().getInitialDelaySeconds(), is(healthDelay));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getReadinessProbe().getTimeoutSeconds(), is(healthTimeout));
-        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().size(), is(1));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().size(), is(2));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getContainerPort(), is(KafkaBridgeCluster.DEFAULT_REST_API_PORT));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getName(), is(KafkaBridgeCluster.REST_API_PORT_NAME));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getProtocol(), is("TCP"));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getContainerPort(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getName(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getProtocol(), is("TCP"));
         assertThat(dep.getSpec().getStrategy().getType(), is("RollingUpdate"));
         assertThat(dep.getSpec().getStrategy().getRollingUpdate().getMaxSurge().getIntVal(), is(1));
         assertThat(dep.getSpec().getStrategy().getRollingUpdate().getMaxUnavailable().getIntVal(), is(0));
@@ -1336,11 +1342,14 @@ public void testDifferentHttpPort()   {
         Deployment dep = kb.generateDeployment(emptyMap(), true, null, null);
         Container cont = dep.getSpec().getTemplate().getSpec().getContainers().get(0);
 
-        assertThat(cont.getLivenessProbe().getHttpGet().getPort(), is(new IntOrString(KafkaBridgeCluster.REST_API_PORT_NAME)));
-        assertThat(cont.getReadinessProbe().getHttpGet().getPort(), is(new IntOrString(KafkaBridgeCluster.REST_API_PORT_NAME)));
+        assertThat(cont.getLivenessProbe().getHttpGet().getPort(), is(new IntOrString(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME)));
+        assertThat(cont.getReadinessProbe().getHttpGet().getPort(), is(new IntOrString(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME)));
         assertThat(cont.getPorts().get(0).getContainerPort(), is(1874));
+        assertThat(cont.getPorts().get(1).getContainerPort(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getName(), is(KafkaBridgeCluster.REST_API_PORT_NAME));
         assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(0).getProtocol(), is("TCP"));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getName(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME));
+        assertThat(dep.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts().get(1).getProtocol(), is("TCP"));
 
         // Check ports on Service
         Service svc = kb.generateService();
@@ -1352,6 +1361,8 @@ public void testDifferentHttpPort()   {
         assertThat(svc.getSpec().getPorts().get(0).getName(), is(KafkaBridgeCluster.REST_API_PORT_NAME));
         assertThat(svc.getSpec().getPorts().get(0).getProtocol(), is("TCP"));
         assertThat(svc.getMetadata().getAnnotations(), is(kbc.getDiscoveryAnnotation(1874)));
+        assertThat(svc.getSpec().getPorts().get(1).getPort(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT));
+        assertThat(svc.getSpec().getPorts().get(1).getName(), is(KafkaBridgeCluster.REST_API_MANAGEMENT_PORT_NAME));
         io.strimzi.operator.cluster.TestUtils.checkOwnerReference(svc, resource);
     }
 

packaging/examples/metrics/prometheus-install/pod-monitors/bridge-metrics.yaml

@@ -14,4 +14,4 @@ spec:
       - myproject
   podMetricsEndpoints:
   - path: /metrics
-    port: rest-api
+    port: rest-api-mgmt

packaging/helm-charts/helm3/strimzi-kafka-operator/README.md

@@ -170,7 +170,7 @@ the documentation for more details.
 | `kafkaBridge.image.registry`                     | Override default Kafka Bridge image registry                                    | `quay.io`                    |
 | `kafkaBridge.image.repository`                   | Override default Kafka Bridge image repository                                  | `strimzi`                    |
 | `kafkaBridge.image.name`                         | Kafka Bridge image name                                                         | `kafka-bridge`               |
-| `kafkaBridge.image.tag`                          | Override default Kafka Bridge image tag                                         | `0.33.1`                     |
+| `kafkaBridge.image.tag`                          | Override default Kafka Bridge image tag                                         | `0.34.0`                     |
 | `kafkaBridge.image.digest`                       | Override Kafka Bridge image tag with digest                                     | `nil`                        |
 | `kafkaExporter.image.registry`                   | Override default Kafka Exporter image registry                                  | `nil`                        |
 | `kafkaExporter.image.repository`                 | Override default Kafka Exporter image repository                                | `nil`                        |

packaging/helm-charts/helm3/strimzi-kafka-operator/values.yaml

@@ -147,7 +147,7 @@ kafkaBridge:
     registry: ""
     repository:
     name: kafka-bridge
-    tag: 0.33.1
+    tag: 0.34.0
 kafkaExporter:
   image:
     registry: ""

packaging/install/cluster-operator/060-Deployment-strimzi-cluster-operator.yaml

@@ -73,7 +73,7 @@ spec:
             - name: STRIMZI_DEFAULT_KAFKA_INIT_IMAGE
               value: quay.io/strimzi/operator:latest
             - name: STRIMZI_DEFAULT_KAFKA_BRIDGE_IMAGE
-              value: quay.io/strimzi/kafka-bridge:0.33.1
+              value: quay.io/strimzi/kafka-bridge:0.34.0
             - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE
               value: quay.io/strimzi/kaniko-executor:latest
             - name: STRIMZI_DEFAULT_BUILDAH_IMAGE

systemtest/src/main/java/io/strimzi/systemtest/TestConstants.java

@@ -143,7 +143,7 @@ public interface TestConstants {
     int CLUSTER_OPERATOR_METRICS_PORT = 8080;
     int USER_OPERATOR_METRICS_PORT = 8081;
     int TOPIC_OPERATOR_METRICS_PORT = 8080;
-    int KAFKA_BRIDGE_METRICS_PORT = 8080;
+    int KAFKA_BRIDGE_METRICS_PORT = 8081;
     int JMX_PORT = 9999;
 
     String DEPLOYMENT = "Deployment";