From b56dec0b249effb1b102834c51ee11a079e96aca Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann+github@mandragor.org>
Date: Sat, 25 Jan 2025 10:32:51 +0000
Subject: [PATCH] Adding new schemas

---
 master-local/_definitions.json                | 32 ++++++++++++-------
 master-local/deploymentstatus-apps-v1.json    | 16 +++++++---
 master-local/deploymentstatus.json            | 16 +++++++---
 master-local/replicasetlist-apps-v1.json      |  2 +-
 master-local/replicasetlist.json              |  2 +-
 master-local/replicasetspec-apps-v1.json      |  4 +--
 master-local/replicasetspec.json              |  4 +--
 master-local/replicasetstatus-apps-v1.json    | 16 +++++++---
 master-local/replicasetstatus.json            | 16 +++++++---
 master-standalone-strict/_definitions.json    | 32 ++++++++++++-------
 .../deployment-apps-v1.json                   | 16 +++++++---
 master-standalone-strict/deployment.json      | 16 +++++++---
 .../deploymentlist-apps-v1.json               | 16 +++++++---
 master-standalone-strict/deploymentlist.json  | 16 +++++++---
 .../deploymentstatus-apps-v1.json             | 16 +++++++---
 .../deploymentstatus.json                     | 16 +++++++---
 .../replicaset-apps-v1.json                   | 18 ++++++++---
 master-standalone-strict/replicaset.json      | 18 ++++++++---
 .../replicasetlist-apps-v1.json               | 20 ++++++++----
 master-standalone-strict/replicasetlist.json  | 20 ++++++++----
 .../replicasetspec-apps-v1.json               |  2 +-
 master-standalone-strict/replicasetspec.json  |  2 +-
 .../replicasetstatus-apps-v1.json             | 16 +++++++---
 .../replicasetstatus.json                     | 16 +++++++---
 master-standalone/_definitions.json           | 32 ++++++++++++-------
 master-standalone/deployment-apps-v1.json     | 16 +++++++---
 master-standalone/deployment.json             | 16 +++++++---
 master-standalone/deploymentlist-apps-v1.json | 16 +++++++---
 master-standalone/deploymentlist.json         | 16 +++++++---
 .../deploymentstatus-apps-v1.json             | 16 +++++++---
 master-standalone/deploymentstatus.json       | 16 +++++++---
 master-standalone/replicaset-apps-v1.json     | 18 ++++++++---
 master-standalone/replicaset.json             | 18 ++++++++---
 master-standalone/replicasetlist-apps-v1.json | 20 ++++++++----
 master-standalone/replicasetlist.json         | 20 ++++++++----
 master-standalone/replicasetspec-apps-v1.json |  2 +-
 master-standalone/replicasetspec.json         |  2 +-
 .../replicasetstatus-apps-v1.json             | 16 +++++++---
 master-standalone/replicasetstatus.json       | 16 +++++++---
 master/_definitions.json                      | 32 ++++++++++++-------
 master/deploymentstatus-apps-v1.json          | 16 +++++++---
 master/deploymentstatus.json                  | 16 +++++++---
 master/replicasetlist-apps-v1.json            |  2 +-
 master/replicasetlist.json                    |  2 +-
 master/replicasetspec-apps-v1.json            |  4 +--
 master/replicasetspec.json                    |  4 +--
 master/replicasetstatus-apps-v1.json          | 16 +++++++---
 master/replicasetstatus.json                  | 16 +++++++---
 48 files changed, 496 insertions(+), 200 deletions(-)

diff --git a/master-local/_definitions.json b/master-local/_definitions.json
index 9bf9538e4d..2665a10365 100644
--- a/master-local/_definitions.json
+++ b/master-local/_definitions.json
@@ -2429,7 +2429,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": "integer"
         },
@@ -2457,12 +2457,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         },
@@ -2472,7 +2477,7 @@
           "type": "integer"
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": "integer"
         }
@@ -2567,7 +2572,7 @@
           "type": "string"
         },
         "items": {
-          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "items": {
             "$ref": "#/definitions/io.k8s.api.apps.v1.ReplicaSet"
           },
@@ -2606,7 +2611,7 @@
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
         },
@@ -2616,7 +2621,7 @@
         },
         "template": {
           "$ref": "#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
         }
       },
       "required": [
@@ -2628,7 +2633,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": "integer"
         },
@@ -2646,7 +2651,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": "integer"
         },
