Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions base/api/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
labels:
app: api
spec:
terminationGracePeriodSeconds: 30
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are defaults already on the cluster

serviceAccountName: server-creator
dnsConfig:
options:
Expand Down
4 changes: 2 additions & 2 deletions base/api/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: api
namespace: 5stack
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: "4G"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no , for demos. needs to be bigger

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted to 4G in 1d2a406.

nginx.ingress.kubernetes.io/client-max-body-size: "4G"
nginx.ingress.kubernetes.io/proxy-body-size: "500M"
nginx.ingress.kubernetes.io/client-max-body-size: "500M"
spec:
ingressClassName: nginx
rules:
Expand Down
5 changes: 5 additions & 0 deletions base/game-server-node-connector/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ metadata:
name: game-server-node-connector
namespace: 5stack
spec:
updateStrategy:
Comment thread
lukepolo marked this conversation as resolved.
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
selector:
matchLabels:
app: game-server-node-connector
Expand All @@ -14,6 +18,7 @@ spec:
labels:
app: game-server-node-connector
spec:
terminationGracePeriodSeconds: 30
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are defaults already on the cluster

dnsConfig:
options:
- name: ndots
Expand Down
1 change: 1 addition & 0 deletions base/hasura/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
labels:
app: hasura
spec:
terminationGracePeriodSeconds: 30
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are defaults already on the cluster

dnsConfig:
options:
- name: ndots
Expand Down
4 changes: 2 additions & 2 deletions base/redis/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
namespace: 5stack
data:
redis.conf: |
# Persistence strategy: hybrid RDB snapshots + AOF for durability.
# RDB provides point-in-time snapshots; AOF provides write-level durability.
tcp-keepalive 240
appendonly no
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are required for queues

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Restored appendonly no and save "" in 1d2a406.

save ""
maxmemory-policy noeviction
user default on >${REDIS_PASSWORD} allcommands allkeys +@all &*
io-threads-do-reads yes
Expand Down
13 changes: 11 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
set -euo pipefail
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while testing this seems to break things

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed set -euo pipefail and reverted the error-handling wrappers in 1d2a406.


source setup-env.sh "$@"
check_sudo
Expand All @@ -17,7 +18,10 @@ mkdir -p /opt/5stack/custom-plugins
echo "Environment files setup complete"

echo "Installing K3s"
curl -sfL https://get.k3s.io | sh -s - --disable=traefik
if ! curl -sfL https://get.k3s.io | sh -s - --disable=traefik; then
echo "ERROR: K3s installation failed"
exit 1
fi

cat <<-'SCRIPT' >/usr/local/bin/5stack-cpu-state-check.sh
#!/bin/bash
Expand Down Expand Up @@ -46,7 +50,12 @@ systemctl daemon-reload
echo "Installing Ingress Nginx, this may take a few minutes..."
install_ingress_nginx true

kubectl label node $(kubectl get nodes -o jsonpath='{.items[0].metadata.name}') 5stack-api=true 5stack-hasura=true 5stack-minio=true 5stack-timescaledb=true 5stack-redis=true 5stack-typesense=true 5stack-web=true
NODE_NAME=$(kubectl get nodes -o jsonpath='{.items[0].metadata.name}')
if [ -z "$NODE_NAME" ]; then
echo "ERROR: Could not determine node name"
exit 1
fi
kubectl label node "$NODE_NAME" 5stack-api=true 5stack-hasura=true 5stack-minio=true 5stack-timescaledb=true 5stack-redis=true 5stack-typesense=true 5stack-web=true

source update.sh "$@"

Expand Down
5 changes: 5 additions & 0 deletions setup-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ if [ -z "$WEB_DOMAIN" ] || [ -z "$WS_DOMAIN" ] || [ -z "$API_DOMAIN" ] || [ -z "
echo "Base domain cannot be empty. Please enter your base domain (e.g. example.com):"
read WEB_DOMAIN
fi

if [ -z "$WEB_DOMAIN" ] || echo "$WEB_DOMAIN" | grep -q ' '; then
echo "ERROR: Invalid domain '$WEB_DOMAIN'. Domain must be non-empty and contain no spaces."
exit 1
fi

echo "WEB_DOMAIN: $WEB_DOMAIN"
update_env_var "overlays/config/api-config.env" "WEB_DOMAIN" "$WEB_DOMAIN"
Expand Down