From 885b4fa0fd571c8a38833d8b29a2beb07f5ccf73 Mon Sep 17 00:00:00 2001
From: mugioka <okamugi0722@gmail.com>
Date: Thu, 17 Mar 2022 22:12:01 +0900
Subject: [PATCH] feat: can be set timeout for draining pods and rolling update
 of deployment.

---
 charts/panope/Chart.yaml                     |  2 +-
 charts/panope/templates/agent/configmap.yaml |  2 +
 charts/panope/values.yaml                    | 44 ++++++++++++++++++--
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/charts/panope/Chart.yaml b/charts/panope/Chart.yaml
index 1c4826a..4bd39e3 100644
--- a/charts/panope/Chart.yaml
+++ b/charts/panope/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.2
+version: 0.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/panope/templates/agent/configmap.yaml b/charts/panope/templates/agent/configmap.yaml
index 6acb699..ce61784 100644
--- a/charts/panope/templates/agent/configmap.yaml
+++ b/charts/panope/templates/agent/configmap.yaml
@@ -19,3 +19,5 @@ data:
   MAX_PROCESSED_NODE_COUNT: {{ .Values.agent.configMap.maxProcessedNodeCount | quote }}
   HEALTH_CHECK_PORT: {{ .Values.agent.configMap.healthCheckPort | quote }}
   METRICS_PORT: {{ .Values.agent.configMap.metricsPort | quote }}
+  ROLLING_UPDATE_TIMEOUT_SEC: {{ .Values.agent.configMap.rollingUpdateTimeoutSec | quote }}
+  DRAINING_TIMEOUT_SEC: {{ .Values.agent.configMap.drainingTimeoutSec | quote }}
diff --git a/charts/panope/values.yaml b/charts/panope/values.yaml
index bdb12d1..8a930b0 100644
--- a/charts/panope/values.yaml
+++ b/charts/panope/values.yaml
@@ -91,6 +91,7 @@ agent:
     annotations: {}
 
     nats:
+      # configure the NATS credentials for agent to publish/subscribe
       credentials:
       # credentials: |
       #   -----BEGIN NATS USER JWT-----
@@ -116,16 +117,38 @@ agent:
     # annotations to add to the config map
     annotations: {}
 
+    # configure the NATS URI
+    # currently, the only supported URI schema is `wss`
     natsUri: "wss://nats.panope.net:443"
+
+    # configure NATS subject for agent to publish
     agentSubject: ""
+
+    # configure NATS subject for agent to subscribe
     controllerSubject: ""
-    healthCheckPort: "4444"
-    metricsPort: "2112"
+
+    # configure the health check port
+    # if not set, default value is 4444
+    healthCheckPort:
+
+    # configure the metrics port
+    # if not set, default value is 2112
+    metricsPort:
+
     # configure the maximum number of nodes in the cluster as a percentage
     clusterNodeMaxSurge: "25%"
+
     # configure the maximum number of nodes to be processed at the same time (cordoned or drained, etc.)
     maxProcessedNodeCount: "5"
 
+    # configure the timeout for rolling update of deployment
+    # if not set, default value is 180
+    rollingUpdateTimeoutSec:
+
+    # configure the timeout for draining pods
+    # if not set, default value is 180
+    drainingTimeoutSec:
+
   serviceAccount:
     name: ""
     # labels to add to the service account
@@ -210,6 +233,7 @@ observer:
     annotations: {}
 
     nats:
+      # configure the NATS credentials for agent to publish/subscribe
       credentials:
       # credentials: |
       #   -----BEGIN NATS USER JWT-----
@@ -231,11 +255,23 @@ observer:
     # annotations to add to the config map
     annotations: {}
 
+    # configure NATS subject for observer to publish
     observerSubject: ""
+
+    # configure NATS subject for observer to subscribe
     controllerSubject: ""
+
+    # configure the NATS URI
+    # currently, the only supported URI schema is `wss`
     natsUri: "wss://nats.panope.net:443"
-    healthCheckPort: "4444"
-    metricsPort: "2112"
+
+    # configure the health check port
+    # if not set, default value is 4444
+    healthCheckPort:
+
+    # configure the metrics port
+    # if not set, default value is 2112
+    metricsPort:
 
   livenessProbe:
     failureThreshold: 5