From 0595fd6e61dd00b58cd5db0d417f89e569753ac0 Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann+github@mandragor.org>
Date: Tue, 25 Mar 2025 10:40:12 +0000
Subject: [PATCH] Adding new schemas

---
 master-local/_definitions.json                | 16 ++++++-
 master-local/containerstatus-v1.json          |  7 ++++
 master-local/containerstatus.json             |  7 ++++
 .../hpascalingrules-autoscaling-v2.json       |  8 +++-
 master-local/hpascalingrules.json             |  8 +++-
 master-local/lifecycle-v1.json                |  7 ++++
 master-local/lifecycle.json                   |  7 ++++
 master-standalone-strict/_definitions.json    | 16 ++++++-
 master-standalone-strict/container-v1.json    |  7 ++++
 master-standalone-strict/container.json       |  7 ++++
 .../containerstatus-v1.json                   |  7 ++++
 master-standalone-strict/containerstatus.json |  7 ++++
 .../cronjob-batch-v1.json                     | 21 ++++++++++
 master-standalone-strict/cronjob.json         | 21 ++++++++++
 .../cronjoblist-batch-v1.json                 | 21 ++++++++++
 master-standalone-strict/cronjoblist.json     | 21 ++++++++++
 .../cronjobspec-batch-v1.json                 | 21 ++++++++++
 master-standalone-strict/cronjobspec.json     | 21 ++++++++++
 .../daemonset-apps-v1.json                    | 21 ++++++++++
 master-standalone-strict/daemonset.json       | 21 ++++++++++
 .../daemonsetlist-apps-v1.json                | 21 ++++++++++
 master-standalone-strict/daemonsetlist.json   | 21 ++++++++++
 .../daemonsetspec-apps-v1.json                | 21 ++++++++++
 master-standalone-strict/daemonsetspec.json   | 21 ++++++++++
 .../deployment-apps-v1.json                   | 21 ++++++++++
 master-standalone-strict/deployment.json      | 21 ++++++++++
 .../deploymentlist-apps-v1.json               | 21 ++++++++++
 master-standalone-strict/deploymentlist.json  | 21 ++++++++++
 .../deploymentspec-apps-v1.json               | 21 ++++++++++
 master-standalone-strict/deploymentspec.json  | 21 ++++++++++
 .../ephemeralcontainer-v1.json                |  7 ++++
 .../ephemeralcontainer.json                   |  7 ++++
 ...orizontalpodautoscaler-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscaler.json              | 40 ++++++++++++++++--
 ...lpodautoscalerbehavior-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerbehavior.json      | 40 ++++++++++++++++--
 ...ontalpodautoscalerlist-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerlist.json          | 40 ++++++++++++++++--
 ...ontalpodautoscalerspec-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerspec.json          | 40 ++++++++++++++++--
 .../hpascalingrules-autoscaling-v2.json       | 20 ++++++++-
 master-standalone-strict/hpascalingrules.json | 20 ++++++++-
 master-standalone-strict/job-batch-v1.json    | 21 ++++++++++
 master-standalone-strict/job.json             | 21 ++++++++++
 .../joblist-batch-v1.json                     | 21 ++++++++++
 master-standalone-strict/joblist.json         | 21 ++++++++++
 .../jobspec-batch-v1.json                     | 21 ++++++++++
 master-standalone-strict/jobspec.json         | 21 ++++++++++
 .../jobtemplatespec-batch-v1.json             | 21 ++++++++++
 master-standalone-strict/jobtemplatespec.json | 21 ++++++++++
 master-standalone-strict/lifecycle-v1.json    |  7 ++++
 master-standalone-strict/lifecycle.json       |  7 ++++
 master-standalone-strict/pod-v1.json          | 42 +++++++++++++++++++
 master-standalone-strict/pod.json             | 42 +++++++++++++++++++
 master-standalone-strict/podlist-v1.json      | 42 +++++++++++++++++++
 master-standalone-strict/podlist.json         | 42 +++++++++++++++++++
 master-standalone-strict/podspec-v1.json      | 21 ++++++++++
 master-standalone-strict/podspec.json         | 21 ++++++++++
 master-standalone-strict/podstatus-v1.json    | 21 ++++++++++
 master-standalone-strict/podstatus.json       | 21 ++++++++++
 master-standalone-strict/podtemplate-v1.json  | 21 ++++++++++
 master-standalone-strict/podtemplate.json     | 21 ++++++++++
 .../podtemplatelist-v1.json                   | 21 ++++++++++
 master-standalone-strict/podtemplatelist.json | 21 ++++++++++
 .../podtemplatespec-v1.json                   | 21 ++++++++++
 master-standalone-strict/podtemplatespec.json | 21 ++++++++++
 .../replicaset-apps-v1.json                   | 21 ++++++++++
 master-standalone-strict/replicaset.json      | 21 ++++++++++
 .../replicasetlist-apps-v1.json               | 21 ++++++++++
 master-standalone-strict/replicasetlist.json  | 21 ++++++++++
 .../replicasetspec-apps-v1.json               | 21 ++++++++++
 master-standalone-strict/replicasetspec.json  | 21 ++++++++++
 .../replicationcontroller-v1.json             | 21 ++++++++++
 .../replicationcontroller.json                | 21 ++++++++++
 .../replicationcontrollerlist-v1.json         | 21 ++++++++++
 .../replicationcontrollerlist.json            | 21 ++++++++++
 .../replicationcontrollerspec-v1.json         | 21 ++++++++++
 .../replicationcontrollerspec.json            | 21 ++++++++++
 .../statefulset-apps-v1.json                  | 21 ++++++++++
 master-standalone-strict/statefulset.json     | 21 ++++++++++
 .../statefulsetlist-apps-v1.json              | 21 ++++++++++
 master-standalone-strict/statefulsetlist.json | 21 ++++++++++
 .../statefulsetspec-apps-v1.json              | 21 ++++++++++
 master-standalone-strict/statefulsetspec.json | 21 ++++++++++
 master-standalone/_definitions.json           | 16 ++++++-
 master-standalone/container-v1.json           |  7 ++++
 master-standalone/container.json              |  7 ++++
 master-standalone/containerstatus-v1.json     |  7 ++++
 master-standalone/containerstatus.json        |  7 ++++
 master-standalone/cronjob-batch-v1.json       | 21 ++++++++++
 master-standalone/cronjob.json                | 21 ++++++++++
 master-standalone/cronjoblist-batch-v1.json   | 21 ++++++++++
 master-standalone/cronjoblist.json            | 21 ++++++++++
 master-standalone/cronjobspec-batch-v1.json   | 21 ++++++++++
 master-standalone/cronjobspec.json            | 21 ++++++++++
 master-standalone/daemonset-apps-v1.json      | 21 ++++++++++
 master-standalone/daemonset.json              | 21 ++++++++++
 master-standalone/daemonsetlist-apps-v1.json  | 21 ++++++++++
 master-standalone/daemonsetlist.json          | 21 ++++++++++
 master-standalone/daemonsetspec-apps-v1.json  | 21 ++++++++++
 master-standalone/daemonsetspec.json          | 21 ++++++++++
 master-standalone/deployment-apps-v1.json     | 21 ++++++++++
 master-standalone/deployment.json             | 21 ++++++++++
 master-standalone/deploymentlist-apps-v1.json | 21 ++++++++++
 master-standalone/deploymentlist.json         | 21 ++++++++++
 master-standalone/deploymentspec-apps-v1.json | 21 ++++++++++
 master-standalone/deploymentspec.json         | 21 ++++++++++
 master-standalone/ephemeralcontainer-v1.json  |  7 ++++
 master-standalone/ephemeralcontainer.json     |  7 ++++
 ...orizontalpodautoscaler-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscaler.json              | 40 ++++++++++++++++--
 ...lpodautoscalerbehavior-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerbehavior.json      | 40 ++++++++++++++++--
 ...ontalpodautoscalerlist-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerlist.json          | 40 ++++++++++++++++--
 ...ontalpodautoscalerspec-autoscaling-v2.json | 40 ++++++++++++++++--
 .../horizontalpodautoscalerspec.json          | 40 ++++++++++++++++--
 .../hpascalingrules-autoscaling-v2.json       | 20 ++++++++-
 master-standalone/hpascalingrules.json        | 20 ++++++++-
 master-standalone/job-batch-v1.json           | 21 ++++++++++
 master-standalone/job.json                    | 21 ++++++++++
 master-standalone/joblist-batch-v1.json       | 21 ++++++++++
 master-standalone/joblist.json                | 21 ++++++++++
 master-standalone/jobspec-batch-v1.json       | 21 ++++++++++
 master-standalone/jobspec.json                | 21 ++++++++++
 .../jobtemplatespec-batch-v1.json             | 21 ++++++++++
 master-standalone/jobtemplatespec.json        | 21 ++++++++++
 master-standalone/lifecycle-v1.json           |  7 ++++
 master-standalone/lifecycle.json              |  7 ++++
 master-standalone/pod-v1.json                 | 42 +++++++++++++++++++
 master-standalone/pod.json                    | 42 +++++++++++++++++++
 master-standalone/podlist-v1.json             | 42 +++++++++++++++++++
 master-standalone/podlist.json                | 42 +++++++++++++++++++
 master-standalone/podspec-v1.json             | 21 ++++++++++
 master-standalone/podspec.json                | 21 ++++++++++
 master-standalone/podstatus-v1.json           | 21 ++++++++++
 master-standalone/podstatus.json              | 21 ++++++++++
 master-standalone/podtemplate-v1.json         | 21 ++++++++++
 master-standalone/podtemplate.json            | 21 ++++++++++
 master-standalone/podtemplatelist-v1.json     | 21 ++++++++++
 master-standalone/podtemplatelist.json        | 21 ++++++++++
 master-standalone/podtemplatespec-v1.json     | 21 ++++++++++
 master-standalone/podtemplatespec.json        | 21 ++++++++++
 master-standalone/replicaset-apps-v1.json     | 21 ++++++++++
 master-standalone/replicaset.json             | 21 ++++++++++
 master-standalone/replicasetlist-apps-v1.json | 21 ++++++++++
 master-standalone/replicasetlist.json         | 21 ++++++++++
 master-standalone/replicasetspec-apps-v1.json | 21 ++++++++++
 master-standalone/replicasetspec.json         | 21 ++++++++++
 .../replicationcontroller-v1.json             | 21 ++++++++++
 master-standalone/replicationcontroller.json  | 21 ++++++++++
 .../replicationcontrollerlist-v1.json         | 21 ++++++++++
 .../replicationcontrollerlist.json            | 21 ++++++++++
 .../replicationcontrollerspec-v1.json         | 21 ++++++++++
 .../replicationcontrollerspec.json            | 21 ++++++++++
 master-standalone/statefulset-apps-v1.json    | 21 ++++++++++
 master-standalone/statefulset.json            | 21 ++++++++++
 .../statefulsetlist-apps-v1.json              | 21 ++++++++++
 master-standalone/statefulsetlist.json        | 21 ++++++++++
 .../statefulsetspec-apps-v1.json              | 21 ++++++++++
 master-standalone/statefulsetspec.json        | 21 ++++++++++
 master/_definitions.json                      | 16 ++++++-
 master/containerstatus-v1.json                |  7 ++++
 master/containerstatus.json                   |  7 ++++
 master/hpascalingrules-autoscaling-v2.json    |  8 +++-
 master/hpascalingrules.json                   |  8 +++-
 master/lifecycle-v1.json                      |  7 ++++
 master/lifecycle.json                         |  7 ++++
 168 files changed, 3500 insertions(+), 88 deletions(-)

