Code improvements

Issue: ZENKO-4641

Author: Seragonia

.github/scripts/end2end/configs/zenko.yaml

@@ -4,8 +4,6 @@ kind: Zenko
 metadata:
   name: ${ZENKO_NAME}
   ${ZENKO_ANNOTATIONS}
-    zenko.io/x-backbeat-oneshard-replicaset: data-db-mongodb-sharded-shard-0
-    zenko.io/x-backbeat-oneshard-replicaset-hosts: ${ZENKO_BACKBEAT_SHARD_HOSTS}
 spec:
   version: ${ZENKO_VERSION_NAME}
   replicas: 1

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

@@ -131,17 +131,7 @@ create_encryption_secret()
     export AZURE_SECRET_KEY_ENCRYPTED
 }
 
-generate_shard_hosts() {
-    local hosts=""
-    for ((i=0; i<MONGODB_SHARD_COUNT; i++)); do
-        if [ $i -gt 0 ]; then hosts+=","; fi
-        hosts+="data-db-mongodb-sharded-shard${i}-data-0.data-db-mongodb-sharded-headless.default.svc.cluster.local:27017"
-    done
-    export ZENKO_BACKBEAT_SHARD_HOSTS="$hosts"
-}
-
 create_encryption_secret
-generate_shard_hosts
 
 env $(dependencies_env) envsubst < ${ZENKOVERSION_PATH} | kubectl -n ${NAMESPACE} apply -f -
 env $(dependencies_env) envsubst < ${ZENKO_CR_PATH} | kubectl -n ${NAMESPACE} apply -f -

.github/scripts/end2end/generate-kustomization.sh

@@ -24,9 +24,14 @@ MONGODB_APP_PASSWORD=datapass
 MONGODB_APP_DATABASE=${ZENKO_MONGODB_DATABASE:-datadb}
 MONGODB_RS_KEY=0123456789abcdef
 
-MONGODB_SHARD_COUNT=${MONGODB_SHARD_COUNT:-1}
+# Constants for valid topologies for CI tests
+# We support multiple shards per host, or one shard per host, up to 9 nodes
+# The first number is the number of nodes, the second is the number of shards
+readonly MONGODB_VALID_TOPOLOGIES=(
+    "1:1" "1:2" "3:1" "3:3" "6:1" "6:2" "6:6" "9:1" "9:3" "9:9" "12:1" "12:4" "12:12"
+)
 
-source "${DIR}/generate-kustomization.sh" && generate_kustomization "${NODE_COUNT:-1}" "${MONGODB_SHARD_COUNT}"
+MONGODB_SHARD_COUNT=${MONGODB_SHARD_COUNT:-1}
 
 ENABLE_KEYCLOAK_HTTPS=${ENABLE_KEYCLOAK_HTTPS:-'false'}
 
@@ -116,6 +121,84 @@ stringData:
   mongodb-replica-set-key: $MONGODB_RS_KEY
 EOF
 
