Update env var name.

This commit is contained in:
2025-10-12 00:41:04 +00:00
parent 9f2d5fc7fb
commit 9d1abc3e90
16 changed files with 57 additions and 57 deletions

View File

@@ -37,8 +37,8 @@ func (m *Manager) Initialize() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to get current directory: %w", err) return fmt.Errorf("failed to get current directory: %w", err)
} }
if os.Getenv("WILD_CENTRAL_DATA") != "" { if os.Getenv("WILD_API_DATA_DIR") != "" {
dataDir = os.Getenv("WILD_CENTRAL_DATA") dataDir = os.Getenv("WILD_API_DATA_DIR")
} else { } else {
dataDir = filepath.Join(cwd, "data") dataDir = filepath.Join(cwd, "data")
} }

View File

@@ -554,7 +554,7 @@ func (m *Manager) Deploy(instanceName, serviceName, opID string, broadcaster *op
env := os.Environ() env := os.Environ()
env = append(env, env = append(env,
fmt.Sprintf("WILD_INSTANCE=%s", instanceName), fmt.Sprintf("WILD_INSTANCE=%s", instanceName),
fmt.Sprintf("WILD_CENTRAL_DATA=%s", m.dataDir), fmt.Sprintf("WILD_API_DATA_DIR=%s", m.dataDir),
fmt.Sprintf("KUBECONFIG=%s", kubeconfigPath), fmt.Sprintf("KUBECONFIG=%s", kubeconfigPath),
) )
fmt.Printf("[DEBUG] Environment configured: WILD_INSTANCE=%s, KUBECONFIG=%s\n", instanceName, kubeconfigPath) fmt.Printf("[DEBUG] Environment configured: WILD_INSTANCE=%s, KUBECONFIG=%s\n", instanceName, kubeconfigPath)

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
CERT_MANAGER_DIR="${CLUSTER_SETUP_DIR}/cert-manager" CERT_MANAGER_DIR="${CLUSTER_SETUP_DIR}/cert-manager"
@@ -65,7 +65,7 @@ kubectl wait --for=condition=Available deployment/cert-manager-webhook -n cert-m
# Create Cloudflare API token secret # Create Cloudflare API token secret
# Read token from Wild Central secrets file # Read token from Wild Central secrets file
echo "🔐 Creating Cloudflare API token secret..." echo "🔐 Creating Cloudflare API token secret..."
SECRETS_FILE="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}/secrets.yaml" SECRETS_FILE="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}/secrets.yaml"
CLOUDFLARE_API_TOKEN=$(yq '.cloudflare.token' "$SECRETS_FILE" 2>/dev/null) CLOUDFLARE_API_TOKEN=$(yq '.cloudflare.token' "$SECRETS_FILE" 2>/dev/null)
CLOUDFLARE_API_TOKEN=$(echo "$CLOUDFLARE_API_TOKEN") CLOUDFLARE_API_TOKEN=$(echo "$CLOUDFLARE_API_TOKEN")

View File

@@ -9,14 +9,14 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA environment variable is not set" echo "❌ ERROR: WILD_API_DATA_DIR environment variable is not set"
exit 1 exit 1
fi fi
# Get the instance directory path # Get the instance directory path
get_instance_dir() { get_instance_dir() {
echo "${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" echo "${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
} }
# Get the secrets file path # Get the secrets file path

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
COREDNS_DIR="${CLUSTER_SETUP_DIR}/coredns" COREDNS_DIR="${CLUSTER_SETUP_DIR}/coredns"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
DOCKER_REGISTRY_DIR="${CLUSTER_SETUP_DIR}/docker-registry" DOCKER_REGISTRY_DIR="${CLUSTER_SETUP_DIR}/docker-registry"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
EXTERNALDNS_DIR="${CLUSTER_SETUP_DIR}/externaldns" EXTERNALDNS_DIR="${CLUSTER_SETUP_DIR}/externaldns"
@@ -49,7 +49,7 @@ kubectl apply -k ${EXTERNALDNS_DIR}/kustomize
# Setup Cloudflare API token secret # Setup Cloudflare API token secret
echo "🔐 Creating Cloudflare API token secret..." echo "🔐 Creating Cloudflare API token secret..."
SECRETS_FILE="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}/secrets.yaml" SECRETS_FILE="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}/secrets.yaml"
CLOUDFLARE_API_TOKEN=$(yq '.cloudflare.token' "$SECRETS_FILE" 2>/dev/null | tr -d '"') CLOUDFLARE_API_TOKEN=$(yq '.cloudflare.token' "$SECRETS_FILE" 2>/dev/null | tr -d '"')
if [ -z "$CLOUDFLARE_API_TOKEN" ] || [ "$CLOUDFLARE_API_TOKEN" = "null" ]; then if [ -z "$CLOUDFLARE_API_TOKEN" ] || [ "$CLOUDFLARE_API_TOKEN" = "null" ]; then

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
KUBERNETES_DASHBOARD_DIR="${CLUSTER_SETUP_DIR}/kubernetes-dashboard" KUBERNETES_DASHBOARD_DIR="${CLUSTER_SETUP_DIR}/kubernetes-dashboard"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
LONGHORN_DIR="${CLUSTER_SETUP_DIR}/longhorn" LONGHORN_DIR="${CLUSTER_SETUP_DIR}/longhorn"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
METALLB_DIR="${CLUSTER_SETUP_DIR}/metallb" METALLB_DIR="${CLUSTER_SETUP_DIR}/metallb"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CONFIG_FILE="${INSTANCE_DIR}/config.yaml" CONFIG_FILE="${INSTANCE_DIR}/config.yaml"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
NFS_DIR="${CLUSTER_SETUP_DIR}/nfs" NFS_DIR="${CLUSTER_SETUP_DIR}/nfs"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "ERROR: WILD_CENTRAL_DATA is not set" echo "ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
NFD_DIR="${CLUSTER_SETUP_DIR}/node-feature-discovery" NFD_DIR="${CLUSTER_SETUP_DIR}/node-feature-discovery"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
NVIDIA_PLUGIN_DIR="${CLUSTER_SETUP_DIR}/nvidia-device-plugin" NVIDIA_PLUGIN_DIR="${CLUSTER_SETUP_DIR}/nvidia-device-plugin"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
TRAEFIK_DIR="${CLUSTER_SETUP_DIR}/traefik" TRAEFIK_DIR="${CLUSTER_SETUP_DIR}/traefik"

View File

@@ -8,9 +8,9 @@ if [ -z "${WILD_INSTANCE}" ]; then
exit 1 exit 1
fi fi
# Ensure WILD_CENTRAL_DATA is set # Ensure WILD_API_DATA_DIR is set
if [ -z "${WILD_CENTRAL_DATA}" ]; then if [ -z "${WILD_API_DATA_DIR}" ]; then
echo "❌ ERROR: WILD_CENTRAL_DATA is not set" echo "❌ ERROR: WILD_API_DATA_DIR is not set"
exit 1 exit 1
fi fi
@@ -20,7 +20,7 @@ if [ -z "${KUBECONFIG}" ]; then
exit 1 exit 1
fi fi
INSTANCE_DIR="${WILD_CENTRAL_DATA}/instances/${WILD_INSTANCE}" INSTANCE_DIR="${WILD_API_DATA_DIR}/instances/${WILD_INSTANCE}"
CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services" CLUSTER_SETUP_DIR="${INSTANCE_DIR}/setup/cluster-services"
UTILS_DIR="${CLUSTER_SETUP_DIR}/utils" UTILS_DIR="${CLUSTER_SETUP_DIR}/utils"

View File

@@ -19,7 +19,7 @@ func main() {
startTime = time.Now() startTime = time.Now()
// Get data directory from environment or use default // Get data directory from environment or use default
dataDir := os.Getenv("WILD_CENTRAL_DATA") dataDir := os.Getenv("WILD_API_DATA_DIR")
if dataDir == "" { if dataDir == "" {
dataDir = "/var/lib/wild-central" dataDir = "/var/lib/wild-central"
} }