diff --git a/master-local/_definitions.json b/master-local/_definitions.json
index f5dfd42f59..4b629a23e6 100644
--- a/master-local/_definitions.json
+++ b/master-local/_definitions.json
@@ -4048,10 +4048,10 @@
       "type": "object"
     },
     "io.k8s.api.autoscaling.v2.HPAScalingRules": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "$ref": "#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
           },
@@ -4066,6 +4066,10 @@
           "description": "stabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).",
           "format": "int32",
           "type": "integer"
+        },
+        "tolerance": {
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+          "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
         }
       },
       "type": "object"
@@ -6903,6 +6907,10 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerState",
           "description": "State holds details about the container's current condition."
         },
+        "stopSignal": {
+          "description": "StopSignal reports the effective stop signal for this container",
+          "type": "string"
+        },
         "user": {
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerUser",
           "description": "User represents user identity information initially attached to the first process of the container"
@@ -8082,6 +8090,10 @@
         "preStop": {
           "$ref": "#/definitions/io.k8s.api.core.v1.LifecycleHandler",
           "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/master-local/containerstatus-v1.json b/master-local/containerstatus-v1.json
index 1313eeb8bd..ee6d94c631 100644
--- a/master-local/containerstatus-v1.json
+++ b/master-local/containerstatus-v1.json
@@ -89,6 +89,13 @@
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.ContainerState",
       "description": "State holds details about the container's current condition."
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.ContainerUser",
       "description": "User represents user identity information initially attached to the first process of the container"
diff --git a/master-local/containerstatus.json b/master-local/containerstatus.json
index 1313eeb8bd..ee6d94c631 100644
--- a/master-local/containerstatus.json
+++ b/master-local/containerstatus.json
@@ -89,6 +89,13 @@
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.ContainerState",
       "description": "State holds details about the container's current condition."
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.ContainerUser",
       "description": "User represents user identity information initially attached to the first process of the container"
diff --git a/master-local/hpascalingrules-autoscaling-v2.json b/master-local/hpascalingrules-autoscaling-v2.json
index 4c2228e1ef..4956b73851 100644
--- a/master-local/hpascalingrules-autoscaling-v2.json
+++ b/master-local/hpascalingrules-autoscaling-v2.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "$ref": "_definitions.json#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
       },
@@ -26,6 +26,10 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "$ref": "_definitions.json#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+      "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
     }
   },
   "type": "object",
diff --git a/master-local/hpascalingrules.json b/master-local/hpascalingrules.json
index 4c2228e1ef..4956b73851 100644
--- a/master-local/hpascalingrules.json
+++ b/master-local/hpascalingrules.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "$ref": "_definitions.json#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
       },
@@ -26,6 +26,10 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "$ref": "_definitions.json#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+      "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
     }
   },
   "type": "object",
diff --git a/master-local/lifecycle-v1.json b/master-local/lifecycle-v1.json
index c82995cceb..09daebb158 100644
--- a/master-local/lifecycle-v1.json
+++ b/master-local/lifecycle-v1.json
@@ -8,6 +8,13 @@
     "preStop": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.LifecycleHandler",
       "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-local/lifecycle.json b/master-local/lifecycle.json
index c82995cceb..09daebb158 100644
--- a/master-local/lifecycle.json
+++ b/master-local/lifecycle.json
@@ -8,6 +8,13 @@
     "preStop": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.LifecycleHandler",
       "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone-strict/_definitions.json b/master-standalone-strict/_definitions.json
index 74ed3de0ca..50284e51a4 100644
--- a/master-standalone-strict/_definitions.json
+++ b/master-standalone-strict/_definitions.json
@@ -4180,10 +4180,10 @@
       "additionalProperties": false
     },
     "io.k8s.api.autoscaling.v2.HPAScalingRules": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "$ref": "#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
           },
@@ -4198,6 +4198,10 @@
           "description": "stabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).",
           "format": "int32",
           "type": "integer"
+        },
+        "tolerance": {
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+          "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
         }
       },
       "type": "object",
@@ -7125,6 +7129,10 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerState",
           "description": "State holds details about the container's current condition."
         },
+        "stopSignal": {
+          "description": "StopSignal reports the effective stop signal for this container",
+          "type": "string"
+        },
         "user": {
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerUser",
           "description": "User represents user identity information initially attached to the first process of the container"
@@ -8344,6 +8352,10 @@
         "preStop": {
           "$ref": "#/definitions/io.k8s.api.core.v1.LifecycleHandler",
           "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": "string"
         }
       },
       "type": "object",
diff --git a/master-standalone-strict/container-v1.json b/master-standalone-strict/container-v1.json
index 77d5f1fcca..c46de133bb 100644
--- a/master-standalone-strict/container-v1.json
+++ b/master-standalone-strict/container-v1.json
@@ -631,6 +631,13 @@
             "null"
           ],
           "additionalProperties": false
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/container.json b/master-standalone-strict/container.json
index 77d5f1fcca..c46de133bb 100644
--- a/master-standalone-strict/container.json
+++ b/master-standalone-strict/container.json
@@ -631,6 +631,13 @@
             "null"
           ],
           "additionalProperties": false
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/containerstatus-v1.json b/master-standalone-strict/containerstatus-v1.json
index 98bdbe0089..557025bb07 100644
--- a/master-standalone-strict/containerstatus-v1.json
+++ b/master-standalone-strict/containerstatus-v1.json
@@ -460,6 +460,13 @@
       ],
       "additionalProperties": false
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "description": "ContainerUser represents user identity information",
       "properties": {
diff --git a/master-standalone-strict/containerstatus.json b/master-standalone-strict/containerstatus.json
index 98bdbe0089..557025bb07 100644
--- a/master-standalone-strict/containerstatus.json
+++ b/master-standalone-strict/containerstatus.json
@@ -460,6 +460,13 @@
       ],
       "additionalProperties": false
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "description": "ContainerUser represents user identity information",
       "properties": {
diff --git a/master-standalone-strict/cronjob-batch-v1.json b/master-standalone-strict/cronjob-batch-v1.json
index 7e01997dd0..ce847cfab0 100644
--- a/master-standalone-strict/cronjob-batch-v1.json
+++ b/master-standalone-strict/cronjob-batch-v1.json
@@ -2881,6 +2881,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -4874,6 +4881,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -6903,6 +6917,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
diff --git a/master-standalone-strict/cronjob.json b/master-standalone-strict/cronjob.json
index faf1a57e37..0fa0eb1d98 100644
--- a/master-standalone-strict/cronjob.json
+++ b/master-standalone-strict/cronjob.json
@@ -2878,6 +2878,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -4871,6 +4878,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -6900,6 +6914,13 @@
                                       "null"
                                     ],
                                     "additionalProperties": false
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
diff --git a/master-standalone-strict/cronjoblist-batch-v1.json b/master-standalone-strict/cronjoblist-batch-v1.json
index 7513809b1a..f51892c35f 100644
--- a/master-standalone-strict/cronjoblist-batch-v1.json
+++ b/master-standalone-strict/cronjoblist-batch-v1.json
@@ -2896,6 +2896,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -4889,6 +4896,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -6918,6 +6932,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
diff --git a/master-standalone-strict/cronjoblist.json b/master-standalone-strict/cronjoblist.json
index 46baa6d76d..a041ab78a1 100644
--- a/master-standalone-strict/cronjoblist.json
+++ b/master-standalone-strict/cronjoblist.json
@@ -2890,6 +2890,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -4883,6 +4890,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -6912,6 +6926,13 @@
                                             "null"
                                           ],
                                           "additionalProperties": false
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
diff --git a/master-standalone-strict/cronjobspec-batch-v1.json b/master-standalone-strict/cronjobspec-batch-v1.json
index fa165b5096..e9c097dcca 100644
--- a/master-standalone-strict/cronjobspec-batch-v1.json
+++ b/master-standalone-strict/cronjobspec-batch-v1.json
@@ -2605,6 +2605,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -4598,6 +4605,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -6627,6 +6641,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
diff --git a/master-standalone-strict/cronjobspec.json b/master-standalone-strict/cronjobspec.json
index fa165b5096..e9c097dcca 100644
--- a/master-standalone-strict/cronjobspec.json
+++ b/master-standalone-strict/cronjobspec.json
@@ -2605,6 +2605,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -4598,6 +4605,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -6627,6 +6641,13 @@
                                   "null"
                                 ],
                                 "additionalProperties": false
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
diff --git a/master-standalone-strict/daemonset-apps-v1.json b/master-standalone-strict/daemonset-apps-v1.json
index 5b685efad1..961298c52d 100644
--- a/master-standalone-strict/daemonset-apps-v1.json
+++ b/master-standalone-strict/daemonset-apps-v1.json
@@ -2392,6 +2392,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4385,6 +4392,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6414,6 +6428,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/daemonset.json b/master-standalone-strict/daemonset.json
index c3e6fab53a..8d2855a054 100644
--- a/master-standalone-strict/daemonset.json
+++ b/master-standalone-strict/daemonset.json
@@ -2389,6 +2389,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4382,6 +4389,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6411,6 +6425,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/daemonsetlist-apps-v1.json b/master-standalone-strict/daemonsetlist-apps-v1.json
index 7de359819c..1483d469e3 100644
--- a/master-standalone-strict/daemonsetlist-apps-v1.json
+++ b/master-standalone-strict/daemonsetlist-apps-v1.json
@@ -2407,6 +2407,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4400,6 +4407,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6429,6 +6443,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/daemonsetlist.json b/master-standalone-strict/daemonsetlist.json
index c75510407b..f3fedaf980 100644
--- a/master-standalone-strict/daemonsetlist.json
+++ b/master-standalone-strict/daemonsetlist.json
@@ -2401,6 +2401,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4394,6 +4401,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6423,6 +6437,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/daemonsetspec-apps-v1.json b/master-standalone-strict/daemonsetspec-apps-v1.json
index f2d51690cc..c1645dbc37 100644
--- a/master-standalone-strict/daemonsetspec-apps-v1.json
+++ b/master-standalone-strict/daemonsetspec-apps-v1.json
@@ -2119,6 +2119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4112,6 +4119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6141,6 +6155,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/daemonsetspec.json b/master-standalone-strict/daemonsetspec.json
index f2d51690cc..c1645dbc37 100644
--- a/master-standalone-strict/daemonsetspec.json
+++ b/master-standalone-strict/daemonsetspec.json
@@ -2119,6 +2119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4112,6 +4119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6141,6 +6155,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/deployment-apps-v1.json b/master-standalone-strict/deployment-apps-v1.json
index bcbffa0020..077e2b7b67 100644
--- a/master-standalone-strict/deployment-apps-v1.json
+++ b/master-standalone-strict/deployment-apps-v1.json
@@ -2474,6 +2474,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4467,6 +4474,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6496,6 +6510,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/deployment.json b/master-standalone-strict/deployment.json
index 673c19507b..307d331a6c 100644
--- a/master-standalone-strict/deployment.json
+++ b/master-standalone-strict/deployment.json
@@ -2471,6 +2471,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4464,6 +4471,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6493,6 +6507,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/deploymentlist-apps-v1.json b/master-standalone-strict/deploymentlist-apps-v1.json
index 9e89d940c0..227c573b7b 100644
--- a/master-standalone-strict/deploymentlist-apps-v1.json
+++ b/master-standalone-strict/deploymentlist-apps-v1.json
@@ -2489,6 +2489,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4482,6 +4489,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6511,6 +6525,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/deploymentlist.json b/master-standalone-strict/deploymentlist.json
index e3c512c039..784f220189 100644
--- a/master-standalone-strict/deploymentlist.json
+++ b/master-standalone-strict/deploymentlist.json
@@ -2483,6 +2483,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4476,6 +4483,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6505,6 +6519,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/deploymentspec-apps-v1.json b/master-standalone-strict/deploymentspec-apps-v1.json
index 3e8df5827a..a6d2ac03c9 100644
--- a/master-standalone-strict/deploymentspec-apps-v1.json
+++ b/master-standalone-strict/deploymentspec-apps-v1.json
@@ -2201,6 +2201,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4194,6 +4201,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6223,6 +6237,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/deploymentspec.json b/master-standalone-strict/deploymentspec.json
index 3e8df5827a..a6d2ac03c9 100644
--- a/master-standalone-strict/deploymentspec.json
+++ b/master-standalone-strict/deploymentspec.json
@@ -2201,6 +2201,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4194,6 +4201,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6223,6 +6237,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/ephemeralcontainer-v1.json b/master-standalone-strict/ephemeralcontainer-v1.json
index a76556d31f..66ba5e9c16 100644
--- a/master-standalone-strict/ephemeralcontainer-v1.json
+++ b/master-standalone-strict/ephemeralcontainer-v1.json
@@ -631,6 +631,13 @@
             "null"
           ],
           "additionalProperties": false
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/ephemeralcontainer.json b/master-standalone-strict/ephemeralcontainer.json
index a76556d31f..66ba5e9c16 100644
--- a/master-standalone-strict/ephemeralcontainer.json
+++ b/master-standalone-strict/ephemeralcontainer.json
@@ -631,6 +631,13 @@
             "null"
           ],
           "additionalProperties": false
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/horizontalpodautoscaler-autoscaling-v2.json b/master-standalone-strict/horizontalpodautoscaler-autoscaling-v2.json
index fa7156febd..7d31d22e53 100644
--- a/master-standalone-strict/horizontalpodautoscaler-autoscaling-v2.json
+++ b/master-standalone-strict/horizontalpodautoscaler-autoscaling-v2.json
@@ -281,10 +281,10 @@
           "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
           "properties": {
             "scaleDown": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -334,6 +334,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
@@ -343,10 +359,10 @@
               "additionalProperties": false
             },
             "scaleUp": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -396,6 +412,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
diff --git a/master-standalone-strict/horizontalpodautoscaler.json b/master-standalone-strict/horizontalpodautoscaler.json
index d20c895435..74eec1fcf8 100644
--- a/master-standalone-strict/horizontalpodautoscaler.json
+++ b/master-standalone-strict/horizontalpodautoscaler.json
@@ -278,10 +278,10 @@
           "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
           "properties": {
             "scaleDown": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -331,6 +331,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
@@ -340,10 +356,10 @@
               "additionalProperties": false
             },
             "scaleUp": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -393,6 +409,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerbehavior-autoscaling-v2.json b/master-standalone-strict/horizontalpodautoscalerbehavior-autoscaling-v2.json
index 5ae0592286..d4ccb89b93 100644
--- a/master-standalone-strict/horizontalpodautoscalerbehavior-autoscaling-v2.json
+++ b/master-standalone-strict/horizontalpodautoscalerbehavior-autoscaling-v2.json
@@ -2,10 +2,10 @@
   "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
   "properties": {
     "scaleDown": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -55,6 +55,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
@@ -64,10 +80,10 @@
       "additionalProperties": false
     },
     "scaleUp": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -117,6 +133,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerbehavior.json b/master-standalone-strict/horizontalpodautoscalerbehavior.json
index 5ae0592286..d4ccb89b93 100644
--- a/master-standalone-strict/horizontalpodautoscalerbehavior.json
+++ b/master-standalone-strict/horizontalpodautoscalerbehavior.json
@@ -2,10 +2,10 @@
   "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
   "properties": {
     "scaleDown": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -55,6 +55,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
@@ -64,10 +80,10 @@
       "additionalProperties": false
     },
     "scaleUp": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -117,6 +133,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerlist-autoscaling-v2.json b/master-standalone-strict/horizontalpodautoscalerlist-autoscaling-v2.json
index 79b3d8bd86..25bd0fdf80 100644
--- a/master-standalone-strict/horizontalpodautoscalerlist-autoscaling-v2.json
+++ b/master-standalone-strict/horizontalpodautoscalerlist-autoscaling-v2.json
@@ -296,10 +296,10 @@
                 "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
                 "properties": {
                   "scaleDown": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -349,6 +349,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
@@ -358,10 +374,10 @@
                     "additionalProperties": false
                   },
                   "scaleUp": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -411,6 +427,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerlist.json b/master-standalone-strict/horizontalpodautoscalerlist.json
index ae0548c3df..78b9ec3d5f 100644
--- a/master-standalone-strict/horizontalpodautoscalerlist.json
+++ b/master-standalone-strict/horizontalpodautoscalerlist.json
@@ -290,10 +290,10 @@
                 "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
                 "properties": {
                   "scaleDown": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -343,6 +343,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
@@ -352,10 +368,10 @@
                     "additionalProperties": false
                   },
                   "scaleUp": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -405,6 +421,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerspec-autoscaling-v2.json b/master-standalone-strict/horizontalpodautoscalerspec-autoscaling-v2.json
index 86cb2eb813..67ab9a36d5 100644
--- a/master-standalone-strict/horizontalpodautoscalerspec-autoscaling-v2.json
+++ b/master-standalone-strict/horizontalpodautoscalerspec-autoscaling-v2.json
@@ -5,10 +5,10 @@
       "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
       "properties": {
         "scaleDown": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -58,6 +58,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
@@ -67,10 +83,10 @@
           "additionalProperties": false
         },
         "scaleUp": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -120,6 +136,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
diff --git a/master-standalone-strict/horizontalpodautoscalerspec.json b/master-standalone-strict/horizontalpodautoscalerspec.json
index 86cb2eb813..67ab9a36d5 100644
--- a/master-standalone-strict/horizontalpodautoscalerspec.json
+++ b/master-standalone-strict/horizontalpodautoscalerspec.json
@@ -5,10 +5,10 @@
       "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
       "properties": {
         "scaleDown": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -58,6 +58,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
@@ -67,10 +83,10 @@
           "additionalProperties": false
         },
         "scaleUp": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -120,6 +136,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
diff --git a/master-standalone-strict/hpascalingrules-autoscaling-v2.json b/master-standalone-strict/hpascalingrules-autoscaling-v2.json
index 90ec4085a0..e2e79d7d02 100644
--- a/master-standalone-strict/hpascalingrules-autoscaling-v2.json
+++ b/master-standalone-strict/hpascalingrules-autoscaling-v2.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
         "properties": {
@@ -52,6 +52,22 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "oneOf": [
+        {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        {
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone-strict/hpascalingrules.json b/master-standalone-strict/hpascalingrules.json
index 90ec4085a0..e2e79d7d02 100644
--- a/master-standalone-strict/hpascalingrules.json
+++ b/master-standalone-strict/hpascalingrules.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
         "properties": {
@@ -52,6 +52,22 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "oneOf": [
+        {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        {
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone-strict/job-batch-v1.json b/master-standalone-strict/job-batch-v1.json
index 4a9cf83923..6f8a467caa 100644
--- a/master-standalone-strict/job-batch-v1.json
+++ b/master-standalone-strict/job-batch-v1.json
@@ -2607,6 +2607,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4600,6 +4607,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6629,6 +6643,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/job.json b/master-standalone-strict/job.json
index 03d32aed87..f99018977b 100644
--- a/master-standalone-strict/job.json
+++ b/master-standalone-strict/job.json
@@ -2604,6 +2604,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4597,6 +4604,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6626,6 +6640,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/joblist-batch-v1.json b/master-standalone-strict/joblist-batch-v1.json
index 4d9d19237a..4ede7b1fc3 100644
--- a/master-standalone-strict/joblist-batch-v1.json
+++ b/master-standalone-strict/joblist-batch-v1.json
@@ -2622,6 +2622,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4615,6 +4622,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6644,6 +6658,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/joblist.json b/master-standalone-strict/joblist.json
index 69184f68f2..cb6957829b 100644
--- a/master-standalone-strict/joblist.json
+++ b/master-standalone-strict/joblist.json
@@ -2616,6 +2616,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4609,6 +4616,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6638,6 +6652,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/jobspec-batch-v1.json b/master-standalone-strict/jobspec-batch-v1.json
index 5dd862d5c9..06021947f3 100644
--- a/master-standalone-strict/jobspec-batch-v1.json
+++ b/master-standalone-strict/jobspec-batch-v1.json
@@ -2331,6 +2331,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4324,6 +4331,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6353,6 +6367,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/jobspec.json b/master-standalone-strict/jobspec.json
index 5dd862d5c9..06021947f3 100644
--- a/master-standalone-strict/jobspec.json
+++ b/master-standalone-strict/jobspec.json
@@ -2331,6 +2331,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4324,6 +4331,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6353,6 +6367,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/jobtemplatespec-batch-v1.json b/master-standalone-strict/jobtemplatespec-batch-v1.json
index b98e7366eb..2491ab233d 100644
--- a/master-standalone-strict/jobtemplatespec-batch-v1.json
+++ b/master-standalone-strict/jobtemplatespec-batch-v1.json
@@ -2587,6 +2587,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4580,6 +4587,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6609,6 +6623,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/jobtemplatespec.json b/master-standalone-strict/jobtemplatespec.json
index b98e7366eb..2491ab233d 100644
--- a/master-standalone-strict/jobtemplatespec.json
+++ b/master-standalone-strict/jobtemplatespec.json
@@ -2587,6 +2587,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4580,6 +4587,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6609,6 +6623,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/lifecycle-v1.json b/master-standalone-strict/lifecycle-v1.json
index 00fec6022a..f609eaf8af 100644
--- a/master-standalone-strict/lifecycle-v1.json
+++ b/master-standalone-strict/lifecycle-v1.json
@@ -336,6 +336,13 @@
         "null"
       ],
       "additionalProperties": false
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone-strict/lifecycle.json b/master-standalone-strict/lifecycle.json
index 00fec6022a..f609eaf8af 100644
--- a/master-standalone-strict/lifecycle.json
+++ b/master-standalone-strict/lifecycle.json
@@ -336,6 +336,13 @@
         "null"
       ],
       "additionalProperties": false
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone-strict/pod-v1.json b/master-standalone-strict/pod-v1.json
index 44b04474c8..c57c027d70 100644
--- a/master-standalone-strict/pod-v1.json
+++ b/master-standalone-strict/pod-v1.json
@@ -2052,6 +2052,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -4045,6 +4052,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -6074,6 +6088,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -11027,6 +11048,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11594,6 +11622,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -12195,6 +12230,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
diff --git a/master-standalone-strict/pod.json b/master-standalone-strict/pod.json
index 7dcb908d5d..5c041b0044 100644
--- a/master-standalone-strict/pod.json
+++ b/master-standalone-strict/pod.json
@@ -2049,6 +2049,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -4042,6 +4049,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -6071,6 +6085,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -11024,6 +11045,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11591,6 +11619,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -12192,6 +12227,13 @@
                 ],
                 "additionalProperties": false
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
diff --git a/master-standalone-strict/podlist-v1.json b/master-standalone-strict/podlist-v1.json
index 95bb7724aa..c5ec33bb43 100644
--- a/master-standalone-strict/podlist-v1.json
+++ b/master-standalone-strict/podlist-v1.json
@@ -2067,6 +2067,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -4060,6 +4067,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -6089,6 +6103,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -11042,6 +11063,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11609,6 +11637,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -12210,6 +12245,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
diff --git a/master-standalone-strict/podlist.json b/master-standalone-strict/podlist.json
index 338970dd3e..edbee68c17 100644
--- a/master-standalone-strict/podlist.json
+++ b/master-standalone-strict/podlist.json
@@ -2061,6 +2061,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -4054,6 +4061,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -6083,6 +6097,13 @@
                             "null"
                           ],
                           "additionalProperties": false
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -11036,6 +11057,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11603,6 +11631,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -12204,6 +12239,13 @@
                       ],
                       "additionalProperties": false
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
diff --git a/master-standalone-strict/podspec-v1.json b/master-standalone-strict/podspec-v1.json
index 350acf2259..95fe0f3897 100644
--- a/master-standalone-strict/podspec-v1.json
+++ b/master-standalone-strict/podspec-v1.json
@@ -1776,6 +1776,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -3772,6 +3779,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -5801,6 +5815,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
diff --git a/master-standalone-strict/podspec.json b/master-standalone-strict/podspec.json
index 350acf2259..95fe0f3897 100644
--- a/master-standalone-strict/podspec.json
+++ b/master-standalone-strict/podspec.json
@@ -1776,6 +1776,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -3772,6 +3779,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -5801,6 +5815,13 @@
                   "null"
                 ],
                 "additionalProperties": false
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
diff --git a/master-standalone-strict/podstatus-v1.json b/master-standalone-strict/podstatus-v1.json
index d0c15109bd..fed7fdbd8c 100644
--- a/master-standalone-strict/podstatus-v1.json
+++ b/master-standalone-strict/podstatus-v1.json
@@ -523,6 +523,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1090,6 +1097,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1691,6 +1705,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
diff --git a/master-standalone-strict/podstatus.json b/master-standalone-strict/podstatus.json
index d0c15109bd..fed7fdbd8c 100644
--- a/master-standalone-strict/podstatus.json
+++ b/master-standalone-strict/podstatus.json
@@ -523,6 +523,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1090,6 +1097,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1691,6 +1705,13 @@
             ],
             "additionalProperties": false
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
diff --git a/master-standalone-strict/podtemplate-v1.json b/master-standalone-strict/podtemplate-v1.json
index 36114a1c97..5ba60fe429 100644
--- a/master-standalone-strict/podtemplate-v1.json
+++ b/master-standalone-strict/podtemplate-v1.json
@@ -2308,6 +2308,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4301,6 +4308,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6330,6 +6344,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/podtemplate.json b/master-standalone-strict/podtemplate.json
index 161deae511..f21d324696 100644
--- a/master-standalone-strict/podtemplate.json
+++ b/master-standalone-strict/podtemplate.json
@@ -2305,6 +2305,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4298,6 +4305,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6327,6 +6341,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/podtemplatelist-v1.json b/master-standalone-strict/podtemplatelist-v1.json
index 3d5a475e95..c92d354ce0 100644
--- a/master-standalone-strict/podtemplatelist-v1.json
+++ b/master-standalone-strict/podtemplatelist-v1.json
@@ -2323,6 +2323,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -4316,6 +4323,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -6345,6 +6359,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
diff --git a/master-standalone-strict/podtemplatelist.json b/master-standalone-strict/podtemplatelist.json
index 1667357752..e42b4db5c0 100644
--- a/master-standalone-strict/podtemplatelist.json
+++ b/master-standalone-strict/podtemplatelist.json
@@ -2317,6 +2317,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -4310,6 +4317,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -6339,6 +6353,13 @@
                                 "null"
                               ],
                               "additionalProperties": false
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
diff --git a/master-standalone-strict/podtemplatespec-v1.json b/master-standalone-strict/podtemplatespec-v1.json
index 887ea5e496..c315fb2587 100644
--- a/master-standalone-strict/podtemplatespec-v1.json
+++ b/master-standalone-strict/podtemplatespec-v1.json
@@ -2032,6 +2032,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -4025,6 +4032,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -6054,6 +6068,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
diff --git a/master-standalone-strict/podtemplatespec.json b/master-standalone-strict/podtemplatespec.json
index 887ea5e496..c315fb2587 100644
--- a/master-standalone-strict/podtemplatespec.json
+++ b/master-standalone-strict/podtemplatespec.json
@@ -2032,6 +2032,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -4025,6 +4032,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -6054,6 +6068,13 @@
                       "null"
                     ],
                     "additionalProperties": false
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
diff --git a/master-standalone-strict/replicaset-apps-v1.json b/master-standalone-strict/replicaset-apps-v1.json
index f7abd44b64..a5b7c714d5 100644
--- a/master-standalone-strict/replicaset-apps-v1.json
+++ b/master-standalone-strict/replicaset-apps-v1.json
@@ -2392,6 +2392,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4385,6 +4392,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6414,6 +6428,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/replicaset.json b/master-standalone-strict/replicaset.json
index 4b90bee006..5bde996b65 100644
--- a/master-standalone-strict/replicaset.json
+++ b/master-standalone-strict/replicaset.json
@@ -2389,6 +2389,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4382,6 +4389,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6411,6 +6425,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/replicasetlist-apps-v1.json b/master-standalone-strict/replicasetlist-apps-v1.json
index 929098f26c..4cb3291505 100644
--- a/master-standalone-strict/replicasetlist-apps-v1.json
+++ b/master-standalone-strict/replicasetlist-apps-v1.json
@@ -2407,6 +2407,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4400,6 +4407,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6429,6 +6443,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/replicasetlist.json b/master-standalone-strict/replicasetlist.json
index 936007cf1c..9e0766286e 100644
--- a/master-standalone-strict/replicasetlist.json
+++ b/master-standalone-strict/replicasetlist.json
@@ -2401,6 +2401,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4394,6 +4401,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6423,6 +6437,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/replicasetspec-apps-v1.json b/master-standalone-strict/replicasetspec-apps-v1.json
index ed1586ed20..4f1ede47d6 100644
--- a/master-standalone-strict/replicasetspec-apps-v1.json
+++ b/master-standalone-strict/replicasetspec-apps-v1.json
@@ -2119,6 +2119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4112,6 +4119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6141,6 +6155,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/replicasetspec.json b/master-standalone-strict/replicasetspec.json
index ed1586ed20..4f1ede47d6 100644
--- a/master-standalone-strict/replicasetspec.json
+++ b/master-standalone-strict/replicasetspec.json
@@ -2119,6 +2119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4112,6 +4119,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6141,6 +6155,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/replicationcontroller-v1.json b/master-standalone-strict/replicationcontroller-v1.json
index 8f3db7a895..c3fb8029f6 100644
--- a/master-standalone-strict/replicationcontroller-v1.json
+++ b/master-standalone-strict/replicationcontroller-v1.json
@@ -2341,6 +2341,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4334,6 +4341,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6363,6 +6377,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/replicationcontroller.json b/master-standalone-strict/replicationcontroller.json
index f80ff220b3..fa37a9efd7 100644
--- a/master-standalone-strict/replicationcontroller.json
+++ b/master-standalone-strict/replicationcontroller.json
@@ -2338,6 +2338,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4331,6 +4338,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6360,6 +6374,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/replicationcontrollerlist-v1.json b/master-standalone-strict/replicationcontrollerlist-v1.json
index 2c29ba3ba8..3f8b4e4167 100644
--- a/master-standalone-strict/replicationcontrollerlist-v1.json
+++ b/master-standalone-strict/replicationcontrollerlist-v1.json
@@ -2356,6 +2356,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4349,6 +4356,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6378,6 +6392,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/replicationcontrollerlist.json b/master-standalone-strict/replicationcontrollerlist.json
index ec9955a945..92872bf488 100644
--- a/master-standalone-strict/replicationcontrollerlist.json
+++ b/master-standalone-strict/replicationcontrollerlist.json
@@ -2350,6 +2350,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4343,6 +4350,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6372,6 +6386,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/replicationcontrollerspec-v1.json b/master-standalone-strict/replicationcontrollerspec-v1.json
index 267391121c..e4d7124b62 100644
--- a/master-standalone-strict/replicationcontrollerspec-v1.json
+++ b/master-standalone-strict/replicationcontrollerspec-v1.json
@@ -2065,6 +2065,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4058,6 +4065,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6087,6 +6101,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/replicationcontrollerspec.json b/master-standalone-strict/replicationcontrollerspec.json
index 267391121c..e4d7124b62 100644
--- a/master-standalone-strict/replicationcontrollerspec.json
+++ b/master-standalone-strict/replicationcontrollerspec.json
@@ -2065,6 +2065,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4058,6 +4065,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6087,6 +6101,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/statefulset-apps-v1.json b/master-standalone-strict/statefulset-apps-v1.json
index a1bed6ea4f..55302cb5da 100644
--- a/master-standalone-strict/statefulset-apps-v1.json
+++ b/master-standalone-strict/statefulset-apps-v1.json
@@ -2456,6 +2456,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4449,6 +4456,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6478,6 +6492,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/statefulset.json b/master-standalone-strict/statefulset.json
index e5fc50be0e..2643b80b4b 100644
--- a/master-standalone-strict/statefulset.json
+++ b/master-standalone-strict/statefulset.json
@@ -2453,6 +2453,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4446,6 +4453,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6475,6 +6489,13 @@
                               "null"
                             ],
                             "additionalProperties": false
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone-strict/statefulsetlist-apps-v1.json b/master-standalone-strict/statefulsetlist-apps-v1.json
index 569a84c2c0..aaff3be7b3 100644
--- a/master-standalone-strict/statefulsetlist-apps-v1.json
+++ b/master-standalone-strict/statefulsetlist-apps-v1.json
@@ -2471,6 +2471,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4464,6 +4471,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6493,6 +6507,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/statefulsetlist.json b/master-standalone-strict/statefulsetlist.json
index acf91aaa43..21b5ceb9ce 100644
--- a/master-standalone-strict/statefulsetlist.json
+++ b/master-standalone-strict/statefulsetlist.json
@@ -2465,6 +2465,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4458,6 +4465,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6487,6 +6501,13 @@
                                     "null"
                                   ],
                                   "additionalProperties": false
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone-strict/statefulsetspec-apps-v1.json b/master-standalone-strict/statefulsetspec-apps-v1.json
index fdc44c6ed1..7e81834543 100644
--- a/master-standalone-strict/statefulsetspec-apps-v1.json
+++ b/master-standalone-strict/statefulsetspec-apps-v1.json
@@ -2183,6 +2183,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4176,6 +4183,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6205,6 +6219,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone-strict/statefulsetspec.json b/master-standalone-strict/statefulsetspec.json
index bd201b0c0c..5d2ab46824 100644
--- a/master-standalone-strict/statefulsetspec.json
+++ b/master-standalone-strict/statefulsetspec.json
@@ -2183,6 +2183,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4176,6 +4183,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6205,6 +6219,13 @@
                           "null"
                         ],
                         "additionalProperties": false
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/_definitions.json b/master-standalone/_definitions.json
index f5dfd42f59..4b629a23e6 100644
--- a/master-standalone/_definitions.json
+++ b/master-standalone/_definitions.json
@@ -4048,10 +4048,10 @@
       "type": "object"
     },
     "io.k8s.api.autoscaling.v2.HPAScalingRules": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "$ref": "#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
           },
@@ -4066,6 +4066,10 @@
           "description": "stabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).",
           "format": "int32",
           "type": "integer"
+        },
+        "tolerance": {
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+          "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
         }
       },
       "type": "object"
@@ -6903,6 +6907,10 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerState",
           "description": "State holds details about the container's current condition."
         },
+        "stopSignal": {
+          "description": "StopSignal reports the effective stop signal for this container",
+          "type": "string"
+        },
         "user": {
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerUser",
           "description": "User represents user identity information initially attached to the first process of the container"
@@ -8082,6 +8090,10 @@
         "preStop": {
           "$ref": "#/definitions/io.k8s.api.core.v1.LifecycleHandler",
           "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/master-standalone/container-v1.json b/master-standalone/container-v1.json
index 4853a9823c..ceb0f4c610 100644
--- a/master-standalone/container-v1.json
+++ b/master-standalone/container-v1.json
@@ -610,6 +610,13 @@
             "object",
             "null"
           ]
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/container.json b/master-standalone/container.json
index 4853a9823c..ceb0f4c610 100644
--- a/master-standalone/container.json
+++ b/master-standalone/container.json
@@ -610,6 +610,13 @@
             "object",
             "null"
           ]
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/containerstatus-v1.json b/master-standalone/containerstatus-v1.json
index d95b6c11cf..06aa6379a2 100644
--- a/master-standalone/containerstatus-v1.json
+++ b/master-standalone/containerstatus-v1.json
@@ -448,6 +448,13 @@
         "null"
       ]
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "description": "ContainerUser represents user identity information",
       "properties": {
diff --git a/master-standalone/containerstatus.json b/master-standalone/containerstatus.json
index d95b6c11cf..06aa6379a2 100644
--- a/master-standalone/containerstatus.json
+++ b/master-standalone/containerstatus.json
@@ -448,6 +448,13 @@
         "null"
       ]
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "description": "ContainerUser represents user identity information",
       "properties": {
diff --git a/master-standalone/cronjob-batch-v1.json b/master-standalone/cronjob-batch-v1.json
index be3a7cf4a9..68ba2d0a5a 100644
--- a/master-standalone/cronjob-batch-v1.json
+++ b/master-standalone/cronjob-batch-v1.json
@@ -2809,6 +2809,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -4747,6 +4754,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -6721,6 +6735,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
diff --git a/master-standalone/cronjob.json b/master-standalone/cronjob.json
index dd54a4aea9..713742fa11 100644
--- a/master-standalone/cronjob.json
+++ b/master-standalone/cronjob.json
@@ -2806,6 +2806,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -4744,6 +4751,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
@@ -6718,6 +6732,13 @@
                                       "object",
                                       "null"
                                     ]
+                                  },
+                                  "stopSignal": {
+                                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
                                   }
                                 },
                                 "type": [
diff --git a/master-standalone/cronjoblist-batch-v1.json b/master-standalone/cronjoblist-batch-v1.json
index 9c231255ae..ffb288d0b0 100644
--- a/master-standalone/cronjoblist-batch-v1.json
+++ b/master-standalone/cronjoblist-batch-v1.json
@@ -2824,6 +2824,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -4762,6 +4769,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -6736,6 +6750,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
diff --git a/master-standalone/cronjoblist.json b/master-standalone/cronjoblist.json
index 3f80790169..8e4bbf08fc 100644
--- a/master-standalone/cronjoblist.json
+++ b/master-standalone/cronjoblist.json
@@ -2818,6 +2818,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -4756,6 +4763,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
@@ -6730,6 +6744,13 @@
                                             "object",
                                             "null"
                                           ]
+                                        },
+                                        "stopSignal": {
+                                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                          "type": [
+                                            "string",
+                                            "null"
+                                          ]
                                         }
                                       },
                                       "type": [
diff --git a/master-standalone/cronjobspec-batch-v1.json b/master-standalone/cronjobspec-batch-v1.json
index fe8c53a235..33165fd786 100644
--- a/master-standalone/cronjobspec-batch-v1.json
+++ b/master-standalone/cronjobspec-batch-v1.json
@@ -2536,6 +2536,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -4474,6 +4481,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -6448,6 +6462,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
diff --git a/master-standalone/cronjobspec.json b/master-standalone/cronjobspec.json
index fe8c53a235..33165fd786 100644
--- a/master-standalone/cronjobspec.json
+++ b/master-standalone/cronjobspec.json
@@ -2536,6 +2536,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -4474,6 +4481,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
@@ -6448,6 +6462,13 @@
                                   "object",
                                   "null"
                                 ]
+                              },
+                              "stopSignal": {
+                                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
                               }
                             },
                             "type": [
diff --git a/master-standalone/daemonset-apps-v1.json b/master-standalone/daemonset-apps-v1.json
index f14806506d..e17669aeb3 100644
--- a/master-standalone/daemonset-apps-v1.json
+++ b/master-standalone/daemonset-apps-v1.json
@@ -2329,6 +2329,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4267,6 +4274,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6241,6 +6255,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/daemonset.json b/master-standalone/daemonset.json
index 1d4f9d525d..1340e90e9e 100644
--- a/master-standalone/daemonset.json
+++ b/master-standalone/daemonset.json
@@ -2326,6 +2326,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4264,6 +4271,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6238,6 +6252,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/daemonsetlist-apps-v1.json b/master-standalone/daemonsetlist-apps-v1.json
index 4c5252d80f..c8ada812c3 100644
--- a/master-standalone/daemonsetlist-apps-v1.json
+++ b/master-standalone/daemonsetlist-apps-v1.json
@@ -2344,6 +2344,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4282,6 +4289,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6256,6 +6270,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/daemonsetlist.json b/master-standalone/daemonsetlist.json
index f610fa62da..ce980157b8 100644
--- a/master-standalone/daemonsetlist.json
+++ b/master-standalone/daemonsetlist.json
@@ -2338,6 +2338,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4276,6 +4283,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6250,6 +6264,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/daemonsetspec-apps-v1.json b/master-standalone/daemonsetspec-apps-v1.json
index fb61261205..74809e6631 100644
--- a/master-standalone/daemonsetspec-apps-v1.json
+++ b/master-standalone/daemonsetspec-apps-v1.json
@@ -2059,6 +2059,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3997,6 +4004,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5971,6 +5985,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/daemonsetspec.json b/master-standalone/daemonsetspec.json
index fb61261205..74809e6631 100644
--- a/master-standalone/daemonsetspec.json
+++ b/master-standalone/daemonsetspec.json
@@ -2059,6 +2059,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3997,6 +4004,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5971,6 +5985,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/deployment-apps-v1.json b/master-standalone/deployment-apps-v1.json
index cdf48bed82..d3d9c65235 100644
--- a/master-standalone/deployment-apps-v1.json
+++ b/master-standalone/deployment-apps-v1.json
@@ -2409,6 +2409,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4347,6 +4354,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6321,6 +6335,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/deployment.json b/master-standalone/deployment.json
index f0d0d19b93..e044a39a3f 100644
--- a/master-standalone/deployment.json
+++ b/master-standalone/deployment.json
@@ -2406,6 +2406,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4344,6 +4351,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6318,6 +6332,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/deploymentlist-apps-v1.json b/master-standalone/deploymentlist-apps-v1.json
index ed43d31858..fa55d945a3 100644
--- a/master-standalone/deploymentlist-apps-v1.json
+++ b/master-standalone/deploymentlist-apps-v1.json
@@ -2424,6 +2424,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4362,6 +4369,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6336,6 +6350,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/deploymentlist.json b/master-standalone/deploymentlist.json
index 3ce8df0582..eb4568980d 100644
--- a/master-standalone/deploymentlist.json
+++ b/master-standalone/deploymentlist.json
@@ -2418,6 +2418,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4356,6 +4363,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6330,6 +6344,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/deploymentspec-apps-v1.json b/master-standalone/deploymentspec-apps-v1.json
index be99af85c0..264e2e36d6 100644
--- a/master-standalone/deploymentspec-apps-v1.json
+++ b/master-standalone/deploymentspec-apps-v1.json
@@ -2139,6 +2139,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4077,6 +4084,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6051,6 +6065,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/deploymentspec.json b/master-standalone/deploymentspec.json
index be99af85c0..264e2e36d6 100644
--- a/master-standalone/deploymentspec.json
+++ b/master-standalone/deploymentspec.json
@@ -2139,6 +2139,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4077,6 +4084,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6051,6 +6065,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/ephemeralcontainer-v1.json b/master-standalone/ephemeralcontainer-v1.json
index a9067c43d1..379d287824 100644
--- a/master-standalone/ephemeralcontainer-v1.json
+++ b/master-standalone/ephemeralcontainer-v1.json
@@ -610,6 +610,13 @@
             "object",
             "null"
           ]
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/ephemeralcontainer.json b/master-standalone/ephemeralcontainer.json
index a9067c43d1..379d287824 100644
--- a/master-standalone/ephemeralcontainer.json
+++ b/master-standalone/ephemeralcontainer.json
@@ -610,6 +610,13 @@
             "object",
             "null"
           ]
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": [
+            "string",
+            "null"
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/horizontalpodautoscaler-autoscaling-v2.json b/master-standalone/horizontalpodautoscaler-autoscaling-v2.json
index 0e582b27e5..1b4371b0f8 100644
--- a/master-standalone/horizontalpodautoscaler-autoscaling-v2.json
+++ b/master-standalone/horizontalpodautoscaler-autoscaling-v2.json
@@ -278,10 +278,10 @@
           "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
           "properties": {
             "scaleDown": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -330,6 +330,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
@@ -338,10 +354,10 @@
               ]
             },
             "scaleUp": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -390,6 +406,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
diff --git a/master-standalone/horizontalpodautoscaler.json b/master-standalone/horizontalpodautoscaler.json
index 18261ef780..6b36f695ab 100644
--- a/master-standalone/horizontalpodautoscaler.json
+++ b/master-standalone/horizontalpodautoscaler.json
@@ -275,10 +275,10 @@
           "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
           "properties": {
             "scaleDown": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -327,6 +327,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
@@ -335,10 +351,10 @@
               ]
             },
             "scaleUp": {
-              "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+              "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
               "properties": {
                 "policies": {
-                  "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                  "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                   "items": {
                     "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                     "properties": {
@@ -387,6 +403,22 @@
                     "integer",
                     "null"
                   ]
+                },
+                "tolerance": {
+                  "oneOf": [
+                    {
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
+                    {
+                      "type": [
+                        "number",
+                        "null"
+                      ]
+                    }
+                  ]
                 }
               },
               "type": [
diff --git a/master-standalone/horizontalpodautoscalerbehavior-autoscaling-v2.json b/master-standalone/horizontalpodautoscalerbehavior-autoscaling-v2.json
index 13c67a8b43..7ca021e8fd 100644
--- a/master-standalone/horizontalpodautoscalerbehavior-autoscaling-v2.json
+++ b/master-standalone/horizontalpodautoscalerbehavior-autoscaling-v2.json
@@ -2,10 +2,10 @@
   "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
   "properties": {
     "scaleDown": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -54,6 +54,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
@@ -62,10 +78,10 @@
       ]
     },
     "scaleUp": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -114,6 +130,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/horizontalpodautoscalerbehavior.json b/master-standalone/horizontalpodautoscalerbehavior.json
index 13c67a8b43..7ca021e8fd 100644
--- a/master-standalone/horizontalpodautoscalerbehavior.json
+++ b/master-standalone/horizontalpodautoscalerbehavior.json
@@ -2,10 +2,10 @@
   "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
   "properties": {
     "scaleDown": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -54,6 +54,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
@@ -62,10 +78,10 @@
       ]
     },
     "scaleUp": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
             "properties": {
@@ -114,6 +130,22 @@
             "integer",
             "null"
           ]
+        },
+        "tolerance": {
+          "oneOf": [
+            {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            {
+              "type": [
+                "number",
+                "null"
+              ]
+            }
+          ]
         }
       },
       "type": [
diff --git a/master-standalone/horizontalpodautoscalerlist-autoscaling-v2.json b/master-standalone/horizontalpodautoscalerlist-autoscaling-v2.json
index 29c843fa93..a5e6152e99 100644
--- a/master-standalone/horizontalpodautoscalerlist-autoscaling-v2.json
+++ b/master-standalone/horizontalpodautoscalerlist-autoscaling-v2.json
@@ -293,10 +293,10 @@
                 "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
                 "properties": {
                   "scaleDown": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -345,6 +345,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
@@ -353,10 +369,10 @@
                     ]
                   },
                   "scaleUp": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -405,6 +421,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/horizontalpodautoscalerlist.json b/master-standalone/horizontalpodautoscalerlist.json
index 6bdf9f1b08..bd1fab5946 100644
--- a/master-standalone/horizontalpodautoscalerlist.json
+++ b/master-standalone/horizontalpodautoscalerlist.json
@@ -287,10 +287,10 @@
                 "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
                 "properties": {
                   "scaleDown": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -339,6 +339,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
@@ -347,10 +363,10 @@
                     ]
                   },
                   "scaleUp": {
-                    "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+                    "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
                     "properties": {
                       "policies": {
-                        "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+                        "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
                         "items": {
                           "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                           "properties": {
@@ -399,6 +415,22 @@
                           "integer",
                           "null"
                         ]
+                      },
+                      "tolerance": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": [
+                              "number",
+                              "null"
+                            ]
+                          }
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/horizontalpodautoscalerspec-autoscaling-v2.json b/master-standalone/horizontalpodautoscalerspec-autoscaling-v2.json
index fc89f006ad..22550de24d 100644
--- a/master-standalone/horizontalpodautoscalerspec-autoscaling-v2.json
+++ b/master-standalone/horizontalpodautoscalerspec-autoscaling-v2.json
@@ -5,10 +5,10 @@
       "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
       "properties": {
         "scaleDown": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -57,6 +57,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
@@ -65,10 +81,10 @@
           ]
         },
         "scaleUp": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -117,6 +133,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
diff --git a/master-standalone/horizontalpodautoscalerspec.json b/master-standalone/horizontalpodautoscalerspec.json
index fc89f006ad..22550de24d 100644
--- a/master-standalone/horizontalpodautoscalerspec.json
+++ b/master-standalone/horizontalpodautoscalerspec.json
@@ -5,10 +5,10 @@
       "description": "HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).",
       "properties": {
         "scaleDown": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -57,6 +57,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
@@ -65,10 +81,10 @@
           ]
         },
         "scaleUp": {
-          "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+          "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
           "properties": {
             "policies": {
-              "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+              "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
               "items": {
                 "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
                 "properties": {
@@ -117,6 +133,22 @@
                 "integer",
                 "null"
               ]
+            },
+            "tolerance": {
+              "oneOf": [
+                {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                },
+                {
+                  "type": [
+                    "number",
+                    "null"
+                  ]
+                }
+              ]
             }
           },
           "type": [
diff --git a/master-standalone/hpascalingrules-autoscaling-v2.json b/master-standalone/hpascalingrules-autoscaling-v2.json
index 8c606a97a3..8c27657574 100644
--- a/master-standalone/hpascalingrules-autoscaling-v2.json
+++ b/master-standalone/hpascalingrules-autoscaling-v2.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
         "properties": {
@@ -51,6 +51,22 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "oneOf": [
+        {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        {
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone/hpascalingrules.json b/master-standalone/hpascalingrules.json
index 8c606a97a3..8c27657574 100644
--- a/master-standalone/hpascalingrules.json
+++ b/master-standalone/hpascalingrules.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "description": "HPAScalingPolicy is a single policy which must hold true for a specified past interval.",
         "properties": {
@@ -51,6 +51,22 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "oneOf": [
+        {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        {
+          "type": [
+            "number",
+            "null"
+          ]
+        }
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone/job-batch-v1.json b/master-standalone/job-batch-v1.json
index d04217d991..30f17365cb 100644
--- a/master-standalone/job-batch-v1.json
+++ b/master-standalone/job-batch-v1.json
@@ -2538,6 +2538,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4476,6 +4483,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6450,6 +6464,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/job.json b/master-standalone/job.json
index 539c7d56cc..e8ef3eedd6 100644
--- a/master-standalone/job.json
+++ b/master-standalone/job.json
@@ -2535,6 +2535,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4473,6 +4480,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6447,6 +6461,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/joblist-batch-v1.json b/master-standalone/joblist-batch-v1.json
index c20a043466..319943a639 100644
--- a/master-standalone/joblist-batch-v1.json
+++ b/master-standalone/joblist-batch-v1.json
@@ -2553,6 +2553,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4491,6 +4498,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6465,6 +6479,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/joblist.json b/master-standalone/joblist.json
index f77be5dcff..76f56ab42a 100644
--- a/master-standalone/joblist.json
+++ b/master-standalone/joblist.json
@@ -2547,6 +2547,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4485,6 +4492,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6459,6 +6473,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/jobspec-batch-v1.json b/master-standalone/jobspec-batch-v1.json
index c1ea296ed7..b8aab7d515 100644
--- a/master-standalone/jobspec-batch-v1.json
+++ b/master-standalone/jobspec-batch-v1.json
@@ -2265,6 +2265,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4203,6 +4210,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6177,6 +6191,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/jobspec.json b/master-standalone/jobspec.json
index c1ea296ed7..b8aab7d515 100644
--- a/master-standalone/jobspec.json
+++ b/master-standalone/jobspec.json
@@ -2265,6 +2265,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4203,6 +4210,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6177,6 +6191,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/jobtemplatespec-batch-v1.json b/master-standalone/jobtemplatespec-batch-v1.json
index d6b9d19aed..5ffe91e474 100644
--- a/master-standalone/jobtemplatespec-batch-v1.json
+++ b/master-standalone/jobtemplatespec-batch-v1.json
@@ -2518,6 +2518,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4456,6 +4463,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6430,6 +6444,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/jobtemplatespec.json b/master-standalone/jobtemplatespec.json
index d6b9d19aed..5ffe91e474 100644
--- a/master-standalone/jobtemplatespec.json
+++ b/master-standalone/jobtemplatespec.json
@@ -2518,6 +2518,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4456,6 +4463,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6430,6 +6444,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/lifecycle-v1.json b/master-standalone/lifecycle-v1.json
index 4312b19d55..dae6732a43 100644
--- a/master-standalone/lifecycle-v1.json
+++ b/master-standalone/lifecycle-v1.json
@@ -324,6 +324,13 @@
         "object",
         "null"
       ]
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone/lifecycle.json b/master-standalone/lifecycle.json
index 4312b19d55..dae6732a43 100644
--- a/master-standalone/lifecycle.json
+++ b/master-standalone/lifecycle.json
@@ -324,6 +324,13 @@
         "object",
         "null"
       ]
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master-standalone/pod-v1.json b/master-standalone/pod-v1.json
index def96b634e..6ffa7b5b8c 100644
--- a/master-standalone/pod-v1.json
+++ b/master-standalone/pod-v1.json
@@ -1994,6 +1994,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -3932,6 +3939,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -5906,6 +5920,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -10730,6 +10751,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11281,6 +11309,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11865,6 +11900,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
diff --git a/master-standalone/pod.json b/master-standalone/pod.json
index 00222aa7be..debdb822dc 100644
--- a/master-standalone/pod.json
+++ b/master-standalone/pod.json
@@ -1991,6 +1991,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -3929,6 +3936,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -5903,6 +5917,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -10727,6 +10748,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11278,6 +11306,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
@@ -11862,6 +11897,13 @@
                   "null"
                 ]
               },
+              "stopSignal": {
+                "description": "StopSignal reports the effective stop signal for this container",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "user": {
                 "description": "ContainerUser represents user identity information",
                 "properties": {
diff --git a/master-standalone/podlist-v1.json b/master-standalone/podlist-v1.json
index 00bb0070c3..f13e077658 100644
--- a/master-standalone/podlist-v1.json
+++ b/master-standalone/podlist-v1.json
@@ -2009,6 +2009,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -3947,6 +3954,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -5921,6 +5935,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -10745,6 +10766,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11296,6 +11324,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11880,6 +11915,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
diff --git a/master-standalone/podlist.json b/master-standalone/podlist.json
index 7c5ca4b414..ef18e72697 100644
--- a/master-standalone/podlist.json
+++ b/master-standalone/podlist.json
@@ -2003,6 +2003,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -3941,6 +3948,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -5915,6 +5929,13 @@
                             "object",
                             "null"
                           ]
+                        },
+                        "stopSignal": {
+                          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                          "type": [
+                            "string",
+                            "null"
+                          ]
                         }
                       },
                       "type": [
@@ -10739,6 +10760,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11290,6 +11318,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
@@ -11874,6 +11909,13 @@
                         "null"
                       ]
                     },
+                    "stopSignal": {
+                      "description": "StopSignal reports the effective stop signal for this container",
+                      "type": [
+                        "string",
+                        "null"
+                      ]
+                    },
                     "user": {
                       "description": "ContainerUser represents user identity information",
                       "properties": {
diff --git a/master-standalone/podspec-v1.json b/master-standalone/podspec-v1.json
index 4419981076..2137389ccc 100644
--- a/master-standalone/podspec-v1.json
+++ b/master-standalone/podspec-v1.json
@@ -1721,6 +1721,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -3662,6 +3669,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -5636,6 +5650,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
diff --git a/master-standalone/podspec.json b/master-standalone/podspec.json
index 4419981076..2137389ccc 100644
--- a/master-standalone/podspec.json
+++ b/master-standalone/podspec.json
@@ -1721,6 +1721,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -3662,6 +3669,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
@@ -5636,6 +5650,13 @@
                   "object",
                   "null"
                 ]
+              },
+              "stopSignal": {
+                "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                "type": [
+                  "string",
+                  "null"
+                ]
               }
             },
             "type": [
diff --git a/master-standalone/podstatus-v1.json b/master-standalone/podstatus-v1.json
index 85db0ccfc7..2c9cbb9c4e 100644
--- a/master-standalone/podstatus-v1.json
+++ b/master-standalone/podstatus-v1.json
@@ -510,6 +510,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1061,6 +1068,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1645,6 +1659,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
diff --git a/master-standalone/podstatus.json b/master-standalone/podstatus.json
index 85db0ccfc7..2c9cbb9c4e 100644
--- a/master-standalone/podstatus.json
+++ b/master-standalone/podstatus.json
@@ -510,6 +510,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1061,6 +1068,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
@@ -1645,6 +1659,13 @@
               "null"
             ]
           },
+          "stopSignal": {
+            "description": "StopSignal reports the effective stop signal for this container",
+            "type": [
+              "string",
+              "null"
+            ]
+          },
           "user": {
             "description": "ContainerUser represents user identity information",
             "properties": {
diff --git a/master-standalone/podtemplate-v1.json b/master-standalone/podtemplate-v1.json
index 07f56d51f7..1437b650a2 100644
--- a/master-standalone/podtemplate-v1.json
+++ b/master-standalone/podtemplate-v1.json
@@ -2247,6 +2247,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4185,6 +4192,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6159,6 +6173,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/podtemplate.json b/master-standalone/podtemplate.json
index ba52dea7cb..0991fc3f19 100644
--- a/master-standalone/podtemplate.json
+++ b/master-standalone/podtemplate.json
@@ -2244,6 +2244,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4182,6 +4189,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6156,6 +6170,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/podtemplatelist-v1.json b/master-standalone/podtemplatelist-v1.json
index 7bb4632270..4dd53c032c 100644
--- a/master-standalone/podtemplatelist-v1.json
+++ b/master-standalone/podtemplatelist-v1.json
@@ -2262,6 +2262,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -4200,6 +4207,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -6174,6 +6188,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
diff --git a/master-standalone/podtemplatelist.json b/master-standalone/podtemplatelist.json
index 314573169b..0a0e44da87 100644
--- a/master-standalone/podtemplatelist.json
+++ b/master-standalone/podtemplatelist.json
@@ -2256,6 +2256,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -4194,6 +4201,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
@@ -6168,6 +6182,13 @@
                                 "object",
                                 "null"
                               ]
+                            },
+                            "stopSignal": {
+                              "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                              "type": [
+                                "string",
+                                "null"
+                              ]
                             }
                           },
                           "type": [
diff --git a/master-standalone/podtemplatespec-v1.json b/master-standalone/podtemplatespec-v1.json
index bca78cd7ea..a61dcf3b42 100644
--- a/master-standalone/podtemplatespec-v1.json
+++ b/master-standalone/podtemplatespec-v1.json
@@ -1974,6 +1974,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -3912,6 +3919,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -5886,6 +5900,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
diff --git a/master-standalone/podtemplatespec.json b/master-standalone/podtemplatespec.json
index bca78cd7ea..a61dcf3b42 100644
--- a/master-standalone/podtemplatespec.json
+++ b/master-standalone/podtemplatespec.json
@@ -1974,6 +1974,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -3912,6 +3919,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
@@ -5886,6 +5900,13 @@
                       "object",
                       "null"
                     ]
