Update probe settings

* Reduce readiness probe startup delay * Increacse liveness polling period
aws · Jun 15, 2020 · 561a38f · 561a38f
1 parent af54066
commit 561a38f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
@@ -112,6 +112,7 @@
             - "/app/grpc-health-probe"
             - "-addr=:50051"
           "initialDelaySeconds": 35
+          "periodSeconds": 60
         "name": "aws-node"
         "ports":
         - "containerPort": 61678
@@ -121,7 +122,7 @@
             "command":
             - "/app/grpc-health-probe"
             - "-addr=:50051"
-          "initialDelaySeconds": 35
+          "initialDelaySeconds": 10
         "resources":
           "requests":
             "cpu": "10m"

diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -112,6 +112,7 @@
             - "/app/grpc-health-probe"
             - "-addr=:50051"
           "initialDelaySeconds": 35
+          "periodSeconds": 60
         "name": "aws-node"
         "ports":
         - "containerPort": 61678
@@ -121,7 +122,7 @@
             "command":
             - "/app/grpc-health-probe"
             - "-addr=:50051"
-          "initialDelaySeconds": 35
+          "initialDelaySeconds": 10
         "resources":
           "requests":
             "cpu": "10m"

diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -112,6 +112,7 @@
             - "/app/grpc-health-probe"
             - "-addr=:50051"
           "initialDelaySeconds": 35
+          "periodSeconds": 60
         "name": "aws-node"
         "ports":
         - "containerPort": 61678
@@ -121,7 +122,7 @@
             "command":
             - "/app/grpc-health-probe"
             - "-addr=:50051"
-          "initialDelaySeconds": 35
+          "initialDelaySeconds": 10
         "resources":
           "requests":
             "cpu": "10m"

diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
@@ -112,6 +112,7 @@
             - "/app/grpc-health-probe"
             - "-addr=:50051"
           "initialDelaySeconds": 35
+          "periodSeconds": 60
         "name": "aws-node"
         "ports":
         - "containerPort": 61678
@@ -121,7 +122,7 @@
             "command":
             - "/app/grpc-health-probe"
             - "-addr=:50051"
-          "initialDelaySeconds": 35
+          "initialDelaySeconds": 10
         "resources":
           "requests":
             "cpu": "10m"

diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet
@@ -135,12 +135,18 @@ local awsnode = {
               }],
               name: "aws-node",
               readinessProbe: {
+                exec: {
+                  command: ["/app/grpc-health-probe", "-addr=:50051"],
+                },
+                initialDelaySeconds: 10,
+              },
+              livenessProbe: {
                 exec: {
                   command: ["/app/grpc-health-probe", "-addr=:50051"],
                 },
                 initialDelaySeconds: 35,
+                periodSeconds: 60,
               },
-              livenessProbe: self.readinessProbe,
               env_:: {
                 AWS_VPC_ENI_MTU: "9001",
                 AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER: "false",