From 761b784419db08d9779505d3c4649db4b2f91978 Mon Sep 17 00:00:00 2001 From: cialloo Date: Sat, 4 Oct 2025 15:50:33 +0800 Subject: [PATCH] update --- .github/workflows/cd.yml | 4 ++++ script/cd.sh | 19 ++++++++++++++++++- script/k8s/deployment.yaml | 2 ++ src/etc/serverstatistics.yaml | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index da81b93..6a79003 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -36,6 +36,9 @@ env: CONTAINER_REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} CONTAINER_IMAGE_NAME: ${{ secrets.CONTAINER_IMAGE_NAME }} CONTAINER_IMAGE_TAG: ${{ inputs.image_tag || 'latest' }} + + # Application configuration + DATABASE_DSN: ${{ secrets.DATABASE_DSN }} jobs: deploy: @@ -60,6 +63,7 @@ jobs: echo "**Application:** \`${CONTAINER_IMAGE_NAME}\`" >> $GITHUB_STEP_SUMMARY echo "**Namespace:** \`${KUBERNETES_NAMESPACE}\`" >> $GITHUB_STEP_SUMMARY echo "**Image:** \`${CONTAINER_REGISTRY_URL}/${CONTAINER_REGISTRY_NAMESPACE}/${CONTAINER_IMAGE_NAME}:${CONTAINER_IMAGE_TAG}\`" >> $GITHUB_STEP_SUMMARY + echo "**Database:** Connected" >> $GITHUB_STEP_SUMMARY echo "**URL:** http://${KUBERNETES_INGRESS_HOST}" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "---" >> $GITHUB_STEP_SUMMARY diff --git a/script/cd.sh b/script/cd.sh index 42d74f6..2feea50 100644 --- a/script/cd.sh +++ b/script/cd.sh @@ -21,6 +21,9 @@ CONTAINER_REGISTRY_PASSWORD="${CONTAINER_REGISTRY_PASSWORD:-password}" CONTAINER_IMAGE_NAME="${CONTAINER_IMAGE_NAME:-stats-api}" CONTAINER_IMAGE_TAG="${CONTAINER_IMAGE_TAG:-latest}" +# Application Configuration +DATABASE_DSN="${DATABASE_DSN:-postgres://postgres:password@localhost:5432/steam_union?sslmode=disable}" + # ============================================================================= # Functions # ============================================================================= @@ -29,7 +32,19 @@ CONTAINER_IMAGE_TAG="${CONTAINER_IMAGE_TAG:-latest}" print_help() { echo "Usage: $0 [OPTIONS]" echo "" - echo "Options:" + echo "Environment Variables:" + echo " KUBECONFIG_DATA Kubernetes config data (base64 encoded)" + echo " KUBERNETES_URL Kubernetes API URL (default: https://kubernetes.default.svc)" + echo " KUBERNETES_NAMESPACE Kubernetes namespace (default: default)" + echo " KUBERNETES_INGRESS_HOST Ingress host (default: stats-api.example.com)" + echo " CONTAINER_REGISTRY_URL Container registry URL (default: 127.0.0.1)" + echo " CONTAINER_REGISTRY_USERNAME Registry username" + echo " CONTAINER_REGISTRY_PASSWORD Registry password" + echo " CONTAINER_IMAGE_NAME Image name (default: stats-api)" + echo " CONTAINER_IMAGE_TAG Image tag (default: latest)" + echo " DATABASE_DSN Database connection string" + echo "" + echo "Commands:" echo " deploy Deploy application to Kubernetes" echo " help Show this help message (default)" } @@ -89,6 +104,7 @@ deploy_to_kubernetes() { echo "Namespace: ${KUBERNETES_NAMESPACE}" echo "Image: ${FULL_IMAGE_NAME}" echo "Host: ${KUBERNETES_INGRESS_HOST}" + echo "Database DSN: ${DATABASE_DSN}" echo "" # Setup kubectl @@ -107,6 +123,7 @@ deploy_to_kubernetes() { export KUBERNETES_NAMESPACE export KUBERNETES_INGRESS_HOST export CONTAINER_IMAGE_NAME + export DATABASE_DSN for file in script/k8s/*.yaml; do echo "Applying: $(basename $file)" diff --git a/script/k8s/deployment.yaml b/script/k8s/deployment.yaml index 1b77b53..85303a5 100644 --- a/script/k8s/deployment.yaml +++ b/script/k8s/deployment.yaml @@ -60,3 +60,5 @@ spec: env: - name: TZ value: "UTC" + - name: DATABASE_DSN + value: "${DATABASE_DSN}" diff --git a/src/etc/serverstatistics.yaml b/src/etc/serverstatistics.yaml index e700975..32c60bb 100644 --- a/src/etc/serverstatistics.yaml +++ b/src/etc/serverstatistics.yaml @@ -3,4 +3,4 @@ Host: 0.0.0.0 Port: 8888 Database: - DSN: "host=localhost port=5432 user=postgres password=your_password dbname=steam_union sslmode=disable" + DSN: "${DATABASE_DSN}" # postgres: host=localhost port=5432 user=postgres password=your_password dbname=steam_union sslmode=disable