Dedup zenkoversion.yaml file

.github/actions/install-end2end-dependencies/action.yaml

@@ -60,7 +60,7 @@ runs:
             $(lsb_release -cs) \
             stable"
           sudo apt-get update
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io=2.2.0-2~ubuntu.24.04~noble
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
           sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg
           sudo echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list
           sudo curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${{ env.KIND_VERSION }}/kind-linux-amd64

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

@@ -7,7 +7,7 @@ DIR=$(dirname "$0")
 export ZENKO_NAME=${1:-end2end}
 export NAMESPACE=${2:-default}
 export ZENKO_CR_PATH=${3:-'./configs/zenko.yaml'}
-export ZENKOVERSION_PATH=${4:-'./configs/zenkoversion.yaml'}
+export ZENKOVERSION_PATH=${4:-'../../../solution/zenkoversion.yaml'}
 export DEPS_PATH=${5:-'../../../solution/deps.yaml'}
 export ZENKO_VERSION_NAME="${ZENKO_NAME}-version"
 export ZENKO_ANNOTATIONS=""
@@ -88,7 +88,7 @@ function dependencies_env()
     echo $(dependencies_dashboard_env)
     echo $(dependencies_policy_env)
     echo $(dependencies_config_env)
-    echo "ZENKO_VERSION_NAME=${ZENKO_NAME}-version"
+    echo "ZENKO_VERSION_NAME=${ZENKO_VERSION_NAME}"
 }
 
 create_encryption_secret()
@@ -130,7 +130,9 @@ create_encryption_secret()
 
 create_encryption_secret
 
-env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | kubectl -n ${NAMESPACE} apply -f -
+env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | \
+    yq "del(.spec.dashboards[] | select(.tag == \"${ZENKO_VERSION_NAME}\"))" | \
+    kubectl -n ${NAMESPACE} apply -f -
 env $(dependencies_env) envsubst < ${ZENKO_CR_PATH} | kubectl -n ${NAMESPACE} apply -f -
 
 # Fix Zookeeper memory issues on newer Ubuntu GHA runners

solution/build.sh

@@ -77,8 +77,15 @@ function zenko_operator_tag()
 
 function dependencies_versions_env()
 {
-    yq eval '.[] | .envsubst + "=" + .tag' deps.yaml
-    echo VERSION_FULL=${VERSION_FULL}
+    yq eval '.[] | select(.image)     | .envsubst + "=" + .image     | sub("_TAG=", "_IMAGE=")' deps.yaml
+    yq eval '.[] | select(.dashboard) | .envsubst + "=" + .dashboard | sub("_TAG=.*/", "_DASHBOARD=")' deps.yaml
+    yq eval '.[] | select(.policy)    | .envsubst + "=" + .policy | sub("_TAG=.*/", "_POLICY=")' deps.yaml
+    find ${REPOSITORY_DIR}/monitoring/ -mindepth 1 -maxdepth 1 -type d -print0 | while IFS= read -r -d '' folder ; do
+        local dashboard="${folder##*/}"
+        echo "$(tr a-z- A-Z_ <<< $dashboard)_DASHBOARD=${dashboard}-dashboard"
+    done
+    yq eval '.[] | select(.tag)       | .envsubst + "=" + .tag' deps.yaml
+    echo ZENKO_VERSION_NAME=${VERSION_FULL}
 }
 
 function copy_yamls()