cleanup health checks daemonsets

Author: roffe

daemonset/generic-kuberouter-all-features-advertise-routes.yaml

@@ -69,12 +69,6 @@ spec:
         - "--peer-router-asns=64512"
         - "--cluster-asn=64512"
         - "--advertise-cluster-ip=true"
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 20244
-          initialDelaySeconds: 10
-          periodSeconds: 3
         env:
         - name: NODE_NAME
           valueFrom:

daemonset/generic-kuberouter-all-features.yaml

@@ -65,17 +65,17 @@ spec:
         - "--run-firewall=true"
         - "--run-service-proxy=true"
         - "--kubeconfig=/var/lib/kube-router/kubeconfig"
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         livenessProbe:
           httpGet:
             path: /healthz
             port: 20244
           initialDelaySeconds: 10
           periodSeconds: 3
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         resources:
           requests:
             cpu: 250m

daemonset/generic-kuberouter.yaml

@@ -45,17 +45,17 @@ spec:
         - "--run-router=true"
         - "--run-firewall=true"
         - "--run-service-proxy=false"
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         livenessProbe:
           httpGet:
             path: /healthz
             port: 20244
           initialDelaySeconds: 10
           periodSeconds: 3
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         resources:
           requests:
             cpu: 250m

daemonset/kube-router-all-service-daemonset-advertise-routes.yaml

@@ -45,12 +45,6 @@ spec:
           - "--cluster-asn=64512"
           - "--peer-router-ips=192.168.1.99"
           - "--peer-router-asns=64513"
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 20244
-          initialDelaySeconds: 10
-          periodSeconds: 3
         securityContext:
           privileged: true
         imagePullPolicy: Always
@@ -59,6 +53,12 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 20244
+          initialDelaySeconds: 10
+          periodSeconds: 3
         volumeMounts:
         - name: lib-modules
           mountPath: /lib/modules

daemonset/kube-router-all-service-daemonset.yaml

@@ -37,12 +37,6 @@ spec:
       - name: kube-router
         image: cloudnativelabs/kube-router
         args: ["--run-router=true", "--run-firewall=true", "--run-service-proxy=true", "--kubeconfig=/var/lib/kube-router/kubeconfig"]
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 20244
-          initialDelaySeconds: 10
-          periodSeconds: 3
         securityContext:
           privileged: true
         imagePullPolicy: Always
@@ -51,6 +45,12 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 20244
+          initialDelaySeconds: 10
+          periodSeconds: 3
         volumeMounts:
         - name: lib-modules
           mountPath: /lib/modules

daemonset/kube-router-firewall-daemonset.yaml

@@ -37,12 +37,6 @@ spec:
       - name: kube-router
         image: cloudnativelabs/kube-router
         args: ["--run-router=false", "--run-firewall=true", "--run-service-proxy=false", "--kubeconfig=/var/lib/kube-router/kubeconfig"]
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 20244
-          initialDelaySeconds: 10
-          periodSeconds: 3
         securityContext:
           privileged: true
         imagePullPolicy: Always
@@ -51,6 +45,12 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 20244
+          initialDelaySeconds: 10
+          periodSeconds: 3
         volumeMounts:
         - name: lib-modules
           mountPath: /lib/modules

daemonset/kube-router-proxy-daemonset.yaml

@@ -37,12 +37,6 @@ spec:
       - name: kube-router
         image: cloudnativelabs/kube-router
         args: ["--run-router=false", "--run-firewall=false", "--run-service-proxy=true", "--kubeconfig=/var/lib/kube-router/kubeconfig"]
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 20244
-          initialDelaySeconds: 10
-          periodSeconds: 3
         securityContext:
           privileged: true
         imagePullPolicy: Always
@@ -51,6 +45,12 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 20244
+          initialDelaySeconds: 10
+          periodSeconds: 3
         volumeMounts:
         - name: lib-modules
           mountPath: /lib/modules

daemonset/kubeadm-kuberouter-all-features-dsr.yaml

@@ -46,17 +46,17 @@ spec:
         - --run-firewall=true
         - --run-service-proxy=true
         - --kubeconfig=/var/lib/kube-router/kubeconfig
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         livenessProbe:
           httpGet:
             path: /healthz
             port: 20244
           initialDelaySeconds: 10
           periodSeconds: 3
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         resources:
           requests:
             cpu: 250m

daemonset/kubeadm-kuberouter-all-features.yaml

@@ -46,17 +46,17 @@ spec:
         - --run-firewall=true
         - --run-service-proxy=true
         - --kubeconfig=/var/lib/kube-router/kubeconfig
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         livenessProbe:
           httpGet:
             path: /healthz
             port: 20244
           initialDelaySeconds: 10
           periodSeconds: 3
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         resources:
           requests:
             cpu: 250m

daemonset/kubeadm-kuberouter.yaml

@@ -45,17 +45,17 @@ spec:
         - --run-router=true
         - --run-firewall=true
         - --run-service-proxy=false
+        env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
         livenessProbe:
           httpGet:
             path: /healthz
             port: 20244
           initialDelaySeconds: 10
           periodSeconds: 3
-        env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         resources:
           requests:
             cpu: 250m