+# Validate that the current topology is correct
+validate_mongodb_topology() {
+    local node_count=$1
+    local shard_count=$2
+    # DIR is expected to be set by the sourcing script (e.g., install-kind-dependencies.sh)
+    # It defines where kustomization.yaml will be created and the base for relative paths.
+    if [ -z "${DIR+x}" ]; then # Check if DIR is set
+        echo "Error: DIR variable is not set. This script expects DIR to be defined by the calling environment."
+        exit 1
+    fi
+    local kustomization_file="${DIR}/kustomization.yaml"
+    local base_yaml_name="mongodb-sharded-${node_count}-node"
+
+    # Validate topology
+    local topology_key="${node_count}:${shard_count}"
+    if [[ ! " ${MONGODB_VALID_TOPOLOGIES[*]} " =~ " ${topology_key} " ]]; then
+        echo "Error: Invalid topology - ${node_count} nodes, ${shard_count} shards"
+        exit 1
+    fi
+
+    # Adjust base YAML name if there are multiple shards
+    [[ "$shard_count" -gt 1 ]] && base_yaml_name="${base_yaml_name}-${shard_count}-shards"
+    base_yaml_name="${base_yaml_name}.yaml"
+
+    # ensure base file exists
+    local base_yaml_path="${DIR}/_build/root/deploy/${base_yaml_name}"
+    if [ ! -f "$base_yaml_path" ]; then
+        echo "Error: Base YAML file not found at ${base_yaml_path}"
+        exit 1
+    fi
+
+    # return the file path
+    echo "$base_yaml_path"
+}
+
+# MongoDB selectors are not supported in the CI.
+# So we remove them and let the provisioner handle the
+# volume provisioning.
+patch_mongodb_selector() {
+    local node_count=$1
+    local shard_count=$2
+    # validate topology and get the base yaml path
+    local base_yaml_path=$(validate_mongodb_topology $node_count $shard_count)
+
+    cat >> "$base_yaml_path" << EOF
+patches:
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: data-db-mongodb-sharded-mongos
+  patch: |-
+    - op: remove
+      path: /spec/volumeClaimTemplates/0/spec/selector
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: data-db-mongodb-sharded-configsvr
+  patch: |-
+    - op: remove
+      path: /spec/volumeClaimTemplates/0/spec/selector
+EOF
+
+    for ((i=0; i<shard_count; i++)); do
+        cat >> "$base_yaml_path" << EOF
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: data-db-mongodb-sharded-shard${i}-data
+  patch: |-
+    - op: remove
+      path: /spec/volumeClaimTemplates/0/spec/selector
+EOF
+    done
+}
+
 build_solution_base_manifests() {
     echo 'build solution-base manifests'
     MANIFEST_ONLY=true $SOLUTION_BASE_DIR/build.sh
@@ -139,24 +222,6 @@ build_solution_base_manifests() {
     sed -i "s/MONGODB_SHARDSERVER_RAM_LIMIT/${MONGODB_SHARDSERVER_RAM_LIMIT}/g" $DIR/_build/root/deploy/*
     sed -i "s/MONGODB_SHARDSERVER_RAM_REQUEST/${MONGODB_SHARDSERVER_RAM_REQUEST}/g" $DIR/_build/root/deploy/*
     sed -i "s/MONGODB_MONGOS_RAM_REQUEST/${MONGODB_MONGOS_RAM_REQUEST}/g" $DIR/_build/root/deploy/*
-
-    # Limits and requests for MongoDB are computed based on the current system
-    # Detect total system RAM in GiB
-    TOTAL_RAM_GB=$(awk '/MemTotal/ {printf "%.0f", $2/1024/1024}' /proc/meminfo)
-  
-    # Compute MongoDB settings based on the total RAM
-    MONGODB_WIRETIGER_CACHE_SIZE_GB=$((TOTAL_RAM_GB * 335 / 1000))
-    MONGODB_MONGOS_RAM_LIMIT=$((TOTAL_RAM_GB * 165 / 1000))Gi
-    MONGODB_SHARDSERVER_RAM_LIMIT=$((2 * MONGODB_WIRETIGER_CACHE_SIZE_GB))Gi
-    MONGODB_SHARDSERVER_RAM_REQUEST=${MONGODB_WIRETIGER_CACHE_SIZE_GB}Gi
-    MONGODB_MONGOS_RAM_REQUEST=$((TOTAL_RAM_GB * 33 / 1000))Gi
-
-    # Replace values before deploying
-    sed -i "s/MONGODB_SHARDSERVER_EXTRA_FLAGS/--wiredTigerCacheSizeGB=${MONGODB_WIRETIGER_CACHE_SIZE_GB}/g" $DIR/_build/root/deploy/*
-    sed -i "s/MONGODB_MONGOS_RAM_LIMIT/${MONGODB_MONGOS_RAM_LIMIT}/g" $DIR/_build/root/deploy/*
-    sed -i "s/MONGODB_SHARDSERVER_RAM_LIMIT/${MONGODB_SHARDSERVER_RAM_LIMIT}/g" $DIR/_build/root/deploy/*
-    sed -i "s/MONGODB_SHARDSERVER_RAM_REQUEST/${MONGODB_SHARDSERVER_RAM_REQUEST}/g" $DIR/_build/root/deploy/*
-    sed -i "s/MONGODB_MONGOS_RAM_REQUEST/${MONGODB_MONGOS_RAM_REQUEST}/g" $DIR/_build/root/deploy/*
 }
 
 get_image_from_deps() {
@@ -199,6 +264,8 @@ mongodb_sharded() {
         $SOLUTION_REGISTRY/os-shell=$(get_image_from_deps mongodb-shell) \
         $SOLUTION_REGISTRY/mongodb-exporter=$(get_image_from_deps mongodb-sharded-exporter)
 
+    patch_mongodb_selector "${NODE_COUNT:-1}" "${MONGODB_SHARD_COUNT}"
+
     kubectl apply -k "${DIR}"
 
     kubectl rollout status statefulset data-db-mongodb-sharded-mongos --timeout=5m

.github/scripts/end2end/install-kind-dependencies.sh

@@ -518,7 +518,7 @@ jobs:
         with:
           username: "${{ github.repository_owner }}"
           password: "${{ github.token }}"
-          registry: ghcr.io/zenko-dev/zenko-operator
+          registry: ghcr.io
       - name: Get token to access private repositories
         uses: actions/create-github-app-token@v1
         id: app-token

.github/workflows/end2end.yaml

@@ -241,6 +241,7 @@ groups:
       ) != (${replicas} - 1)
     for: 10m
     labels:
+      rs_nm: "{{ $labels.rs_nm }}"
       severity: warning
     annotations:
       description: "MongoDB replica set `{{ $labels.rs_nm }}` is not in the expected state. It does not have the expected number of SECONDARY members. Please ensure that all instances are running properly."

monitoring/mongodb/alerts.yaml

@@ -32,19 +32,15 @@ SOLUTION_REGISTRY=metalk8s-registry-from-config.invalid/${PRODUCT_LOWERNAME}-${V
 MONGODB_SHARDED_SINGLE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node.yaml
 MONGODB_SHARDED_SINGLE_NODE_TWO_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-1-node-2-shards.yaml
 MONGODB_SHARDED_THREE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes.yaml
-MONGODB_SHARDED_THREE_NODE_TWO_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes-2-shards.yaml
 MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-3-nodes-3-shards.yaml
 MONGODB_SHARDED_SIX_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes.yaml
 MONGODB_SHARDED_SIX_NODE_TWO_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes-2-shards.yaml
-MONGODB_SHARDED_SIX_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes-3-shards.yaml
 MONGODB_SHARDED_SIX_NODE_SIX_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-6-nodes-6-shards.yaml
 MONGODB_SHARDED_NINE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes.yaml
 MONGODB_SHARDED_NINE_NODE_THREE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-3-shards.yaml
-MONGODB_SHARDED_NINE_NODE_SIX_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-6-shards.yaml
 MONGODB_SHARDED_NINE_NODE_NINE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-9-nodes-9-shards.yaml
 MONGODB_SHARDED_TWELVE_NODE_PATH=${ISO_ROOT}/deploy/mongodb-sharded-12-nodes.yaml
 MONGODB_SHARDED_TWELVE_NODE_FOUR_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-12-nodes-4-shards.yaml
-MONGODB_SHARDED_TWELVE_NODE_EIGHT_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-12-nodes-8-shards.yaml
 MONGODB_SHARDED_TWELVE_NODE_TWELVE_SHARDS_PATH=${ISO_ROOT}/deploy/mongodb-sharded-12-nodes-12-shards.yaml
 
 SOLUTION_ENV='SOLUTION_ENV'
@@ -89,8 +85,7 @@ function render_mongodb_sharded_yamls()
     local OUTPUT_PATH=${1:-${OPERATOR_PATH}}
     local SHARD_COUNT=${2:-1}
     local NODE_COUNT=${3:-1}
-    local MAX_REPLICA_PER_SHARD=3
-    local REPLICA_COUNT=$(( $3 > $MAX_REPLICA_PER_SHARD ? $MAX_REPLICA_PER_SHARD : $3 ))
+    local DATA_REPLICA_COUNT=${4:-1}
 
     echo creating mongodb-sharded ${NODE_COUNT}-node yamls
     CHART_PATH="$SOLUTION_BASE_DIR/mongodb/charts/mongodb-sharded"
@@ -103,7 +98,7 @@ function render_mongodb_sharded_yamls()
         --set shards=${SHARD_COUNT} \
         --set mongos.replicaCount=${NODE_COUNT} \
         --set mongos.useStatefulSet=true \
-        --set shardsvr.dataNode.replicaCount=${REPLICA_COUNT} \
+        --set shardsvr.dataNode.replicaCount=${DATA_REPLICA_COUNT} \
         --set shardsvr.persistence.enabled=true \
         --set shardsvr.persistence.storageClass=${MONGODB_STORAGE_CLASS} \
         --set configsvr.replicaCount=$(( $NODE_COUNT > 2 ? 3 : 1 )) \
@@ -161,23 +156,19 @@ function render_mongodb_sharded_yamls()
 function mongodb_sharded_yamls()
 {
     # For now we maximize the number of replicas to 3, so each shard is a P-S-S
-    # Parameters are: shard count - node count - replica count
+    # Parameters are: shard count - node count - data replica count
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SINGLE_NODE_PATH}" 1 1 1
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SINGLE_NODE_TWO_SHARDS_PATH}" 2 1 1
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_PATH}" 1 3 3
-    render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_TWO_SHARDS_PATH}" 2 3 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_THREE_NODE_THREE_SHARDS_PATH}" 3 3 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_PATH}" 1 6 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_TWO_SHARDS_PATH}" 2 6 3
-    render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_THREE_SHARDS_PATH}" 3 6 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_SIX_NODE_SIX_SHARDS_PATH}" 6 6 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_PATH}" 1 9 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_THREE_SHARDS_PATH}" 3 9 3
-    render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_SIX_SHARDS_PATH}" 6 9 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_NINE_NODE_NINE_SHARDS_PATH}" 9 9 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_TWELVE_NODE_PATH}" 1 12 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_TWELVE_NODE_FOUR_SHARDS_PATH}" 4 12 3
-    render_mongodb_sharded_yamls "${MONGODB_SHARDED_TWELVE_NODE_EIGHT_SHARDS_PATH}" 8 12 3
     render_mongodb_sharded_yamls "${MONGODB_SHARDED_TWELVE_NODE_TWELVE_SHARDS_PATH}" 12 12 3
 }
 

solution-base/build.sh

@@ -4,10 +4,11 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{- if and .Values.shards .Values.metrics.enabled .Values.metrics.podMonitor.enabled }}
+{{- $i := 0 }}
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ printf "%s-shards-data" (include "common.names.fullname" $ ) }}
+  name: {{ printf "%s-shard%d-data" (include "common.names.fullname" $ ) $i }}
   namespace: {{ default (include "common.names.namespace" $) $.Values.metrics.podMonitor.namespace | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: shardsvr

solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml

@@ -1,22 +1,18 @@
 diff --git a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
-index d2c9c0cb..a01a0d68 100644
+index d2c9c0cb..657764ac 100644
 --- a/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
 +++ b/solution-base/mongodb/charts/mongodb-sharded/templates/shard/shard-data-podmonitor.yaml
-@@ -4,12 +4,10 @@ SPDX-License-Identifier: APACHE-2.0
+@@ -4,8 +4,7 @@ SPDX-License-Identifier: APACHE-2.0
  */}}
 
  {{- if and .Values.shards .Values.metrics.enabled .Values.metrics.podMonitor.enabled }}
 -{{- $replicas := .Values.shards | int }}
 -{{- range $i, $e := until $replicas }}
++{{- $i := 0 }}
  apiVersion: monitoring.coreos.com/v1
  kind: PodMonitor
  metadata:
--  name: {{ printf "%s-shard%d-data" (include "common.names.fullname" $ ) $i }}
-+  name: {{ printf "%s-shards-data" (include "common.names.fullname" $ ) }}
-   namespace: {{ default (include "common.names.namespace" $) $.Values.metrics.podMonitor.namespace | quote }}
-   labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
-     app.kubernetes.io/component: shardsvr
-@@ -36,7 +34,4 @@ spec:
+@@ -36,7 +35,4 @@ spec:
    selector:
      matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
        app.kubernetes.io/component: shardsvr