diff --git a/.github/scripts/end2end/fix-zookeeper.sh b/.github/scripts/end2end/fix-zookeeper.sh index 1feb29df59..aedcc7a257 100755 --- a/.github/scripts/end2end/fix-zookeeper.sh +++ b/.github/scripts/end2end/fix-zookeeper.sh @@ -63,6 +63,10 @@ done # Patch the StatefulSet with JVM flags to disable container support # as ubuntu runners now are incompatible with zookeeper. +# Also raise the exec probe timeouts: operators without the ZKOP-529 fix +# leave probe timeoutSeconds at 0, which Kubernetes floors to 1s; with +# ExecProbeTimeout enforced the readiness script gets killed before the +# observer-to-participant promotion completes and the pod never turns Ready. kubectl -n "${NAMESPACE}" patch statefulset "${ZK_STS_NAME}" --type='strategic' \ -p '{ "spec": { @@ -76,7 +80,13 @@ kubectl -n "${NAMESPACE}" patch statefulset "${ZK_STS_NAME}" --type='strategic' "name": "JVMFLAGS", "value": "-Xmx512m -Xms512m -XX:-UseContainerSupport -XX:ActiveProcessorCount=1 -Djava.awt.headless=true -Dzookeeper.log.dir=/data/logs -Dzookeeper.root.logger=INFO,CONSOLE -Dlog4j.configuration=file:/data/conf/log4j.properties" } - ] + ], + "readinessProbe": { + "timeoutSeconds": 10 + }, + "livenessProbe": { + "timeoutSeconds": 10 + } } ] } diff --git a/solution/deps.yaml b/solution/deps.yaml index e0df039ba3..ab9c9911ef 100644 --- a/solution/deps.yaml +++ b/solution/deps.yaml @@ -125,7 +125,7 @@ vault: dashboard: vault2/vault-dashboards policy: vault2/vault-policies image: vault2 - tag: 8.10.5 + tag: 8.10.6 envsubst: VAULT_TAG zenko-operator: sourceRegistry: ghcr.io/scality