Fix faulty Cruise control healthcheck (strimzi#10884)

Signed-off-by: ShubhamRwt <shubhamrwt02@gmail.com>
OwenCorrigan76 · Dec 6, 2024 · 86979e0 · 86979e0
1 parent 98f1201
commit 86979e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cluster-operator/src/main/java/io/strimzi/operator/cluster/model/CruiseControl.java b/cluster-operator/src/main/java/io/strimzi/operator/cluster/model/CruiseControl.java
@@ -135,7 +135,7 @@ public class CruiseControl extends AbstractModel implements SupportsMetrics, Sup
 
     protected static final String ENV_VAR_API_SSL_ENABLED = "STRIMZI_CC_API_SSL_ENABLED";
     protected static final String ENV_VAR_API_AUTH_ENABLED = "STRIMZI_CC_API_AUTH_ENABLED";
-    protected static final String ENV_VAR_API_HEALTHCHECK_USERNAME = "API_HEALTHCHECK";
+    protected static final String ENV_VAR_API_HEALTHCHECK_USERNAME = "API_HEALTHCHECK_USERNAME";
     protected static final String ENV_VAR_API_PORT = "API_PORT";
     protected static final String ENV_VAR_API_HEALTHCHECK_PATH = "API_HEALTHCHECK_PATH";
 

diff --git a/docker-images/kafka-based/kafka/cruise-control-scripts/cruise_control_healthcheck.sh b/docker-images/kafka-based/kafka/cruise-control-scripts/cruise_control_healthcheck.sh
@@ -14,4 +14,4 @@ if [ "$STRIMZI_CC_API_AUTH_ENABLED" = true ] ; then
   ARGS+=(--user "${API_HEALTHCHECK_USERNAME}:$(cat /opt/cruise-control/api-auth-config/healthcheck.password)")
 fi
 
-curl "${ARGS[@]}" "${SCHEME}://localhost:${API_PORT}${API_HEALTHCHECK_PATH}"
+curl -f "${ARGS[@]}" "${SCHEME}://localhost:${API_PORT}${API_HEALTHCHECK_PATH}"