@@ -112,14 +112,10 @@ jobs:
112112 echo "Reading Netbird IPs from secrets..."
113113
114114 SPOKE_1_IP="${{ secrets.SPOKE_1_NETBIRD_IP }}"
115- SPOKE_2_IP="${{ secrets.SPOKE_2_NETBIRD_IP }}"
116- SPOKE_3_IP="${{ secrets.SPOKE_3_NETBIRD_IP }}"
117115
118116 echo "SPOKE_1_NETBIRD_IP: $SPOKE_1_IP"
119- echo "SPOKE_2_NETBIRD_IP: $SPOKE_2_IP"
120- echo "SPOKE_3_NETBIRD_IP: $SPOKE_3_IP"
121117
122- SPOKE_IPS="$SPOKE_1_IP $SPOKE_2_IP $SPOKE_3_IP "
118+ SPOKE_IPS="$SPOKE_1_IP"
123119
124120 for ip in $SPOKE_IPS; do
125121 if [ ! -z "$ip" ]; then
@@ -169,7 +165,7 @@ jobs:
169165 SPOKE_CLUSTERS="${{ secrets.SPOKE_CLUSTERS }}"
170166 if [ -z "$SPOKE_CLUSTERS" ]; then
171167 echo "⚠ SPOKE_CLUSTERS secret not set, using default: spoke-1"
172- SPOKE_CLUSTERS="spoke-1 "
168+ SPOKE_CLUSTERS="spoke-2 "
173169 fi
174170
175171 IFS=',' read -ra CLUSTERS <<< "$SPOKE_CLUSTERS"
@@ -180,24 +176,14 @@ jobs:
180176
181177 # Get secrets based on cluster name
182178 case "$cluster" in
183- spoke-1)
179+
180+ spoke-2)
181+ # Helper: User wants to use spoke-2 context but with spoke-1 credentials
184182 NETBIRD_IP="${{ secrets.SPOKE_1_NETBIRD_IP }}"
185183 CA_CERT_B64="${{ secrets.SPOKE_1_CA_CERT }}"
186184 CLIENT_CERT_B64="${{ secrets.SPOKE_1_CLIENT_CERT }}"
187185 CLIENT_KEY_B64="${{ secrets.SPOKE_1_CLIENT_KEY }}"
188186 ;;
189- spoke-2)
190- NETBIRD_IP="${{ secrets.SPOKE_2_NETBIRD_IP }}"
191- CA_CERT_B64="${{ secrets.SPOKE_2_CA_CERT }}"
192- CLIENT_CERT_B64="${{ secrets.SPOKE_2_CLIENT_CERT }}"
193- CLIENT_KEY_B64="${{ secrets.SPOKE_2_CLIENT_KEY }}"
194- ;;
195- spoke-3)
196- NETBIRD_IP="${{ secrets.SPOKE_3_NETBIRD_IP }}"
197- CA_CERT_B64="${{ secrets.SPOKE_3_CA_CERT }}"
198- CLIENT_CERT_B64="${{ secrets.SPOKE_3_CLIENT_CERT }}"
199- CLIENT_KEY_B64="${{ secrets.SPOKE_3_CLIENT_KEY }}"
200- ;;
201187 *)
202188 echo " ⚠ Unknown cluster: $cluster"
203189 continue
@@ -355,7 +341,7 @@ jobs:
355341 # Build workload_clusters map from SPOKE_CLUSTERS secret
356342 SPOKE_CLUSTERS="${{ secrets.SPOKE_CLUSTERS }}"
357343 if [ -z "$SPOKE_CLUSTERS" ]; then
358- SPOKE_CLUSTERS="spoke-1,spoke-2,spoke-3 "
344+ SPOKE_CLUSTERS="spoke-2 "
359345 fi
360346
361347 # Convert comma-separated list to Terraform map format
@@ -559,8 +545,8 @@ jobs:
559545 # Read spoke cluster list from secrets
560546 SPOKE_CLUSTERS="${{ secrets.SPOKE_CLUSTERS }}"
561547 if [ -z "$SPOKE_CLUSTERS" ]; then
562- echo "⚠ SPOKE_CLUSTERS secret not set, using default: spoke-1 "
563- SPOKE_CLUSTERS="spoke-1 "
548+ echo "⚠ SPOKE_CLUSTERS secret not set, using default: spoke-2 "
549+ SPOKE_CLUSTERS="spoke-2 "
564550 fi
565551
566552 IFS=',' read -ra CLUSTERS <<< "$SPOKE_CLUSTERS"
@@ -571,24 +557,14 @@ jobs:
571557
572558 # Get secrets based on cluster name
573559 case "$cluster" in
574- spoke-1)
560+
561+ spoke-2)
562+ # Helper: User wants to use spoke-2 context but with spoke-1 credentials
575563 NETBIRD_IP="${{ secrets.SPOKE_1_NETBIRD_IP }}"
576564 CA_CERT_B64="${{ secrets.SPOKE_1_CA_CERT }}"
577565 CLIENT_CERT_B64="${{ secrets.SPOKE_1_CLIENT_CERT }}"
578566 CLIENT_KEY_B64="${{ secrets.SPOKE_1_CLIENT_KEY }}"
579567 ;;
580- spoke-2)
581- NETBIRD_IP="${{ secrets.SPOKE_2_NETBIRD_IP }}"
582- CA_CERT_B64="${{ secrets.SPOKE_2_CA_CERT }}"
583- CLIENT_CERT_B64="${{ secrets.SPOKE_2_CLIENT_CERT }}"
584- CLIENT_KEY_B64="${{ secrets.SPOKE_2_CLIENT_KEY }}"
585- ;;
586- spoke-3)
587- NETBIRD_IP="${{ secrets.SPOKE_3_NETBIRD_IP }}"
588- CA_CERT_B64="${{ secrets.SPOKE_3_CA_CERT }}"
589- CLIENT_CERT_B64="${{ secrets.SPOKE_3_CLIENT_CERT }}"
590- CLIENT_KEY_B64="${{ secrets.SPOKE_3_CLIENT_KEY }}"
591- ;;
592568 *)
593569 echo " ⚠ Unknown cluster: $cluster"
594570 continue
@@ -701,7 +677,7 @@ jobs:
701677 # Build workload_clusters map from SPOKE_CLUSTERS secret
702678 SPOKE_CLUSTERS="${{ secrets.SPOKE_CLUSTERS }}"
703679 if [ -z "$SPOKE_CLUSTERS" ]; then
704- SPOKE_CLUSTERS="spoke-1,spoke-2,spoke-3 "
680+ SPOKE_CLUSTERS="spoke-2 "
705681 fi
706682
707683 # Convert comma-separated list to Terraform map format
@@ -801,7 +777,7 @@ jobs:
801777
802778 SPOKE_CLUSTERS="${{ secrets.SPOKE_CLUSTERS }}"
803779 if [ -z "$SPOKE_CLUSTERS" ]; then
804- SPOKE_CLUSTERS="spoke-1,spoke-2,spoke-3 "
780+ SPOKE_CLUSTERS="spoke-2 "
805781 fi
806782
807783 IFS=',' read -ra CLUSTERS <<< "$SPOKE_CLUSTERS"
0 commit comments