+                  },
+                  "stopSignal": {
+                    "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
                   }
                 },
                 "type": [
diff --git a/master-standalone/replicaset-apps-v1.json b/master-standalone/replicaset-apps-v1.json
index 5d07012ac1..9953267bd0 100644
--- a/master-standalone/replicaset-apps-v1.json
+++ b/master-standalone/replicaset-apps-v1.json
@@ -2329,6 +2329,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4267,6 +4274,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6241,6 +6255,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/replicaset.json b/master-standalone/replicaset.json
index 88aa8e378a..0610e4cac8 100644
--- a/master-standalone/replicaset.json
+++ b/master-standalone/replicaset.json
@@ -2326,6 +2326,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4264,6 +4271,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6238,6 +6252,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/replicasetlist-apps-v1.json b/master-standalone/replicasetlist-apps-v1.json
index 328d9867da..e1f8b9dcc5 100644
--- a/master-standalone/replicasetlist-apps-v1.json
+++ b/master-standalone/replicasetlist-apps-v1.json
@@ -2344,6 +2344,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4282,6 +4289,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6256,6 +6270,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/replicasetlist.json b/master-standalone/replicasetlist.json
index 033e27fe64..5106710e8b 100644
--- a/master-standalone/replicasetlist.json
+++ b/master-standalone/replicasetlist.json
@@ -2338,6 +2338,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4276,6 +4283,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6250,6 +6264,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/replicasetspec-apps-v1.json b/master-standalone/replicasetspec-apps-v1.json
index ffa4b809c0..4204c11fd2 100644
--- a/master-standalone/replicasetspec-apps-v1.json
+++ b/master-standalone/replicasetspec-apps-v1.json
@@ -2059,6 +2059,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3997,6 +4004,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5971,6 +5985,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/replicasetspec.json b/master-standalone/replicasetspec.json
index ffa4b809c0..4204c11fd2 100644
--- a/master-standalone/replicasetspec.json
+++ b/master-standalone/replicasetspec.json
@@ -2059,6 +2059,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3997,6 +4004,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5971,6 +5985,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/replicationcontroller-v1.json b/master-standalone/replicationcontroller-v1.json
index 5eb4667024..34c74c8627 100644
--- a/master-standalone/replicationcontroller-v1.json
+++ b/master-standalone/replicationcontroller-v1.json
@@ -2280,6 +2280,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4218,6 +4225,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6192,6 +6206,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/replicationcontroller.json b/master-standalone/replicationcontroller.json
index 39049e5d26..2c1f451c18 100644
--- a/master-standalone/replicationcontroller.json
+++ b/master-standalone/replicationcontroller.json
@@ -2277,6 +2277,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4215,6 +4222,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6189,6 +6203,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/replicationcontrollerlist-v1.json b/master-standalone/replicationcontrollerlist-v1.json
index c2e21e9183..ede9af54bd 100644
--- a/master-standalone/replicationcontrollerlist-v1.json
+++ b/master-standalone/replicationcontrollerlist-v1.json
@@ -2295,6 +2295,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4233,6 +4240,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6207,6 +6221,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/replicationcontrollerlist.json b/master-standalone/replicationcontrollerlist.json
index b7b9d56a4a..bd72dd5a0c 100644
--- a/master-standalone/replicationcontrollerlist.json
+++ b/master-standalone/replicationcontrollerlist.json
@@ -2289,6 +2289,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4227,6 +4234,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6201,6 +6215,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/replicationcontrollerspec-v1.json b/master-standalone/replicationcontrollerspec-v1.json
index c645502f79..238fd6fdbc 100644
--- a/master-standalone/replicationcontrollerspec-v1.json
+++ b/master-standalone/replicationcontrollerspec-v1.json
@@ -2007,6 +2007,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3945,6 +3952,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5919,6 +5933,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/replicationcontrollerspec.json b/master-standalone/replicationcontrollerspec.json
index c645502f79..238fd6fdbc 100644
--- a/master-standalone/replicationcontrollerspec.json
+++ b/master-standalone/replicationcontrollerspec.json
@@ -2007,6 +2007,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -3945,6 +3952,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -5919,6 +5933,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/statefulset-apps-v1.json b/master-standalone/statefulset-apps-v1.json
index d1aaf5d363..bd03613a10 100644
--- a/master-standalone/statefulset-apps-v1.json
+++ b/master-standalone/statefulset-apps-v1.json
@@ -2391,6 +2391,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4329,6 +4336,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6303,6 +6317,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/statefulset.json b/master-standalone/statefulset.json
index 9cd5be9e29..6bfd59ac3d 100644
--- a/master-standalone/statefulset.json
+++ b/master-standalone/statefulset.json
@@ -2388,6 +2388,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -4326,6 +4333,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
@@ -6300,6 +6314,13 @@
                               "object",
                               "null"
                             ]
+                          },
+                          "stopSignal": {
+                            "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
                           }
                         },
                         "type": [
diff --git a/master-standalone/statefulsetlist-apps-v1.json b/master-standalone/statefulsetlist-apps-v1.json
index 400a56e983..aa6b5b55ab 100644
--- a/master-standalone/statefulsetlist-apps-v1.json
+++ b/master-standalone/statefulsetlist-apps-v1.json
@@ -2406,6 +2406,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4344,6 +4351,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6318,6 +6332,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/statefulsetlist.json b/master-standalone/statefulsetlist.json
index 19503adaf8..142ebeecf3 100644
--- a/master-standalone/statefulsetlist.json
+++ b/master-standalone/statefulsetlist.json
@@ -2400,6 +2400,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -4338,6 +4345,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
@@ -6312,6 +6326,13 @@
                                     "object",
                                     "null"
                                   ]
+                                },
+                                "stopSignal": {
+                                  "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                                  "type": [
+                                    "string",
+                                    "null"
+                                  ]
                                 }
                               },
                               "type": [
diff --git a/master-standalone/statefulsetspec-apps-v1.json b/master-standalone/statefulsetspec-apps-v1.json
index 83bc16bb78..39925d70cd 100644
--- a/master-standalone/statefulsetspec-apps-v1.json
+++ b/master-standalone/statefulsetspec-apps-v1.json
@@ -2121,6 +2121,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4059,6 +4066,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6033,6 +6047,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master-standalone/statefulsetspec.json b/master-standalone/statefulsetspec.json
index 8364b0ef3a..6dec2152c9 100644
--- a/master-standalone/statefulsetspec.json
+++ b/master-standalone/statefulsetspec.json
@@ -2121,6 +2121,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -4059,6 +4066,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
@@ -6033,6 +6047,13 @@
                           "object",
                           "null"
                         ]
+                      },
+                      "stopSignal": {
+                        "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
                       }
                     },
                     "type": [
diff --git a/master/_definitions.json b/master/_definitions.json
index f5dfd42f59..4b629a23e6 100644
--- a/master/_definitions.json
+++ b/master/_definitions.json
@@ -4048,10 +4048,10 @@
       "type": "object"
     },
     "io.k8s.api.autoscaling.v2.HPAScalingRules": {
-      "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+      "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
       "properties": {
         "policies": {
-          "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+          "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
           "items": {
             "$ref": "#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
           },
@@ -4066,6 +4066,10 @@
           "description": "stabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).",
           "format": "int32",
           "type": "integer"
+        },
+        "tolerance": {
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+          "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
         }
       },
       "type": "object"
@@ -6903,6 +6907,10 @@
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerState",
           "description": "State holds details about the container's current condition."
         },
+        "stopSignal": {
+          "description": "StopSignal reports the effective stop signal for this container",
+          "type": "string"
+        },
         "user": {
           "$ref": "#/definitions/io.k8s.api.core.v1.ContainerUser",
           "description": "User represents user identity information initially attached to the first process of the container"
@@ -8082,6 +8090,10 @@
         "preStop": {
           "$ref": "#/definitions/io.k8s.api.core.v1.LifecycleHandler",
           "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+        },
+        "stopSignal": {
+          "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+          "type": "string"
         }
       },
       "type": "object"
diff --git a/master/containerstatus-v1.json b/master/containerstatus-v1.json
index f8472b3170..af787de42e 100644
--- a/master/containerstatus-v1.json
+++ b/master/containerstatus-v1.json
@@ -89,6 +89,13 @@
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerState",
       "description": "State holds details about the container's current condition."
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerUser",
       "description": "User represents user identity information initially attached to the first process of the container"
diff --git a/master/containerstatus.json b/master/containerstatus.json
index f8472b3170..af787de42e 100644
--- a/master/containerstatus.json
+++ b/master/containerstatus.json
@@ -89,6 +89,13 @@
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerState",
       "description": "State holds details about the container's current condition."
     },
+    "stopSignal": {
+      "description": "StopSignal reports the effective stop signal for this container",
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "user": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerUser",
       "description": "User represents user identity information initially attached to the first process of the container"
diff --git a/master/hpascalingrules-autoscaling-v2.json b/master/hpascalingrules-autoscaling-v2.json
index 7610d6ab17..380a034c60 100644
--- a/master/hpascalingrules-autoscaling-v2.json
+++ b/master/hpascalingrules-autoscaling-v2.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
       },
@@ -26,6 +26,10 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+      "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
     }
   },
   "type": "object",
diff --git a/master/hpascalingrules.json b/master/hpascalingrules.json
index 7610d6ab17..380a034c60 100644
--- a/master/hpascalingrules.json
+++ b/master/hpascalingrules.json
@@ -1,8 +1,8 @@
 {
-  "description": "HPAScalingRules configures the scaling behavior for one direction. These Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.",
+  "description": "HPAScalingRules configures the scaling behavior for one direction via scaling Policy Rules and a configurable metric tolerance.\n\nScaling Policy Rules are applied after calculating DesiredReplicas from metrics for the HPA. They can limit the scaling velocity by specifying scaling policies. They can prevent flapping by specifying the stabilization window, so that the number of replicas is not set instantly, instead, the safest value from the stabilization window is chosen.\n\nThe tolerance is applied to the metric values and prevents scaling too eagerly for small metric variations. (Note that setting a tolerance requires enabling the alpha HPAConfigurableTolerance feature gate.)",
   "properties": {
     "policies": {
-      "description": "policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid",
+      "description": "policies is a list of potential scaling polices which can be used during scaling. If not set, use the default values: - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window. - For scale down: allow all pods to be removed in a 15s window.",
       "items": {
         "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.autoscaling.v2.HPAScalingPolicy"
       },
@@ -26,6 +26,10 @@
         "integer",
         "null"
       ]
+    },
+    "tolerance": {
+      "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity",
+      "description": "tolerance is the tolerance on the ratio between the current and desired metric value under which no updates are made to the desired number of replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not set, the default cluster-wide tolerance is applied (by default 10%).\n\nFor example, if autoscaling is configured with a memory consumption target of 100Mi, and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be triggered when the actual consumption falls below 95Mi or exceeds 101Mi.\n\nThis is an alpha field and requires enabling the HPAConfigurableTolerance feature gate."
     }
   },
   "type": "object",
diff --git a/master/lifecycle-v1.json b/master/lifecycle-v1.json
index bbc50955d6..868e90a092 100644
--- a/master/lifecycle-v1.json
+++ b/master/lifecycle-v1.json
@@ -8,6 +8,13 @@
     "preStop": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.LifecycleHandler",
       "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
diff --git a/master/lifecycle.json b/master/lifecycle.json
index bbc50955d6..868e90a092 100644
--- a/master/lifecycle.json
+++ b/master/lifecycle.json
@@ -8,6 +8,13 @@
     "preStop": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.LifecycleHandler",
       "description": "PreStop is called immediately before a container is terminated due to an API request or management event such as liveness/startup probe failure, preemption, resource contention, etc. The handler is not called if the container crashes or exits. The Pod's termination grace period countdown begins before the PreStop hook is executed. Regardless of the outcome of the handler, the container will eventually terminate within the Pod's termination grace period (unless delayed by finalizers). Other management of the container blocks until the hook completes or until the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks"
+    },
+    "stopSignal": {
+      "description": "StopSignal defines which signal will be sent to a container when it is being stopped. If not specified, the default is defined by the container runtime in use. StopSignal can only be set for Pods with a non-empty .spec.os.name",
+      "type": [
+        "string",
+        "null"
+      ]
     }
   },
   "type": "object",
-- 
GitLab