@@ -2656,12 +2661,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         }
diff --git a/master-local/deploymentstatus-apps-v1.json b/master-local/deploymentstatus-apps-v1.json
index c990cff1a9..fe213dce4f 100644
--- a/master-local/deploymentstatus-apps-v1.json
+++ b/master-local/deploymentstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +74,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-local/deploymentstatus.json b/master-local/deploymentstatus.json
index c990cff1a9..fe213dce4f 100644
--- a/master-local/deploymentstatus.json
+++ b/master-local/deploymentstatus.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +74,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-local/replicasetlist-apps-v1.json b/master-local/replicasetlist-apps-v1.json
index 8321b302b0..5d0eab52c0 100644
--- a/master-local/replicasetlist-apps-v1.json
+++ b/master-local/replicasetlist-apps-v1.json
@@ -12,7 +12,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "$ref": "_definitions.json#/definitions/io.k8s.api.apps.v1.ReplicaSet"
       },
diff --git a/master-local/replicasetlist.json b/master-local/replicasetlist.json
index eaa5166997..28aa60f62e 100644
--- a/master-local/replicasetlist.json
+++ b/master-local/replicasetlist.json
@@ -9,7 +9,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "$ref": "_definitions.json#/definitions/io.k8s.api.apps.v1.ReplicaSet"
       },
diff --git a/master-local/replicasetspec-apps-v1.json b/master-local/replicasetspec-apps-v1.json
index 0b5d04a749..8170eb96fa 100644
--- a/master-local/replicasetspec-apps-v1.json
+++ b/master-local/replicasetspec-apps-v1.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
@@ -23,7 +23,7 @@
     },
     "template": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
     }
   },
   "required": [
diff --git a/master-local/replicasetspec.json b/master-local/replicasetspec.json
index 0b5d04a749..8170eb96fa 100644
--- a/master-local/replicasetspec.json
+++ b/master-local/replicasetspec.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
@@ -23,7 +23,7 @@
     },
     "template": {
       "$ref": "_definitions.json#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
     }
   },
   "required": [
diff --git a/master-local/replicasetstatus-apps-v1.json b/master-local/replicasetstatus-apps-v1.json
index bfad6c4831..5e6257a3e8 100644
--- a/master-local/replicasetstatus-apps-v1.json
+++ b/master-local/replicasetstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -26,7 +26,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-local/replicasetstatus.json b/master-local/replicasetstatus.json
index bfad6c4831..5e6257a3e8 100644
--- a/master-local/replicasetstatus.json
+++ b/master-local/replicasetstatus.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -26,7 +26,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/_definitions.json b/master-standalone-strict/_definitions.json
index 81d0e1c173..1aea86e420 100644
--- a/master-standalone-strict/_definitions.json
+++ b/master-standalone-strict/_definitions.json
@@ -2504,7 +2504,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": "integer"
         },
@@ -2532,12 +2532,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         },
@@ -2547,7 +2552,7 @@
           "type": "integer"
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": "integer"
         }
@@ -2646,7 +2651,7 @@
           "type": "string"
         },
         "items": {
-          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "items": {
             "$ref": "#/definitions/io.k8s.api.apps.v1.ReplicaSet"
           },
@@ -2686,7 +2691,7 @@
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
         },
@@ -2696,7 +2701,7 @@
         },
         "template": {
           "$ref": "#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
         }
       },
       "required": [
@@ -2709,7 +2714,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": "integer"
         },
@@ -2727,7 +2732,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": "integer"
         },
@@ -2737,12 +2742,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         }
diff --git a/master-standalone-strict/deployment-apps-v1.json b/master-standalone-strict/deployment-apps-v1.json
index 16e93d35d1..d08baa9141 100644
--- a/master-standalone-strict/deployment-apps-v1.json
+++ b/master-standalone-strict/deployment-apps-v1.json
@@ -10943,7 +10943,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": [
             "integer",
@@ -11032,7 +11032,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -11040,7 +11040,15 @@
           ]
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": [
             "integer",
@@ -11056,7 +11064,7 @@
           ]
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": [
             "integer",
diff --git a/master-standalone-strict/deployment.json b/master-standalone-strict/deployment.json
index 7cc0f4fb61..112976a069 100644
--- a/master-standalone-strict/deployment.json
+++ b/master-standalone-strict/deployment.json
@@ -10940,7 +10940,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": [
             "integer",
@@ -11029,7 +11029,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -11037,7 +11037,15 @@
           ]
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": [
             "integer",
@@ -11053,7 +11061,7 @@
           ]
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": [
             "integer",
diff --git a/master-standalone-strict/deploymentlist-apps-v1.json b/master-standalone-strict/deploymentlist-apps-v1.json
index a7116b58d6..1b4e6968b9 100644
--- a/master-standalone-strict/deploymentlist-apps-v1.json
+++ b/master-standalone-strict/deploymentlist-apps-v1.json
@@ -10958,7 +10958,7 @@
             "description": "DeploymentStatus is the most recently observed status of the Deployment.",
             "properties": {
               "availableReplicas": {
-                "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+                "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11047,7 +11047,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+                "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11055,7 +11055,15 @@
                 ]
               },
               "replicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+                "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
+              },
+              "terminatingReplicas": {
+                "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11071,7 +11079,7 @@
                 ]
               },
               "updatedReplicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+                "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
                 "format": "int32",
                 "type": [
                   "integer",
diff --git a/master-standalone-strict/deploymentlist.json b/master-standalone-strict/deploymentlist.json
index 3e94b3b619..cc41d1da5b 100644
--- a/master-standalone-strict/deploymentlist.json
+++ b/master-standalone-strict/deploymentlist.json
@@ -10952,7 +10952,7 @@
             "description": "DeploymentStatus is the most recently observed status of the Deployment.",
             "properties": {
               "availableReplicas": {
-                "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+                "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11041,7 +11041,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+                "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11049,7 +11049,15 @@
                 ]
               },
               "replicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+                "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
+              },
+              "terminatingReplicas": {
+                "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -11065,7 +11073,7 @@
                 ]
               },
               "updatedReplicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+                "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
                 "format": "int32",
                 "type": [
                   "integer",
diff --git a/master-standalone-strict/deploymentstatus-apps-v1.json b/master-standalone-strict/deploymentstatus-apps-v1.json
index e043321704..381cd02274 100644
--- a/master-standalone-strict/deploymentstatus-apps-v1.json
+++ b/master-standalone-strict/deploymentstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -91,7 +91,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -99,7 +99,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -115,7 +123,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/deploymentstatus.json b/master-standalone-strict/deploymentstatus.json
index e043321704..381cd02274 100644
--- a/master-standalone-strict/deploymentstatus.json
+++ b/master-standalone-strict/deploymentstatus.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -91,7 +91,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -99,7 +99,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -115,7 +123,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/replicaset-apps-v1.json b/master-standalone-strict/replicaset-apps-v1.json
index a6461b51e5..98b58eac2d 100644
--- a/master-standalone-strict/replicaset-apps-v1.json
+++ b/master-standalone-strict/replicaset-apps-v1.json
@@ -286,7 +286,7 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": [
             "integer",
@@ -10863,7 +10863,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": [
             "integer",
@@ -10928,7 +10928,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": [
             "integer",
@@ -10944,7 +10944,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10952,9 +10952,17 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
         }
       },
       "required": [
diff --git a/master-standalone-strict/replicaset.json b/master-standalone-strict/replicaset.json
index 2bfe90693d..861cafdb8d 100644
--- a/master-standalone-strict/replicaset.json
+++ b/master-standalone-strict/replicaset.json
@@ -283,7 +283,7 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": [
             "integer",
@@ -10860,7 +10860,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": [
             "integer",
@@ -10925,7 +10925,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": [
             "integer",
@@ -10941,7 +10941,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10949,9 +10949,17 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
         }
       },
       "required": [
diff --git a/master-standalone-strict/replicasetlist-apps-v1.json b/master-standalone-strict/replicasetlist-apps-v1.json
index 76667f2a7b..7ad423f7fa 100644
--- a/master-standalone-strict/replicasetlist-apps-v1.json
+++ b/master-standalone-strict/replicasetlist-apps-v1.json
@@ -12,7 +12,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
         "properties": {
@@ -301,7 +301,7 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10878,7 +10878,7 @@
             "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
             "properties": {
               "availableReplicas": {
-                "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+                "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10943,7 +10943,7 @@
                 "x-kubernetes-patch-strategy": "merge"
               },
               "fullyLabeledReplicas": {
-                "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+                "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10959,7 +10959,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+                "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10967,9 +10967,17 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": "integer"
+              },
+              "terminatingReplicas": {
+                "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
               }
             },
             "required": [
diff --git a/master-standalone-strict/replicasetlist.json b/master-standalone-strict/replicasetlist.json
index cbe2d7c14d..980b56be81 100644
--- a/master-standalone-strict/replicasetlist.json
+++ b/master-standalone-strict/replicasetlist.json
@@ -9,7 +9,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
         "properties": {
@@ -295,7 +295,7 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10872,7 +10872,7 @@
             "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
             "properties": {
               "availableReplicas": {
-                "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+                "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10937,7 +10937,7 @@
                 "x-kubernetes-patch-strategy": "merge"
               },
               "fullyLabeledReplicas": {
-                "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+                "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10953,7 +10953,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+                "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10961,9 +10961,17 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": "integer"
+              },
+              "terminatingReplicas": {
+                "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
               }
             },
             "required": [
diff --git a/master-standalone-strict/replicasetspec-apps-v1.json b/master-standalone-strict/replicasetspec-apps-v1.json
index 3570820c43..e17a345d71 100644
--- a/master-standalone-strict/replicasetspec-apps-v1.json
+++ b/master-standalone-strict/replicasetspec-apps-v1.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/replicasetspec.json b/master-standalone-strict/replicasetspec.json
index 3570820c43..e17a345d71 100644
--- a/master-standalone-strict/replicasetspec.json
+++ b/master-standalone-strict/replicasetspec.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/replicasetstatus-apps-v1.json b/master-standalone-strict/replicasetstatus-apps-v1.json
index 04c729f476..a222a02504 100644
--- a/master-standalone-strict/replicasetstatus-apps-v1.json
+++ b/master-standalone-strict/replicasetstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -67,7 +67,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -83,7 +83,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -91,7 +91,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone-strict/replicasetstatus.json b/master-standalone-strict/replicasetstatus.json
index 04c729f476..a222a02504 100644
--- a/master-standalone-strict/replicasetstatus.json
+++ b/master-standalone-strict/replicasetstatus.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -67,7 +67,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -83,7 +83,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -91,7 +91,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/_definitions.json b/master-standalone/_definitions.json
index 9bf9538e4d..2665a10365 100644
--- a/master-standalone/_definitions.json
+++ b/master-standalone/_definitions.json
@@ -2429,7 +2429,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": "integer"
         },
@@ -2457,12 +2457,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         },
@@ -2472,7 +2477,7 @@
           "type": "integer"
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": "integer"
         }
@@ -2567,7 +2572,7 @@
           "type": "string"
         },
         "items": {
-          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "items": {
             "$ref": "#/definitions/io.k8s.api.apps.v1.ReplicaSet"
           },
@@ -2606,7 +2611,7 @@
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
         },
@@ -2616,7 +2621,7 @@
         },
         "template": {
           "$ref": "#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
         }
       },
       "required": [
@@ -2628,7 +2633,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": "integer"
         },
@@ -2646,7 +2651,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": "integer"
         },
@@ -2656,12 +2661,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         }
diff --git a/master-standalone/deployment-apps-v1.json b/master-standalone/deployment-apps-v1.json
index b1dd8eb48e..192e8e065f 100644
--- a/master-standalone/deployment-apps-v1.json
+++ b/master-standalone/deployment-apps-v1.json
@@ -10650,7 +10650,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": [
             "integer",
@@ -10738,7 +10738,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10746,7 +10746,15 @@
           ]
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": [
             "integer",
@@ -10762,7 +10770,7 @@
           ]
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": [
             "integer",
diff --git a/master-standalone/deployment.json b/master-standalone/deployment.json
index aebf7ddb8d..237923baa2 100644
--- a/master-standalone/deployment.json
+++ b/master-standalone/deployment.json
@@ -10647,7 +10647,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": [
             "integer",
@@ -10735,7 +10735,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10743,7 +10743,15 @@
           ]
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": [
             "integer",
@@ -10759,7 +10767,7 @@
           ]
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": [
             "integer",
diff --git a/master-standalone/deploymentlist-apps-v1.json b/master-standalone/deploymentlist-apps-v1.json
index 0734d0a832..1583330f2b 100644
--- a/master-standalone/deploymentlist-apps-v1.json
+++ b/master-standalone/deploymentlist-apps-v1.json
@@ -10665,7 +10665,7 @@
             "description": "DeploymentStatus is the most recently observed status of the Deployment.",
             "properties": {
               "availableReplicas": {
-                "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+                "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10753,7 +10753,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+                "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10761,7 +10761,15 @@
                 ]
               },
               "replicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+                "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
+              },
+              "terminatingReplicas": {
+                "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10777,7 +10785,7 @@
                 ]
               },
               "updatedReplicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+                "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
                 "format": "int32",
                 "type": [
                   "integer",
diff --git a/master-standalone/deploymentlist.json b/master-standalone/deploymentlist.json
index 5969369bbd..9260f57172 100644
--- a/master-standalone/deploymentlist.json
+++ b/master-standalone/deploymentlist.json
@@ -10659,7 +10659,7 @@
             "description": "DeploymentStatus is the most recently observed status of the Deployment.",
             "properties": {
               "availableReplicas": {
-                "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+                "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10747,7 +10747,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+                "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10755,7 +10755,15 @@
                 ]
               },
               "replicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+                "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
+              },
+              "terminatingReplicas": {
+                "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10771,7 +10779,7 @@
                 ]
               },
               "updatedReplicas": {
-                "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+                "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
                 "format": "int32",
                 "type": [
                   "integer",
diff --git a/master-standalone/deploymentstatus-apps-v1.json b/master-standalone/deploymentstatus-apps-v1.json
index 180445e444..16b8f27f5f 100644
--- a/master-standalone/deploymentstatus-apps-v1.json
+++ b/master-standalone/deploymentstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -90,7 +90,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -98,7 +98,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -114,7 +122,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/deploymentstatus.json b/master-standalone/deploymentstatus.json
index 180445e444..16b8f27f5f 100644
--- a/master-standalone/deploymentstatus.json
+++ b/master-standalone/deploymentstatus.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -90,7 +90,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -98,7 +98,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -114,7 +122,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/replicaset-apps-v1.json b/master-standalone/replicaset-apps-v1.json
index 4edd17018a..4eefd4d2b9 100644
--- a/master-standalone/replicaset-apps-v1.json
+++ b/master-standalone/replicaset-apps-v1.json
@@ -283,7 +283,7 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": [
             "integer",
@@ -10572,7 +10572,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": [
             "integer",
@@ -10636,7 +10636,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": [
             "integer",
@@ -10652,7 +10652,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10660,9 +10660,17 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
         }
       },
       "required": [
diff --git a/master-standalone/replicaset.json b/master-standalone/replicaset.json
index b14b3c6886..5c75a95189 100644
--- a/master-standalone/replicaset.json
+++ b/master-standalone/replicaset.json
@@ -280,7 +280,7 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": [
             "integer",
@@ -10569,7 +10569,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": [
             "integer",
@@ -10633,7 +10633,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": [
             "integer",
@@ -10649,7 +10649,7 @@
           ]
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": [
             "integer",
@@ -10657,9 +10657,17 @@
           ]
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+          "format": "int32",
+          "type": [
+            "integer",
+            "null"
+          ]
         }
       },
       "required": [
diff --git a/master-standalone/replicasetlist-apps-v1.json b/master-standalone/replicasetlist-apps-v1.json
index 910b633375..065b9920fe 100644
--- a/master-standalone/replicasetlist-apps-v1.json
+++ b/master-standalone/replicasetlist-apps-v1.json
@@ -12,7 +12,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
         "properties": {
@@ -298,7 +298,7 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10587,7 +10587,7 @@
             "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
             "properties": {
               "availableReplicas": {
-                "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+                "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10651,7 +10651,7 @@
                 "x-kubernetes-patch-strategy": "merge"
               },
               "fullyLabeledReplicas": {
-                "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+                "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10667,7 +10667,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+                "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10675,9 +10675,17 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": "integer"
+              },
+              "terminatingReplicas": {
+                "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
               }
             },
             "required": [
diff --git a/master-standalone/replicasetlist.json b/master-standalone/replicasetlist.json
index 199bce11eb..a482a4c111 100644
--- a/master-standalone/replicasetlist.json
+++ b/master-standalone/replicasetlist.json
@@ -9,7 +9,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "description": "ReplicaSet ensures that a specified number of pod replicas are running at any given time.",
         "properties": {
@@ -292,7 +292,7 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10581,7 +10581,7 @@
             "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
             "properties": {
               "availableReplicas": {
-                "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+                "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10645,7 +10645,7 @@
                 "x-kubernetes-patch-strategy": "merge"
               },
               "fullyLabeledReplicas": {
-                "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+                "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10661,7 +10661,7 @@
                 ]
               },
               "readyReplicas": {
-                "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+                "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
                 "format": "int32",
                 "type": [
                   "integer",
@@ -10669,9 +10669,17 @@
                 ]
               },
               "replicas": {
-                "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+                "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
                 "format": "int32",
                 "type": "integer"
+              },
+              "terminatingReplicas": {
+                "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
+                "format": "int32",
+                "type": [
+                  "integer",
+                  "null"
+                ]
               }
             },
             "required": [
diff --git a/master-standalone/replicasetspec-apps-v1.json b/master-standalone/replicasetspec-apps-v1.json
index cc8775a459..645f1ada03 100644
--- a/master-standalone/replicasetspec-apps-v1.json
+++ b/master-standalone/replicasetspec-apps-v1.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/replicasetspec.json b/master-standalone/replicasetspec.json
index cc8775a459..645f1ada03 100644
--- a/master-standalone/replicasetspec.json
+++ b/master-standalone/replicasetspec.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/replicasetstatus-apps-v1.json b/master-standalone/replicasetstatus-apps-v1.json
index a76b4df1f5..df3465a4f5 100644
--- a/master-standalone/replicasetstatus-apps-v1.json
+++ b/master-standalone/replicasetstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +66,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -82,7 +82,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -90,7 +90,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master-standalone/replicasetstatus.json b/master-standalone/replicasetstatus.json
index a76b4df1f5..df3465a4f5 100644
--- a/master-standalone/replicasetstatus.json
+++ b/master-standalone/replicasetstatus.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +66,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -82,7 +82,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -90,7 +90,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master/_definitions.json b/master/_definitions.json
index 9bf9538e4d..2665a10365 100644
--- a/master/_definitions.json
+++ b/master/_definitions.json
@@ -2429,7 +2429,7 @@
       "description": "DeploymentStatus is the most recently observed status of the Deployment.",
       "properties": {
         "availableReplicas": {
-          "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+          "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
           "format": "int32",
           "type": "integer"
         },
@@ -2457,12 +2457,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+          "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+          "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         },
@@ -2472,7 +2477,7 @@
           "type": "integer"
         },
         "updatedReplicas": {
-          "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+          "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
           "format": "int32",
           "type": "integer"
         }
@@ -2567,7 +2572,7 @@
           "type": "string"
         },
         "items": {
-          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+          "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "items": {
             "$ref": "#/definitions/io.k8s.api.apps.v1.ReplicaSet"
           },
@@ -2606,7 +2611,7 @@
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
           "format": "int32",
           "type": "integer"
         },
@@ -2616,7 +2621,7 @@
         },
         "template": {
           "$ref": "#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+          "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
         }
       },
       "required": [
@@ -2628,7 +2633,7 @@
       "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
       "properties": {
         "availableReplicas": {
-          "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+          "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
           "format": "int32",
           "type": "integer"
         },
@@ -2646,7 +2651,7 @@
           "x-kubernetes-patch-strategy": "merge"
         },
         "fullyLabeledReplicas": {
-          "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+          "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
           "format": "int32",
           "type": "integer"
         },
@@ -2656,12 +2661,17 @@
           "type": "integer"
         },
         "readyReplicas": {
-          "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+          "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
           "format": "int32",
           "type": "integer"
         },
         "replicas": {
-          "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+          "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+          "format": "int32",
+          "type": "integer"
+        },
+        "terminatingReplicas": {
+          "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
           "format": "int32",
           "type": "integer"
         }
diff --git a/master/deploymentstatus-apps-v1.json b/master/deploymentstatus-apps-v1.json
index 8533446a65..875a524c74 100644
--- a/master/deploymentstatus-apps-v1.json
+++ b/master/deploymentstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +74,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master/deploymentstatus.json b/master/deploymentstatus.json
index 8533446a65..875a524c74 100644
--- a/master/deploymentstatus.json
+++ b/master/deploymentstatus.json
@@ -2,7 +2,7 @@
   "description": "DeploymentStatus is the most recently observed status of the Deployment.",
   "properties": {
     "availableReplicas": {
-      "description": "Total number of available pods (ready for at least minReadySeconds) targeted by this deployment.",
+      "description": "Total number of available non-terminating pods (ready for at least minReadySeconds) targeted by this deployment.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this Deployment with a Ready Condition.",
+      "description": "Total number of non-terminating pods targeted by this Deployment with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment (their labels match the selector).",
+      "description": "Total number of non-terminating pods targeted by this deployment (their labels match the selector).",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "Total number of terminating pods targeted by this deployment. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
@@ -66,7 +74,7 @@
       ]
     },
     "updatedReplicas": {
-      "description": "Total number of non-terminated pods targeted by this deployment that have the desired template spec.",
+      "description": "Total number of non-terminating pods targeted by this deployment that have the desired template spec.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master/replicasetlist-apps-v1.json b/master/replicasetlist-apps-v1.json
index 8e9582d87e..4104905ac2 100644
--- a/master/replicasetlist-apps-v1.json
+++ b/master/replicasetlist-apps-v1.json
@@ -12,7 +12,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.apps.v1.ReplicaSet"
       },
diff --git a/master/replicasetlist.json b/master/replicasetlist.json
index 621af94de7..4b971a7da6 100644
--- a/master/replicasetlist.json
+++ b/master/replicasetlist.json
@@ -9,7 +9,7 @@
       ]
     },
     "items": {
-      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller",
+      "description": "List of ReplicaSets. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "items": {
         "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.apps.v1.ReplicaSet"
       },
diff --git a/master/replicasetspec-apps-v1.json b/master/replicasetspec-apps-v1.json
index 0478826524..da407f4edc 100644
--- a/master/replicasetspec-apps-v1.json
+++ b/master/replicasetspec-apps-v1.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
@@ -23,7 +23,7 @@
     },
     "template": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
     }
   },
   "required": [
diff --git a/master/replicasetspec.json b/master/replicasetspec.json
index 0478826524..da407f4edc 100644
--- a/master/replicasetspec.json
+++ b/master/replicasetspec.json
@@ -10,7 +10,7 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the number of desired replicas. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the number of desired pods. This is a pointer to distinguish between explicit zero and unspecified. Defaults to 1. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
       "format": "int32",
       "type": [
         "integer",
@@ -23,7 +23,7 @@
     },
     "template": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master/_definitions.json#/definitions/io.k8s.api.core.v1.PodTemplateSpec",
-      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller#pod-template"
+      "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#pod-template"
     }
   },
   "required": [
diff --git a/master/replicasetstatus-apps-v1.json b/master/replicasetstatus-apps-v1.json
index aaab1d9537..2a7c3e0c2c 100644
--- a/master/replicasetstatus-apps-v1.json
+++ b/master/replicasetstatus-apps-v1.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -26,7 +26,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
diff --git a/master/replicasetstatus.json b/master/replicasetstatus.json
index aaab1d9537..2a7c3e0c2c 100644
--- a/master/replicasetstatus.json
+++ b/master/replicasetstatus.json
@@ -2,7 +2,7 @@
   "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
   "properties": {
     "availableReplicas": {
-      "description": "The number of available replicas (ready for at least minReadySeconds) for this replica set.",
+      "description": "The number of available non-terminating pods (ready for at least minReadySeconds) for this replica set.",
       "format": "int32",
       "type": [
         "integer",
@@ -26,7 +26,7 @@
       "x-kubernetes-patch-strategy": "merge"
     },
     "fullyLabeledReplicas": {
-      "description": "The number of pods that have labels matching the labels of the pod template of the replicaset.",
+      "description": "The number of non-terminating pods that have labels matching the labels of the pod template of the replicaset.",
       "format": "int32",
       "type": [
         "integer",
@@ -42,7 +42,7 @@
       ]
     },
     "readyReplicas": {
-      "description": "readyReplicas is the number of pods targeted by this ReplicaSet with a Ready Condition.",
+      "description": "The number of non-terminating pods targeted by this ReplicaSet with a Ready Condition.",
       "format": "int32",
       "type": [
         "integer",
@@ -50,7 +50,15 @@
       ]
     },
     "replicas": {
-      "description": "Replicas is the most recently observed number of replicas. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/#what-is-a-replicationcontroller",
+      "description": "Replicas is the most recently observed number of non-terminating pods. More info: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset",
+      "format": "int32",
+      "type": [
+        "integer",
+        "null"
+      ]
+    },
+    "terminatingReplicas": {
+      "description": "The number of terminating pods for this replica set. Terminating pods have a non-null .metadata.deletionTimestamp and have not yet reached the Failed or Succeeded .status.phase.\n\nThis is an alpha field. Enable DeploymentPodReplacementPolicy to be able to use this field.",
       "format": "int32",
       "type": [
         "integer",
-- 
GitLab