Compare commits
2 Commits
9a7b2fec72
...
fd1ba7fbe0
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fd1ba7fbe0 | ||
![]() |
5edf14695f |
@@ -21,4 +21,13 @@ spec:
|
|||||||
env:
|
env:
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .apps.redis.timezone }}"
|
value: "{{ .apps.redis.timezone }}"
|
||||||
|
- name: REDIS_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: redis-secrets
|
||||||
|
key: apps.redis.password
|
||||||
|
command:
|
||||||
|
- redis-server
|
||||||
|
- --requirepass
|
||||||
|
- $(REDIS_PASSWORD)
|
||||||
restartPolicy: Always
|
restartPolicy: Always
|
||||||
|
@@ -124,14 +124,14 @@ fi
|
|||||||
# Discover available disks
|
# Discover available disks
|
||||||
echo "Discovering available disks..." >&2
|
echo "Discovering available disks..." >&2
|
||||||
if [ "$TALOS_MODE" = "insecure" ]; then
|
if [ "$TALOS_MODE" = "insecure" ]; then
|
||||||
AVAILABLE_DISKS_RAW=$(talosctl -n "$NODE_IP" get disks --insecure -o json 2>/dev/null | \
|
DISKS_JSON=$(talosctl -n "$NODE_IP" get disks --insecure -o json 2>/dev/null | \
|
||||||
jq -s -r '.[] | select(.spec.size > 10000000000) | .metadata.id')
|
jq -s '[.[] | select(.spec.size > 10000000000) | {path: ("/dev/" + .metadata.id), size: .spec.size}]')
|
||||||
else
|
else
|
||||||
AVAILABLE_DISKS_RAW=$(talosctl -n "$NODE_IP" get disks -o json 2>/dev/null | \
|
DISKS_JSON=$(talosctl -n "$NODE_IP" get disks -o json 2>/dev/null | \
|
||||||
jq -s -r '.[] | select(.spec.size > 10000000000) | .metadata.id')
|
jq -s '[.[] | select(.spec.size > 10000000000) | {path: ("/dev/" + .metadata.id), size: .spec.size}]')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$AVAILABLE_DISKS_RAW" ]; then
|
if [ "$(echo "$DISKS_JSON" | jq 'length')" -eq 0 ]; then
|
||||||
echo "Error: No suitable disks found (must be >10GB)" >&2
|
echo "Error: No suitable disks found (must be >10GB)" >&2
|
||||||
echo "Available disks:" >&2
|
echo "Available disks:" >&2
|
||||||
if [ "$TALOS_MODE" = "insecure" ]; then
|
if [ "$TALOS_MODE" = "insecure" ]; then
|
||||||
@@ -142,11 +142,11 @@ if [ -z "$AVAILABLE_DISKS_RAW" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Convert to JSON array
|
# Use the disks with size info directly
|
||||||
AVAILABLE_DISKS=$(echo "$AVAILABLE_DISKS_RAW" | jq -R -s 'split("\n") | map(select(length > 0)) | map("/dev/" + .)')
|
AVAILABLE_DISKS="$DISKS_JSON"
|
||||||
|
|
||||||
# Select the first disk as default (largest first)
|
# Select the first disk as default
|
||||||
SELECTED_DISK=$(echo "$AVAILABLE_DISKS" | jq -r '.[0]')
|
SELECTED_DISK=$(echo "$AVAILABLE_DISKS" | jq -r '.[0].path')
|
||||||
|
|
||||||
echo "✅ Discovered $(echo "$AVAILABLE_DISKS" | jq -r 'length') suitable disks" >&2
|
echo "✅ Discovered $(echo "$AVAILABLE_DISKS" | jq -r 'length') suitable disks" >&2
|
||||||
echo "✅ Selected disk: $SELECTED_DISK" >&2
|
echo "✅ Selected disk: $SELECTED_DISK" >&2
|
||||||
|
@@ -260,7 +260,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
|
|||||||
# Parse JSON response
|
# Parse JSON response
|
||||||
INTERFACE=$(echo "$NODE_INFO" | jq -r '.interface')
|
INTERFACE=$(echo "$NODE_INFO" | jq -r '.interface')
|
||||||
SELECTED_DISK=$(echo "$NODE_INFO" | jq -r '.selected_disk')
|
SELECTED_DISK=$(echo "$NODE_INFO" | jq -r '.selected_disk')
|
||||||
AVAILABLE_DISKS=$(echo "$NODE_INFO" | jq -r '.disks | join(", ")')
|
AVAILABLE_DISKS=$(echo "$NODE_INFO" | jq -r '.disks[] | "\(.path) (\((.size / 1000000000) | floor)GB)"' | paste -sd, -)
|
||||||
|
|
||||||
print_success "Hardware detected:"
|
print_success "Hardware detected:"
|
||||||
print_info " - Interface: $INTERFACE"
|
print_info " - Interface: $INTERFACE"
|
||||||
@@ -272,9 +272,9 @@ if [ "${SKIP_HARDWARE}" = false ]; then
|
|||||||
read -p "Use selected disk '$SELECTED_DISK'? (Y/n): " -r use_disk
|
read -p "Use selected disk '$SELECTED_DISK'? (Y/n): " -r use_disk
|
||||||
if [[ $use_disk =~ ^[Nn]$ ]]; then
|
if [[ $use_disk =~ ^[Nn]$ ]]; then
|
||||||
echo "Available disks:"
|
echo "Available disks:"
|
||||||
echo "$NODE_INFO" | jq -r '.disks[]' | nl -w2 -s') '
|
echo "$NODE_INFO" | jq -r '.disks[] | "\(.path) (\((.size / 1000000000) | floor)GB)"' | nl -w2 -s') '
|
||||||
read -p "Enter disk number: " -r disk_num
|
read -p "Enter disk number: " -r disk_num
|
||||||
SELECTED_DISK=$(echo "$NODE_INFO" | jq -r ".disks[$((disk_num-1))]")
|
SELECTED_DISK=$(echo "$NODE_INFO" | jq -r ".disks[$((disk_num-1))].path")
|
||||||
if [ "$SELECTED_DISK" = "null" ] || [ -z "$SELECTED_DISK" ]; then
|
if [ "$SELECTED_DISK" = "null" ] || [ -z "$SELECTED_DISK" ]; then
|
||||||
print_error "Invalid disk selection"
|
print_error "Invalid disk selection"
|
||||||
continue
|
continue
|
||||||
@@ -359,6 +359,11 @@ if [ "${SKIP_HARDWARE}" = false ]; then
|
|||||||
read -p "Do you want to register a worker node? (y/N): " -r register_worker
|
read -p "Do you want to register a worker node? (y/N): " -r register_worker
|
||||||
|
|
||||||
if [[ $register_worker =~ ^[Yy]$ ]]; then
|
if [[ $register_worker =~ ^[Yy]$ ]]; then
|
||||||
|
# Find first available worker number
|
||||||
|
while [ -n "$(wild-config "cluster.nodes.active.\"${HOSTNAME_PREFIX}worker-${WORKER_COUNT}\".role" 2>/dev/null)" ] && [ "$(wild-config "cluster.nodes.active.\"${HOSTNAME_PREFIX}worker-${WORKER_COUNT}\".role" 2>/dev/null)" != "null" ]; do
|
||||||
|
WORKER_COUNT=$((WORKER_COUNT + 1))
|
||||||
|
done
|
||||||
|
|
||||||
NODE_NAME="${HOSTNAME_PREFIX}worker-${WORKER_COUNT}"
|
NODE_NAME="${HOSTNAME_PREFIX}worker-${WORKER_COUNT}"
|
||||||
read -p "Enter current IP for worker node $NODE_NAME: " -r WORKER_IP
|
read -p "Enter current IP for worker node $NODE_NAME: " -r WORKER_IP
|
||||||
|
|
||||||
@@ -388,7 +393,7 @@ if [ "${SKIP_HARDWARE}" = false ]; then
|
|||||||
# Parse JSON response
|
# Parse JSON response
|
||||||
INTERFACE=$(echo "$WORKER_INFO" | jq -r '.interface')
|
INTERFACE=$(echo "$WORKER_INFO" | jq -r '.interface')
|
||||||
SELECTED_DISK=$(echo "$WORKER_INFO" | jq -r '.selected_disk')
|
SELECTED_DISK=$(echo "$WORKER_INFO" | jq -r '.selected_disk')
|
||||||
AVAILABLE_DISKS=$(echo "$WORKER_INFO" | jq -r '.disks | join(", ")')
|
AVAILABLE_DISKS=$(echo "$WORKER_INFO" | jq -r '.disks[] | "\(.path) (\((.size / 1000000000) | floor)GB)"' | paste -sd, -)
|
||||||
|
|
||||||
print_success "Hardware detected for worker node $NODE_NAME:"
|
print_success "Hardware detected for worker node $NODE_NAME:"
|
||||||
print_info " - Interface: $INTERFACE"
|
print_info " - Interface: $INTERFACE"
|
||||||
@@ -400,9 +405,9 @@ if [ "${SKIP_HARDWARE}" = false ]; then
|
|||||||
read -p "Use selected disk '$SELECTED_DISK'? (Y/n): " -r use_disk
|
read -p "Use selected disk '$SELECTED_DISK'? (Y/n): " -r use_disk
|
||||||
if [[ $use_disk =~ ^[Nn]$ ]]; then
|
if [[ $use_disk =~ ^[Nn]$ ]]; then
|
||||||
echo "Available disks:"
|
echo "Available disks:"
|
||||||
echo "$WORKER_INFO" | jq -r '.disks[]' | nl -w2 -s') '
|
echo "$WORKER_INFO" | jq -r '.disks[] | "\(.path) (\((.size / 1000000000) | floor)GB)"' | nl -w2 -s') '
|
||||||
read -p "Enter disk number: " -r disk_num
|
read -p "Enter disk number: " -r disk_num
|
||||||
SELECTED_DISK=$(echo "$WORKER_INFO" | jq -r ".disks[$((disk_num-1))]")
|
SELECTED_DISK=$(echo "$WORKER_INFO" | jq -r ".disks[$((disk_num-1))].path")
|
||||||
if [ "$SELECTED_DISK" = "null" ] || [ -z "$SELECTED_DISK" ]; then
|
if [ "$SELECTED_DISK" = "null" ] || [ -z "$SELECTED_DISK" ]; then
|
||||||
print_error "Invalid disk selection"
|
print_error "Invalid disk selection"
|
||||||
continue
|
continue
|
||||||
|
Reference in New Issue
Block a user