Parcourir la source

route script corrections

Vadim Surkov il y a 3 ans
Parent
commit
efd949cf24
2 fichiers modifiés avec 14 ajouts et 5 suppressions
  1. 8 3
      helm/templates/cm-router.yaml
  2. 6 2
      helm/templates/daemonset.yaml

+ 8 - 3
helm/templates/cm-router.yaml

@@ -3,9 +3,11 @@ kind: ConfigMap
 metadata:
   name: {{ include "openvpn.fullname" . }}-routecheck
 data:
-  route.sh: | 
-    while sleep 60
+  route-check: | 
+    set -x
+    while true
     do
+      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')
@@ -14,7 +16,10 @@ data:
           ip route delete {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) > /dev/null 2>&1
           ip route add {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) via $__server_pod_ip
         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
       fi
+      sleep 60
     done
-  finish.sh: |
+  route-delete: |
     ip route delete {{ .Values.net }}/$(mask2cdr {{ .Values.mask }}) > /dev/null 2>&1

+ 6 - 2
helm/templates/daemonset.yaml

@@ -24,8 +24,12 @@ spec:
         - name: {{ .Chart.Name }}-router
           image: "{{ .Values.router.image }}:{{ .Values.router.tag }}"
           imagePullPolicy: IfNotPresent
-          command: ["sleep"]
-          args: ["infinity"]
+          command: ["/bin/sh"]
+          args: ["-c","/opt/route-check"]
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh","-c","/opt/route-delete"]
           securityContext:
             capabilities:
               add: