chore(t8s-cluster/management-cluster): completely remove nodeDrainTim…

…eout
teutonet · Oct 20, 2023 · a5c6ddb · a5c6ddb
1 parent 1a610b1
commit a5c6ddb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/charts/t8s-cluster/ci/cidrs-values.yaml b/charts/t8s-cluster/ci/cidrs-values.yaml
@@ -1,5 +1,4 @@
 controlPlane:
   flavor: standard
-  nodeDrainTimeout: 5m
   allowedCIDRs:
     - 1.2.3.4
diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml b/charts/t8s-cluster/templates/management-cluster/clusterClass/clusterClass.yaml
@@ -17,7 +17,7 @@ spec:
         - status: 'False'
           timeout: 600s
           type: Ready
-    nodeDrainTimeout: {{ .Values.controlPlane.nodeDrainTimeout | default "8m" }}
+    nodeDrainTimeout: "8m"
     machineInfrastructure:
       ref:
         apiVersion: {{ include "t8s-cluster.clusterClass.infrastructureApiVersion" (dict) }}

diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json
@@ -125,9 +125,6 @@
         "additionalSecurityGroups": {
           "$ref": "#/$defs/securityGroups"
         },
-        "nodeDrainTimeout": {
-          "$ref": "#/$defs/nodeDrainTimeout"
-        },
         "allowedCIDRs": {
           "type": "array",
           "items": {
@@ -179,9 +176,6 @@
           },
           "flavor": {
             "type": "string"
-          },
-          "nodeDrainTimeout": {
-            "$ref": "#/$defs/nodeDrainTimeout"
           }
         },
         "additionalProperties": false,
@@ -279,11 +273,6 @@
       },
       "uniqueItems": true
     },
-    "nodeDrainTimeout": {
-      "type": "string",
-      "default": "3m",
-      "pattern": "[0-9]+[smh]"
-    },
     "image": {
       "type": "object",
       "properties": {