dvirlabs/apps-gitops
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to merge to cloudflred in infra ns

Browse Source
This commit is contained in:
dvirlabs 2025-06-19 22:19:07 +03:00
parent 081117ec59
commit a301e74f63
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
automation/cloudflared-sync.sh
View File

@ -1,52 +1,41 @@
#!/bin/bash # CONFIG
set -e ORIGINAL_FILE="../infra/cloudflared/values.yaml"
MERGED_FILE="../infra/cloudflared/values.yaml"
GENERATED_FILE="generated-values/cloudflared-values.yaml"
echo "🔍 Scanning for apps with cname.yaml..." echo "🔁 Merging new entries into: $ORIGINAL_FILE"
mkdir -p generated-values # Extract original ingress list
ORIGINAL_INGRESS=$(yq eval '.cloudflare.ingress' "$ORIGINAL_FILE")
TEMP_FILE=$(mktemp)
# Initial empty cloudflared config # Start a fresh ingress list
cat <<EOF > generated-values/cloudflared-values.yaml echo "$ORIGINAL_INGRESS" | yq eval '.' - > "$TEMP_FILE"
ingress:
- service: http_status:404
EOF
# === CONFIGURATION === # Loop over new entries
REPOS=( yq eval '.ingress[]' "$GENERATED_FILE" | yq eval -o=json '.' - | jq -c '.[]' | while read -r new_entry; do
"https://git.dvirlabs.com/dvirlabs/sandbox.git" hostname=$(echo "$new_entry" | jq -r '.hostname')
) service=$(echo "$new_entry" | jq -r '.service')
WORKDIR=".tmp-repos"
rm -rf $WORKDIR # Check if hostname already exists
mkdir -p $WORKDIR exists=$(yq e ".cloudflare.ingress[] | select(.hostname == \"$hostname\")" "$ORIGINAL_FILE")
# === CLONE AND SCAN === if [ -z "$exists" ]; then
for repo_url in "${REPOS[@]}"; do echo "➕ Adding $hostname → $service"
repo_name=$(basename "$repo_url" .git) # Append new entry
echo "📦 Cloning $repo_name..." yq eval ". += [{\"hostname\": \"$hostname\", \"service\": \"$service\"}]" -i "$TEMP_FILE"
else
git clone --depth=1 "$repo_url" "$WORKDIR/$repo_name" echo "⚠️ $hostname already exists, skipping"
find "$WORKDIR/$repo_name/manifests" -name cname.yaml | while read -r cname_file; do
app_name=$(basename $(dirname "$cname_file"))
enabled=$(yq '.enabled' "$cname_file")
if [[ "$enabled" == "true" ]]; then
hostname=$(yq '.hostname' "$cname_file")
service="http://${app_name}.my-apps.svc.cluster.local:80"
echo "✅ Found $hostname → $service"
# Add to generated-values
yq eval ".ingress = [{\"hostname\": \"$hostname\", \"service\": \"$service\"}] + .ingress" \
-i generated-values/cloudflared-values.yaml
fi fi
done
done done
echo "✅ Done! See: generated-values/cloudflared-values.yaml" # Rebuild final values.yaml with updated ingress
yq eval '
.cloudflare.ingress = load("'"$TEMP_FILE"'") |
.cloudflare.tunnelName = strenv(TUNNEL_NAME) |
.cloudflare.enableWarp = false |
.cloudflare.secretName = "cloudflared-creds" |
.cloudflared = load("'"$ORIGINAL_FILE"'") | .cloudflared
' "$ORIGINAL_FILE" > "$MERGED_FILE"
echo echo "✅ Patched values.yaml saved to: $MERGED_FILE"
echo "📄 ==== cloudflared-values.yaml ==== "
cat generated-values/cloudflared-values.yaml
echo "===================================="