Explorar o código

corrections in filters and start checks

Vadim Surkov %!s(int64=3) %!d(string=hai) anos
pai
achega
76baabcd36
Modificáronse 1 ficheiros con 4 adicións e 1 borrados
  1. 4 1
      helm/templates/cm-router.yaml

+ 4 - 1
helm/templates/cm-router.yaml

@@ -10,7 +10,7 @@ data:
       date
       /sbin/ip link list {{ .Values.dev_name }} > /dev/null 2>&1
       if [ $? -ne 0 ]; then
-        __server_pod_ip=$(kubectl get po -o json | jq -r '.items[] | select(.metadata.labels.component=="application") | select(.status.phase=="Running").status.podIP')
+        __server_pod_ip=$(kubectl get po -o json | jq -r '.items[] | select(.metadata.labels.component=="application" and .metadata.labels["app.kubernetes.io/instance"]=="{{ .Release.Name }}" and .metadata.labels["app.kubernetes.io/name"]=="{{ include "openvpn.name" . }}" and .metadata.deletionTimestamp==null and .status.phase=="Running").status.podIP')
         __route_ip=$(ip route get {{ .Values.net }} | awk '{print $3}') 
         if [[ $__server_pod_ip != $__route_ip ]]; then
           ip route delete {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) > /dev/null 2>&1
@@ -18,8 +18,11 @@ data:
         fi
       elif [ $(ip route show to match 10.9.0.0 | wc -l) -gt 2 ]; then
         ip route delete {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) > /dev/null 2>&1
+      elif [ $(ip route show to match 10.9.0.0 | wc -l) -le 2 ]; then
+        ip route add {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) dev {{ .Values.dev_name }}
       fi
       sleep 60
     done
   route-delete: |
+    
     ip route delete {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) > /dev/null 2>&1