Merge pull request #2 from scalar-labs/graceful-shutdown-for-envoy-an…

…d-scalardl Add prestop for graceful shutdown envoy pods
scalar-labs · Apr 26, 2021 · add9315 · add9315
2 parents caf0aa8 + fc9467f
commit add9315
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/charts/scalardl/Chart.yaml b/charts/scalardl/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: scalardl
 description: Implementation scalardl.
 type: application
-version: 1.2.2
+version: 1.2.3
 appVersion: 2.1.0
 deprecated: false
 icon: https://scalar-labs.com/wp-content/themes/scalar/assets/img/logo_scalar.svg

diff --git a/charts/scalardl/README.md b/charts/scalardl/README.md
@@ -1,7 +1,7 @@
 # scalardl
 
 Implementation scalardl.
-Current chart version is `1.2.2`
+Current chart version is `1.2.3`
 
 ## Values
 
@@ -11,7 +11,7 @@ Current chart version is `1.2.2`
 | envoy.envoyConfiguration.adminAccessLogPath | string | `"/dev/stdout"` | admin log path |
 | envoy.image.pullPolicy | string | `"IfNotPresent"` | Specify a imagePullPolicy |
 | envoy.image.repository | string | `"ghcr.io/scalar-labs/scalar-envoy"` | Docker image |
-| envoy.image.version | string | `"1.0.0"` |  |
+| envoy.image.version | string | `"1.0.1"` |  |
 | envoy.imagePullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. |
 | envoy.nodeSelector | object | `{}` | nodeSelector is form of node selection constraint |
 | envoy.podSecurityContext | object | `{}` | PodSecurityContext holds pod-level security attributes and common container settings |

diff --git a/charts/scalardl/templates/envoy/deployment.yaml b/charts/scalardl/templates/envoy/deployment.yaml
@@ -51,6 +51,10 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh", "-c", "curl -sX POST 127.0.0.1:9001/healthcheck/fail; sleep 30"]
           resources:
             {{- toYaml .Values.envoy.resources | nindent 12 }}
       {{- with .Values.envoy.nodeSelector }}

diff --git a/charts/scalardl/values.yaml b/charts/scalardl/values.yaml
@@ -20,7 +20,7 @@ envoy:
     # envoy.image.repository -- Docker image
     repository: ghcr.io/scalar-labs/scalar-envoy
     # envoy.image.tag -- Docker tag
-    version: 1.0.0
+    version: 1.0.1
     # envoy.image.pullPolicy -- Specify a imagePullPolicy
     pullPolicy: IfNotPresent