Use generated Kafka image in CI tests

Issue: ZENKO-5196

Author: delthas

.github/scripts/end2end/configure-e2e-ctst.sh

@@ -6,6 +6,7 @@ KAFKA_REGISTRY_NAME=$(yq eval ".kafka.sourceRegistry" ../../../solution/deps.yam
 KAFKA_IMAGE_NAME=$(yq eval ".kafka.image" ../../../solution/deps.yaml)
 KAFKA_IMAGE_TAG=$(yq eval ".kafka.tag" ../../../solution/deps.yaml)
 KAFKA_IMAGE=$KAFKA_REGISTRY_NAME/$KAFKA_IMAGE_NAME:$KAFKA_IMAGE_TAG
+BUILD_TREE_HASH=$(git rev-parse HEAD:solution/kafka)
 
 # Setup test environment variables
 export ZENKO_NAME=${1:-"end2end"}
@@ -57,7 +58,7 @@ kubectl wait --for=jsonpath='{.status.state}'=ClusterRunning --timeout 10m kafka
 
 # Create SCRAM credentials for the SCRAM listener
 kubectl run kafka-config \
-    --image=$KAFKA_IMAGE \
+    --image=$KAFKA_IMAGE-$BUILD_TREE_HASH \
     --pod-running-timeout=5m \
     --rm \
     --restart=Never \
@@ -91,7 +92,7 @@ AZURE_ARCHIVE_STATUS_TOPIC_2_S="${UUID}.cold-status-e2e-azure-archive-2-suspende
 
 # Creating bucket notification topic in kafka
 kubectl run kafka-topics \
-    --image=$KAFKA_IMAGE \
+    --image=$KAFKA_IMAGE-$BUILD_TREE_HASH \
     --pod-running-timeout=5m \
     --rm \
     --restart=Never \

.github/scripts/end2end/configure-e2e.sh

@@ -55,10 +55,11 @@ KAFKA_IMAGE=$KAFKA_REGISTRY_NAME/$KAFKA_IMAGE_NAME:$KAFKA_IMAGE_TAG
 KAFKA_HOST_PORT=$(kubectl get secret -l app.kubernetes.io/name=backbeat-config,app.kubernetes.io/instance=end2end \
     -o jsonpath='{.items[0].data.config\.json}' | base64 -di | jq .kafka.hosts)
 KAFKA_HOST_PORT=${KAFKA_HOST_PORT:1:-1}
+BUILD_TREE_HASH=$(git rev-parse HEAD:solution/kafka)
 
 # Creating replication/transition and notification topics in kafka
 kubectl run kafka-topics \
-    --image=$KAFKA_IMAGE \
+    --image=$KAFKA_IMAGE-$BUILD_TREE_HASH \
     --pod-running-timeout=5m \
     --rm \
     --restart=Never \

.github/scripts/end2end/deploy-zenko.sh

@@ -89,6 +89,7 @@ function dependencies_env()
     echo $(dependencies_policy_env)
     echo $(dependencies_config_env)
     echo "ZENKO_VERSION_NAME=${ZENKO_VERSION_NAME}"
+    echo "BUILD_TREE_HASH=$(git rev-parse HEAD:solution/kafka)"
 }
 
 create_encryption_secret()

solution/zenkoversion.yaml

@@ -96,10 +96,10 @@ spec:
         tag: ${KAFKA_CLEANER_TAG}
       cluster:
         image: ${KAFKA_IMAGE}
-        tag: ${KAFKA_TAG}
+        tag: ${KAFKA_TAG}-${BUILD_TREE_HASH}
       connect:
         image: ${KAFKA_CONNECT_IMAGE}
-        tag: ${KAFKA_CONNECT_TAG}
+        tag: ${KAFKA_CONNECT_TAG}-${BUILD_TREE_HASH}
       cruiseControl:
         image: ${KAFKA_CRUISECONTROL_IMAGE}
         tag: ${KAFKA_CRUISECONTROL_TAG}