Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion environments/eck-ror/kind-cluster/ror/base/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,21 @@ spec:
secretKeyRef:
name: eck-ror-kibana-user
key: ${ROR_ECK_KIBANA_USER_SECRET_KEY}
- name: ES_JAVA_OPTS
value: "-Dcom.readonlyrest.settings.loading.attempts.count=0 -Dcom.readonlyrest.settings.loading.delay=0s"
volumeMounts:
- name: config-ror
mountPath: /usr/share/elasticsearch/config/readonlyrest.yml
subPath: readonlyrest.yml
- name: config-log4j2
mountPath: /usr/share/elasticsearch/config/log4j2.properties
subPath: log4j2.properties

volumes:
- name: config-ror
configMap:
name: config-readonlyrest.yml
- name: config-log4j2
configMap:
name: config-log4j2.properties.yml
name: config-log4j2.properties.yml

2 changes: 1 addition & 1 deletion environments/eck-ror/kind-cluster/ror/base/kbn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
cookiePass: '12312313123213123213123adadasdasdasd'
logLevel: trace
store_sessions_in_index: true
${ELATICSEARCH_USER}
${ELATICSEARCH_USER}
${ELATICSEARCH_PASSWORD}

podTemplate:
Expand Down
13 changes: 8 additions & 5 deletions environments/eck-ror/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,20 +226,23 @@ check_pods_running() {
while read -r line; do
ready=$(echo "$line" | awk '{print $2}')
status=$(echo "$line" | awk '{print $3}')

if [[ "$status" != "Running" || "$ready" != "1/1" ]]; then

cur="${ready%/*}"
total="${ready#*/}"

if [[ "$status" != "Running" || "$cur" != "$total" ]]; then
all_ready=false
fi
done <<< "$pod_status"
echo -e "$pod_status"

echo -e "$pod_status"
$all_ready && return 0 || return 1
}

TIMEOUT_IN_SECONDS=300
INTERVAL_IN_SECONDS=5

echo "Waiting for all pods to be in Running and Ready state (1/1)..."
echo "Waiting for all pods to be in Running and Ready state..."
elapsed_time=0
while ! check_pods_running; do
sleep $INTERVAL_IN_SECONDS
Expand All @@ -250,4 +253,4 @@ while ! check_pods_running; do
exit 1
fi
done
echo "All pods are in Running and Ready (1/1) state."
echo "All pods are in Running and Ready state."
2 changes: 1 addition & 1 deletion environments/elk-ror/base.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- discovery.type=single-node
- bootstrap.memory_lock=true
# for a sake of debugging and profiling
- "ES_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.rmi.port=9010 -Djava.rmi.server.hostname=127.0.0.1"
- "ES_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -Dcom.readonlyrest.settings.loading.attempts.count=0 -Dcom.readonlyrest.settings.loading.delay=0s -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.rmi.port=9010 -Djava.rmi.server.hostname=127.0.0.1"
# for a sake of ROR settings marked as "<-- related to ECK environment -->"
- KIBANA_SERVICE_ACCOUNT_TOKEN=UNUSED
- INTERNAL_PROBE_PASS=UNUSED
Expand Down
2 changes: 1 addition & 1 deletion environments/elk-ror/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ if ! docker compose $DOCKER_COMPOSE_FILES config > /dev/null; then
fi

handle_docker_compose_error() {
docker compose $DOCKER_COMPOSE_FILES logs -f > elk-ror.log 2>&1 &
docker compose $DOCKER_COMPOSE_FILES logs > elk-ror.log 2>&1
exit 1
}

Expand Down
Loading