Merge branch 'w/2.7/bugfix/ZENKO-4745' into w/2.8/bugfix/ZENKO-4745

.github/scripts/end2end/configs/zenkoversion.yaml

@@ -15,6 +15,9 @@ spec:
     s3utils:
       image: "${S3UTILS_DASHBOARD}"
       tag: "${S3UTILS_TAG}"
+    kafkaCleaner:
+      image: "${KAFKA_CLEANER_DASHBOARD}"
+      tag: "${KAFKA_CLEANER_TAG}"
     # kafka:
     #   image: kafka-dashboard
     #   tag: '${ZENKO_VERSION_NAME}'
@@ -85,6 +88,9 @@ spec:
       image: "${ZOOKEEPER_IMAGE}"
       tag: "${ZOOKEEPER_TAG}"
     kafka:
+      cleaner:
+        image: '${KAFKA_CLEANER_IMAGE}'
+        tag: '${KAFKA_CLEANER_TAG}'
       cluster:
         image: "${KAFKA_IMAGE}"
         tag: "${KAFKA_TAG}"

.github/workflows/release.yaml

@@ -25,6 +25,17 @@ jobs:
       - name: Fetch tags
         run: git fetch --tags
 
+      - name: 'Check if tag matches the branch name'
+        shell: bash
+        run: \
+          [[ "development/${{ github.event.inputs.tag }}" == "${{ github.ref }}."* ]]
+
+      - name: 'Check if tag is set in VERSION file'
+        shell: bash
+        run: \
+          source VERSION
+          [[ "${{ github.event.inputs.tag }}" == "$VERSION_FULL" ]]
+
       - name: 'Check if tag was already created'
         shell: bash
         run: >

solution/zenkoversion.yaml

@@ -17,7 +17,7 @@ spec:
       tag: '${VERSION_FULL}'
     kafkaCleaner:
       image: kafka-cleaner-dashboards
-      tag: '${VERSION_FULL}'
+      tag: '${KAFKA_CLEANER_TAG}'
     kafkaConnect:
       image: kafka-connect-dashboard
       tag: '${VERSION_FULL}'