Keep build tree hash in kakfa image tag

Issue: ZENKO-5196

Author: francoisferrand

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

@@ -1,11 +1,14 @@
 #!/bin/bash
 set -exu
 
+DIR=$(dirname "$0")
+
 # Get kafka image name and tag
-KAFKA_REGISTRY_NAME=$(yq eval ".kafka.sourceRegistry" ../../../solution/deps.yaml)
-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
+kafka_image() {
+    source <( "$DIR"/../../../solution/kafka_build_vars.sh )
+    echo "$KAFKA_IMAGE:$KAFKA_TAG-$BUILD_TREE_HASH"
+}
+KAFKA_IMAGE=$(kafka_image)
 
 # Setup test environment variables
 export ZENKO_NAME=${1:-"end2end"}

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

@@ -2,7 +2,8 @@
 
 set -exu
 
-. "$(dirname $0)/common.sh"
+DIR=$(dirname "${0}")
+. "$DIR"/common.sh
 
 ZENKO_NAME=${1:-end2end}
 E2E_IMAGE=${2:-ghcr.io/scality/zenko/zenko-e2e:latest}
@@ -48,10 +49,12 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 EOF
 
-KAFKA_REGISTRY_NAME=$(yq eval ".kafka.sourceRegistry" ../../../solution/deps.yaml)
-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
+kafka_image() {
+    source <( "$DIR"/../../../solution/kafka_build_vars.sh )
+    echo "$KAFKA_IMAGE:$KAFKA_TAG-$BUILD_TREE_HASH"
+}
+
+KAFKA_IMAGE=$(kafka_image)
 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}

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

@@ -2,13 +2,14 @@
 
 set -exu
 
-DIR=$(dirname "$0")
+DIR="$(dirname "$0")"
+REPOSITORY_DIR="${DIR}/../../.."
 
 export ZENKO_NAME=${1:-end2end}
 export NAMESPACE=${2:-default}
 export ZENKO_CR_PATH=${3:-'./configs/zenko.yaml'}
-export ZENKOVERSION_PATH=${4:-'../../../solution/zenkoversion.yaml'}
-export DEPS_PATH=${5:-'../../../solution/deps.yaml'}
+export ZENKOVERSION_PATH=${4:-"${REPOSITORY_DIR}/solution/zenkoversion.yaml"}
+export DEPS_PATH=${5:-"${REPOSITORY_DIR}/solution/deps.yaml"}
 export ZENKO_VERSION_NAME="${ZENKO_NAME}-version"
 export ZENKO_ANNOTATIONS=""
 export ZENKO_MONGODB_SECRET_NAME=${ZENKO_MONGODB_SECRET_NAME:-'mongodb-db-creds'}
@@ -78,7 +79,10 @@ function dependencies_config_env()
 
 function dependencies_versions_env()
 {
-    yq eval '.[] | .envsubst + "=" + .tag' ${DEPS_PATH}
+    source <( "${REPOSITORY_DIR}/solution/kafka_build_vars.sh" )
+
+    yq eval '.[] | .envsubst + "=" + .tag' ${DEPS_PATH} |\
+        sed -E '/KAFKA_TAG=|KAFKA_CONNECT_TAG/ s/$/-'"${BUILD_TREE_HASH}"'/'
 }
 
 function dependencies_env()

solution/build.sh

@@ -67,7 +67,10 @@ EOF
 
 function flatten_source_images()
 {
-    yq eval '.* | (.sourceRegistry // "docker.io") + "/" + .image + ":" + .tag' deps.yaml
+    source <( ${REPOSITORY_DIR}/solution/kafka_build_vars.sh )
+
+    yq eval '.* | (.sourceRegistry // "docker.io") + "/" + .image + ":" + .tag' deps.yaml |
+        sed '/ghcr.io\/scality\/zenko\/kafka/ s/$/-'"${BUILD_TREE_HASH}"'/'
 }
 
 function zenko_operator_tag()
@@ -319,31 +322,12 @@ function download_tools()
     done
 }
 
-function retag()
-{
-    local image=$1
-    local tag=$2
-    local suffix=$3
-    ${DOCKER} image inspect "${image}:${tag}-${suffix}" > /dev/null 2>&1 || \
-        ${DOCKER} ${DOCKER_OPTS} pull "${image}:${tag}-${suffix}"
-    ${DOCKER} tag "${image}:${tag}-${suffix}" "${image}:${tag}"
-}
-
-function prepare_kafka_images()
-(
-    source <( ${REPOSITORY_DIR}/solution/kafka_build_vars.sh )
-
-    retag "$KAFKA_IMAGE" "$KAFKA_TAG" "$BUILD_TREE_HASH"
-    retag "$KAFKA_CONNECT_IMAGE" "$KAFKA_CONNECT_TAG" "$BUILD_TREE_HASH"
-)
-
 # run everything in order
 clean
 mkdirs
 download_tools
 gen_manifest_yaml
 copy_yamls
-prepare_kafka_images
 flatten_source_images | while read img ; do
     # only pull if the image isnt already local
     ${DOCKER} image inspect ${img} > /dev/null 2>&1 || ${DOCKER} ${DOCKER_OPTS} pull ${img}

solution/zenkoversion.yaml

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