diff --git a/CHANGELOG.md b/CHANGELOG.md
index e041c4fdce..981c0d3f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## HEAD (Unreleased)
 
+### Bug fixes
+
+-   Fix deprecation warnings and docs. (https://github.com/pulumi/pulumi-kubernetes/pull/918).
+
 ## 1.4.0 (December 9, 2019)
 
 ### Important
diff --git a/pkg/gen/additionalComments.go b/pkg/gen/additionalComments.go
index 50d95529f1..dc1f29d43c 100644
--- a/pkg/gen/additionalComments.go
+++ b/pkg/gen/additionalComments.go
@@ -164,9 +164,10 @@ func PulumiComment(kind string) string {
 }
 
 func ApiVersionComment(gvk schema.GroupVersionKind) string {
-	const template = `%s is not supported by Kubernetes 1.16+ clusters. Use %s instead.
+	const template = `%s is deprecated by %s and not supported by Kubernetes v%v+ clusters.
 
 `
 	gvkStr := gvk.GroupVersion().String() + "/" + gvk.Kind
-	return fmt.Sprintf(template, gvkStr, kinds.SuggestedApiVersion(gvk))
+	removedIn := kinds.RemovedInVersion(gvk)
+	return fmt.Sprintf(template, gvkStr, kinds.SuggestedApiVersion(gvk), removedIn)
 }
diff --git a/pkg/kinds/deprecated.go b/pkg/kinds/deprecated.go
index ac39f77acf..2765a126f0 100644
--- a/pkg/kinds/deprecated.go
+++ b/pkg/kinds/deprecated.go
@@ -30,21 +30,37 @@ func DeprecatedApiVersion(gvk schema.GroupVersionKind) bool {
 	return SuggestedApiVersion(gvk) != gvkStr(gvk)
 }
 
-// RemovedApiVersion returns true if the given GVK has been removed in the given k8s version, and the corresponding
-// ServerVersion where the GVK was removed.
-func RemovedApiVersion(gvk schema.GroupVersionKind, version cluster.ServerVersion) (bool, *cluster.ServerVersion) {
+// RemovedInVersion returns the ServerVersion of k8s that a GVK is removed in. The return value is
+// nil if the GVK is not scheduled for removal.
+func RemovedInVersion(gvk schema.GroupVersionKind) *cluster.ServerVersion {
 	var removedIn cluster.ServerVersion
 
 	switch gvk.GroupVersion() {
 	case schema.GroupVersion{Group: "extensions", Version: "v1beta1"},
 		schema.GroupVersion{Group: "apps", Version: "v1beta1"},
 		schema.GroupVersion{Group: "apps", Version: "v1beta2"}:
-		removedIn = cluster.ServerVersion{Major: 1, Minor: 16}
+
+		if gvk.Kind == "Ingress" {
+			removedIn = cluster.ServerVersion{Major: 1, Minor: 20}
+		} else {
+			removedIn = cluster.ServerVersion{Major: 1, Minor: 16}
+		}
 	default:
-		return false, nil
+		return nil
 	}
 
-	return version.Compare(removedIn) >= 0, &removedIn
+	return &removedIn
+}
+
+// RemovedApiVersion returns true if the given GVK has been removed in the given k8s version, and the corresponding
+// ServerVersion where the GVK was removed.
+func RemovedApiVersion(gvk schema.GroupVersionKind, version cluster.ServerVersion) (bool, *cluster.ServerVersion) {
+	removedIn := RemovedInVersion(gvk)
+
+	if removedIn == nil {
+		return false, nil
+	}
+	return version.Compare(*removedIn) >= 0, removedIn
 }
 
 // SuggestedApiVersion returns a string with the suggested apiVersion for a given GVK.
diff --git a/pkg/kinds/deprecated_test.go b/pkg/kinds/deprecated_test.go
index 6e3ab36404..cf702fd078 100644
--- a/pkg/kinds/deprecated_test.go
+++ b/pkg/kinds/deprecated_test.go
@@ -87,6 +87,32 @@ func TestSuggestedApiVersion(t *testing.T) {
 	}
 }
 
+func TestRemovedInVersion(t *testing.T) {
+	type args struct {
+		gvk GroupVersionKind
+	}
+	tests := []struct {
+		name        string
+		args        args
+		wantVersion *cluster.ServerVersion
+	}{
+		{"extensions/v1beta1:Deployment", args{
+			GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "Deployment"},
+		}, &cluster.ServerVersion{Major: 1, Minor: 16}},
+		{"extensions/v1beta1:Ingress", args{
+			GroupVersionKind{Group: "extensions", Version: "v1beta1", Kind: "Ingress"},
+		}, &cluster.ServerVersion{Major: 1, Minor: 20}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := RemovedInVersion(tt.args.gvk)
+			if !reflect.DeepEqual(got, tt.wantVersion) {
+				t.Errorf("RemovedInVersion() got = %v, want %v", got, tt.wantVersion)
+			}
+		})
+	}
+}
+
 func TestRemovedApiVersion(t *testing.T) {
 	type args struct {
 		gvk     GroupVersionKind
diff --git a/sdk/dotnet/Apps/V1Beta1/ControllerRevision.cs b/sdk/dotnet/Apps/V1Beta1/ControllerRevision.cs
index 25a1f4a628..94174f3db8 100755
--- a/sdk/dotnet/Apps/V1Beta1/ControllerRevision.cs
+++ b/sdk/dotnet/Apps/V1Beta1/ControllerRevision.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/dotnet/Apps/V1Beta1/Deployment.cs b/sdk/dotnet/Apps/V1Beta1/Deployment.cs
index b9d40e913b..f83f330589 100755
--- a/sdk/dotnet/Apps/V1Beta1/Deployment.cs
+++ b/sdk/dotnet/Apps/V1Beta1/Deployment.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// 
diff --git a/sdk/dotnet/Apps/V1Beta1/StatefulSet.cs b/sdk/dotnet/Apps/V1Beta1/StatefulSet.cs
index 25a98e8f02..8988e1fa1f 100755
--- a/sdk/dotnet/Apps/V1Beta1/StatefulSet.cs
+++ b/sdk/dotnet/Apps/V1Beta1/StatefulSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
diff --git a/sdk/dotnet/Apps/V1Beta2/ControllerRevision.cs b/sdk/dotnet/Apps/V1Beta2/ControllerRevision.cs
index 698a6efc67..67f7583f7f 100755
--- a/sdk/dotnet/Apps/V1Beta2/ControllerRevision.cs
+++ b/sdk/dotnet/Apps/V1Beta2/ControllerRevision.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta2
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/dotnet/Apps/V1Beta2/DaemonSet.cs b/sdk/dotnet/Apps/V1Beta2/DaemonSet.cs
index c73ae35d83..9ef1cee43b 100755
--- a/sdk/dotnet/Apps/V1Beta2/DaemonSet.cs
+++ b/sdk/dotnet/Apps/V1Beta2/DaemonSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta2
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+    /// Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
diff --git a/sdk/dotnet/Apps/V1Beta2/Deployment.cs b/sdk/dotnet/Apps/V1Beta2/Deployment.cs
index 8133a250a1..a4cff96978 100755
--- a/sdk/dotnet/Apps/V1Beta2/Deployment.cs
+++ b/sdk/dotnet/Apps/V1Beta2/Deployment.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta2
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// 
diff --git a/sdk/dotnet/Apps/V1Beta2/ReplicaSet.cs b/sdk/dotnet/Apps/V1Beta2/ReplicaSet.cs
index 5f31c08a3a..6492b1ad24 100755
--- a/sdk/dotnet/Apps/V1Beta2/ReplicaSet.cs
+++ b/sdk/dotnet/Apps/V1Beta2/ReplicaSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta2
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/ReplicaSet instead.
+    /// DEPRECATED - apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
diff --git a/sdk/dotnet/Apps/V1Beta2/StatefulSet.cs b/sdk/dotnet/Apps/V1Beta2/StatefulSet.cs
index 128138d05d..a9e96c3236 100755
--- a/sdk/dotnet/Apps/V1Beta2/StatefulSet.cs
+++ b/sdk/dotnet/Apps/V1Beta2/StatefulSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Apps.V1Beta2
 {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
diff --git a/sdk/dotnet/Extensions/V1Beta1/DaemonSet.cs b/sdk/dotnet/Extensions/V1Beta1/DaemonSet.cs
index fbad69c533..b560e38c4a 100755
--- a/sdk/dotnet/Extensions/V1Beta1/DaemonSet.cs
+++ b/sdk/dotnet/Extensions/V1Beta1/DaemonSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Extensions.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
diff --git a/sdk/dotnet/Extensions/V1Beta1/Deployment.cs b/sdk/dotnet/Extensions/V1Beta1/Deployment.cs
index 8014dfb3f6..6837f20d3a 100755
--- a/sdk/dotnet/Extensions/V1Beta1/Deployment.cs
+++ b/sdk/dotnet/Extensions/V1Beta1/Deployment.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Extensions.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/Deployment instead.
+    /// DEPRECATED - extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// 
diff --git a/sdk/dotnet/Extensions/V1Beta1/Ingress.cs b/sdk/dotnet/Extensions/V1Beta1/Ingress.cs
index cd0bc948ac..459fcc8950 100755
--- a/sdk/dotnet/Extensions/V1Beta1/Ingress.cs
+++ b/sdk/dotnet/Extensions/V1Beta1/Ingress.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Extensions.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-    /// networking/v1beta1/Ingress instead.
+    /// DEPRECATED - extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+    /// supported by Kubernetes v1.20+ clusters.
     /// 
     /// Ingress is a collection of rules that allow inbound connections to reach the endpoints
     /// defined by a backend. An Ingress can be configured to give services externally-reachable
diff --git a/sdk/dotnet/Extensions/V1Beta1/ReplicaSet.cs b/sdk/dotnet/Extensions/V1Beta1/ReplicaSet.cs
index 8354af6c78..4216ca645c 100755
--- a/sdk/dotnet/Extensions/V1Beta1/ReplicaSet.cs
+++ b/sdk/dotnet/Extensions/V1Beta1/ReplicaSet.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Extensions.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ReplicaSet instead.
+    /// DEPRECATED - extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
diff --git a/sdk/dotnet/Storage/V1Beta1/CSINode.cs b/sdk/dotnet/Storage/V1Beta1/CSINode.cs
index 0dc28ebd68..22d18a91ad 100755
--- a/sdk/dotnet/Storage/V1Beta1/CSINode.cs
+++ b/sdk/dotnet/Storage/V1Beta1/CSINode.cs
@@ -8,8 +8,8 @@
 namespace Pulumi.Kubernetes.Storage.V1Beta1
 {
     /// <summary>
-    /// DEPRECATED - storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-    /// storage/v1beta1/CSINode instead.
+    /// DEPRECATED - storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+    /// supported by Kubernetes v&amp;lt;nil&amp;gt;+ clusters.
     /// 
     /// CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
     /// to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/dotnet/Types/Input.cs b/sdk/dotnet/Types/Input.cs
index dca56b8ae1..3632b16dce 100755
--- a/sdk/dotnet/Types/Input.cs
+++ b/sdk/dotnet/Types/Input.cs
@@ -5012,8 +5012,8 @@ public class StatefulSetUpdateStrategyArgs : Pulumi.ResourceArgs
   namespace V1Beta1
   {
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
@@ -5110,8 +5110,8 @@ public InputList<Apps.V1Beta1.ControllerRevisionArgs> Items
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -5593,8 +5593,8 @@ public InputMap<string> Selector
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
@@ -5897,8 +5897,8 @@ public class StatefulSetUpdateStrategyArgs : Pulumi.ResourceArgs
   namespace V1Beta2
   {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
@@ -5995,8 +5995,8 @@ public InputList<Apps.V1Beta2.ControllerRevisionArgs> Items
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+    /// Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
@@ -6267,8 +6267,8 @@ public class DaemonSetUpdateStrategyArgs : Pulumi.ResourceArgs
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -6545,8 +6545,8 @@ public class DeploymentStrategyArgs : Pulumi.ResourceArgs
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/ReplicaSet instead.
+    /// DEPRECATED - apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
@@ -6921,8 +6921,8 @@ public InputMap<string> Selector
     }
 
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
@@ -20600,8 +20600,8 @@ public class AllowedHostPathArgs : Pulumi.ResourceArgs
     }
 
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
@@ -20878,8 +20878,8 @@ public class DaemonSetUpdateStrategyArgs : Pulumi.ResourceArgs
     }
 
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/Deployment instead.
+    /// DEPRECATED - extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -21359,8 +21359,8 @@ public InputList<string> Except
     }
 
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-    /// networking/v1beta1/Ingress instead.
+    /// DEPRECATED - extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+    /// supported by Kubernetes v1.20+ clusters.
     /// 
     /// Ingress is a collection of rules that allow inbound connections to reach the endpoints
     /// defined by a backend. An Ingress can be configured to give services externally-reachable
@@ -22219,8 +22219,8 @@ public InputList<string> Volumes
     }
 
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ReplicaSet instead.
+    /// DEPRECATED - extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
@@ -29351,8 +29351,8 @@ public InputList<string> VolumeLifecycleModes
     }
 
     /// <summary>
-    /// DEPRECATED - storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-    /// storage/v1beta1/CSINode instead.
+    /// DEPRECATED - storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+    /// supported by Kubernetes v&amp;lt;nil&amp;gt;+ clusters.
     /// 
     /// CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
     /// to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/dotnet/Types/Output.cs b/sdk/dotnet/Types/Output.cs
index 645aff68ba..227174dc4b 100755
--- a/sdk/dotnet/Types/Output.cs
+++ b/sdk/dotnet/Types/Output.cs
@@ -5579,8 +5579,8 @@ private StatefulSetUpdateStrategy(
   namespace V1Beta1
   {
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
@@ -5690,8 +5690,8 @@ private ControllerRevisionList(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -6280,8 +6280,8 @@ private ScaleStatus(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
@@ -6636,8 +6636,8 @@ private StatefulSetUpdateStrategy(
   namespace V1Beta2
   {
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ControllerRevision instead.
+    /// DEPRECATED - apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+    /// not supported by Kubernetes v1.16+ clusters.
     /// 
     /// ControllerRevision implements an immutable snapshot of state data. Clients are responsible
     /// for serializing and deserializing the objects that contain their internal state. Once a
@@ -6747,8 +6747,8 @@ private ControllerRevisionList(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+    /// Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
@@ -7076,8 +7076,8 @@ private DaemonSetUpdateStrategy(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/Deployment instead.
+    /// DEPRECATED - apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -7411,8 +7411,8 @@ private DeploymentStrategy(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/ReplicaSet instead.
+    /// DEPRECATED - apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
@@ -7877,8 +7877,8 @@ private ScaleStatus(
 
     }
     /// <summary>
-    /// DEPRECATED - apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/StatefulSet instead.
+    /// DEPRECATED - apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+    /// by Kubernetes v1.16+ clusters.
     /// 
     /// StatefulSet represents a set of pods with consistent identities. Identities are defined as:
     ///  - Network: A single stable DNS and hostname.
@@ -23503,8 +23503,8 @@ private AllowedHostPath(
 
     }
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    /// apps/v1/DaemonSet instead.
+    /// DEPRECATED - extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// DaemonSet represents the configuration of a daemon set.
     /// </summary>
@@ -23839,8 +23839,8 @@ private DaemonSetUpdateStrategy(
 
     }
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/Deployment instead.
+    /// DEPRECATED - extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// Deployment enables declarative updates for Pods and ReplicaSets.
     /// </summary>
@@ -24405,8 +24405,8 @@ private IPBlock(
 
     }
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-    /// networking/v1beta1/Ingress instead.
+    /// DEPRECATED - extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+    /// supported by Kubernetes v1.20+ clusters.
     /// 
     /// Ingress is a collection of rules that allow inbound connections to reach the endpoints
     /// defined by a backend. An Ingress can be configured to give services externally-reachable
@@ -25285,8 +25285,8 @@ private PodSecurityPolicySpec(
 
     }
     /// <summary>
-    /// DEPRECATED - extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters.
-    /// Use apps/v1/ReplicaSet instead.
+    /// DEPRECATED - extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+    /// supported by Kubernetes v1.16+ clusters.
     /// 
     /// ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     /// </summary>
@@ -33109,8 +33109,8 @@ private CSIDriverSpec(
 
     }
     /// <summary>
-    /// DEPRECATED - storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-    /// storage/v1beta1/CSINode instead.
+    /// DEPRECATED - storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+    /// supported by Kubernetes v&amp;lt;nil&amp;gt;+ clusters.
     /// 
     /// CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
     /// to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/nodejs/apps/v1beta1/ControllerRevision.ts b/sdk/nodejs/apps/v1beta1/ControllerRevision.ts
index b30561cfc2..8537bdcd4c 100755
--- a/sdk/nodejs/apps/v1beta1/ControllerRevision.ts
+++ b/sdk/nodejs/apps/v1beta1/ControllerRevision.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/nodejs/apps/v1beta1/Deployment.ts b/sdk/nodejs/apps/v1beta1/Deployment.ts
index d3621afbea..13cf0cc85e 100755
--- a/sdk/nodejs/apps/v1beta1/Deployment.ts
+++ b/sdk/nodejs/apps/v1beta1/Deployment.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      * 
diff --git a/sdk/nodejs/apps/v1beta1/StatefulSet.ts b/sdk/nodejs/apps/v1beta1/StatefulSet.ts
index a56b32dc5a..de80b1d7e7 100755
--- a/sdk/nodejs/apps/v1beta1/StatefulSet.ts
+++ b/sdk/nodejs/apps/v1beta1/StatefulSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
diff --git a/sdk/nodejs/apps/v1beta2/ControllerRevision.ts b/sdk/nodejs/apps/v1beta2/ControllerRevision.ts
index 13cfb5643b..f1cbaddd25 100755
--- a/sdk/nodejs/apps/v1beta2/ControllerRevision.ts
+++ b/sdk/nodejs/apps/v1beta2/ControllerRevision.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/nodejs/apps/v1beta2/DaemonSet.ts b/sdk/nodejs/apps/v1beta2/DaemonSet.ts
index 4c3199622f..473bdb7577 100755
--- a/sdk/nodejs/apps/v1beta2/DaemonSet.ts
+++ b/sdk/nodejs/apps/v1beta2/DaemonSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
diff --git a/sdk/nodejs/apps/v1beta2/Deployment.ts b/sdk/nodejs/apps/v1beta2/Deployment.ts
index deadb693fb..f36ebea035 100755
--- a/sdk/nodejs/apps/v1beta2/Deployment.ts
+++ b/sdk/nodejs/apps/v1beta2/Deployment.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      * 
diff --git a/sdk/nodejs/apps/v1beta2/ReplicaSet.ts b/sdk/nodejs/apps/v1beta2/ReplicaSet.ts
index 013079b770..05ec9e7e42 100755
--- a/sdk/nodejs/apps/v1beta2/ReplicaSet.ts
+++ b/sdk/nodejs/apps/v1beta2/ReplicaSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
diff --git a/sdk/nodejs/apps/v1beta2/StatefulSet.ts b/sdk/nodejs/apps/v1beta2/StatefulSet.ts
index 5b1888b597..c3e901f1d8 100755
--- a/sdk/nodejs/apps/v1beta2/StatefulSet.ts
+++ b/sdk/nodejs/apps/v1beta2/StatefulSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
diff --git a/sdk/nodejs/extensions/v1beta1/DaemonSet.ts b/sdk/nodejs/extensions/v1beta1/DaemonSet.ts
index 1dd62e8de7..a06941a4dd 100755
--- a/sdk/nodejs/extensions/v1beta1/DaemonSet.ts
+++ b/sdk/nodejs/extensions/v1beta1/DaemonSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
diff --git a/sdk/nodejs/extensions/v1beta1/Deployment.ts b/sdk/nodejs/extensions/v1beta1/Deployment.ts
index e77e9cb420..a475362346 100755
--- a/sdk/nodejs/extensions/v1beta1/Deployment.ts
+++ b/sdk/nodejs/extensions/v1beta1/Deployment.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      * 
diff --git a/sdk/nodejs/extensions/v1beta1/Ingress.ts b/sdk/nodejs/extensions/v1beta1/Ingress.ts
index ec5a6168f9..fde211864a 100755
--- a/sdk/nodejs/extensions/v1beta1/Ingress.ts
+++ b/sdk/nodejs/extensions/v1beta1/Ingress.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-     * networking/v1beta1/Ingress instead.
+     * @deprecated extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+     * supported by Kubernetes v1.20+ clusters.
      * 
      * Ingress is a collection of rules that allow inbound connections to reach the endpoints
      * defined by a backend. An Ingress can be configured to give services externally-reachable
diff --git a/sdk/nodejs/extensions/v1beta1/ReplicaSet.ts b/sdk/nodejs/extensions/v1beta1/ReplicaSet.ts
index 62f62b4b8e..a1a3d879d9 100755
--- a/sdk/nodejs/extensions/v1beta1/ReplicaSet.ts
+++ b/sdk/nodejs/extensions/v1beta1/ReplicaSet.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
diff --git a/sdk/nodejs/storage/v1beta1/CSINode.ts b/sdk/nodejs/storage/v1beta1/CSINode.ts
index dcff186707..a0a8c79819 100755
--- a/sdk/nodejs/storage/v1beta1/CSINode.ts
+++ b/sdk/nodejs/storage/v1beta1/CSINode.ts
@@ -8,8 +8,8 @@ import * as outputs from "../../types/output";
 import { getVersion } from "../../version";
 
     /**
-     * @deprecated storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-     * storage/v1beta1/CSINode instead.
+     * @deprecated storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+     * supported by Kubernetes v<nil>+ clusters.
      * 
      * CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
      * to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts
index 8ca45dcaed..ba805a70f0 100755
--- a/sdk/nodejs/types/input.ts
+++ b/sdk/nodejs/types/input.ts
@@ -4113,8 +4113,8 @@ export namespace apps {
 
   export namespace v1beta1 {
     /**
-     * @deprecated apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
@@ -4202,8 +4202,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -4622,8 +4622,8 @@ export namespace apps {
 
 
     /**
-     * @deprecated apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
@@ -4880,8 +4880,8 @@ export namespace apps {
 
   export namespace v1beta2 {
     /**
-     * @deprecated apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
@@ -4969,8 +4969,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
@@ -5202,8 +5202,8 @@ export namespace apps {
 
 
     /**
-     * @deprecated apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -5441,8 +5441,8 @@ export namespace apps {
 
 
     /**
-     * @deprecated apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
@@ -5772,8 +5772,8 @@ export namespace apps {
 
 
     /**
-     * @deprecated apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
@@ -17037,8 +17037,8 @@ export namespace extensions {
 
 
     /**
-     * @deprecated extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
@@ -17276,8 +17276,8 @@ export namespace extensions {
 
 
     /**
-     * @deprecated extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -17678,8 +17678,8 @@ export namespace extensions {
 
 
     /**
-     * @deprecated extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-     * networking/v1beta1/Ingress instead.
+     * @deprecated extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+     * supported by Kubernetes v1.20+ clusters.
      * 
      * Ingress is a collection of rules that allow inbound connections to reach the endpoints
      * defined by a backend. An Ingress can be configured to give services externally-reachable
@@ -18339,8 +18339,8 @@ export namespace extensions {
 
 
     /**
-     * @deprecated extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
@@ -24142,8 +24142,8 @@ export namespace storage {
 
 
     /**
-     * @deprecated storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-     * storage/v1beta1/CSINode instead.
+     * @deprecated storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+     * supported by Kubernetes v<nil>+ clusters.
      * 
      * CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
      * to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts
index 8458fcaf9a..1497de8d0b 100755
--- a/sdk/nodejs/types/output.ts
+++ b/sdk/nodejs/types/output.ts
@@ -4002,8 +4002,8 @@ export namespace apps {
 
   export namespace v1beta1 {
     /**
-     * @deprecated apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
@@ -4083,8 +4083,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -4490,8 +4490,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
@@ -4742,8 +4742,8 @@ export namespace apps {
 
   export namespace v1beta2 {
     /**
-     * @deprecated apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters.
-     * Use apps/v1/ControllerRevision instead.
+     * @deprecated apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and
+     * not supported by Kubernetes v1.16+ clusters.
      * 
      * ControllerRevision implements an immutable snapshot of state data. Clients are responsible
      * for serializing and deserializing the objects that contain their internal state. Once a
@@ -4823,8 +4823,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
@@ -5051,8 +5051,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -5283,8 +5283,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported by
+     * Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
@@ -5608,8 +5608,8 @@ export namespace apps {
     }
 
     /**
-     * @deprecated apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/StatefulSet instead.
+     * @deprecated apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      *  - Network: A single stable DNS and hostname.
@@ -16483,8 +16483,8 @@ export namespace extensions {
     }
 
     /**
-     * @deprecated extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/DaemonSet instead.
+     * @deprecated extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not supported
+     * by Kubernetes v1.16+ clusters.
      * 
      * DaemonSet represents the configuration of a daemon set.
      */
@@ -16717,8 +16717,8 @@ export namespace extensions {
     }
 
     /**
-     * @deprecated extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/Deployment instead.
+     * @deprecated extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * Deployment enables declarative updates for Pods and ReplicaSets.
      */
@@ -17102,8 +17102,8 @@ export namespace extensions {
     }
 
     /**
-     * @deprecated extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-     * networking/v1beta1/Ingress instead.
+     * @deprecated extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+     * supported by Kubernetes v1.20+ clusters.
      * 
      * Ingress is a collection of rules that allow inbound connections to reach the endpoints
      * defined by a backend. An Ingress can be configured to give services externally-reachable
@@ -17734,8 +17734,8 @@ export namespace extensions {
     }
 
     /**
-     * @deprecated extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-     * apps/v1/ReplicaSet instead.
+     * @deprecated extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not
+     * supported by Kubernetes v1.16+ clusters.
      * 
      * ReplicaSet ensures that a specified number of pod replicas are running at any given time.
      */
@@ -23219,8 +23219,8 @@ export namespace storage {
     }
 
     /**
-     * @deprecated storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-     * storage/v1beta1/CSINode instead.
+     * @deprecated storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not
+     * supported by Kubernetes v<nil>+ clusters.
      * 
      * CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need
      * to create the CSINode object directly. As long as they use the node-driver-registrar sidecar
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta1/ControllerRevision.py b/sdk/python/pulumi_kubernetes/apps/v1beta1/ControllerRevision.py
index 86e88cb583..742dd0c013 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta1/ControllerRevision.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta1/ControllerRevision.py
@@ -13,8 +13,8 @@
 
 class ControllerRevision(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta1/ControllerRevision is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/ControllerRevision instead.
+    DEPRECATED - apps/v1beta1/ControllerRevision is deprecated by apps/v1/ControllerRevision and not
+    supported by Kubernetes v1.16+ clusters.
     
     ControllerRevision implements an immutable snapshot of state data. Clients are responsible for
     serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py b/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py
index 754a8350a2..26a9f68415 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py
@@ -13,8 +13,8 @@
 
 class Deployment(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/Deployment instead.
+    DEPRECATED - apps/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported by
+    Kubernetes v1.16+ clusters.
     
     Deployment enables declarative updates for Pods and ReplicaSets.
     
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py
index 89019d4107..fd01c12abb 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py
@@ -13,8 +13,8 @@
 
 class StatefulSet(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta1/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/StatefulSet instead.
+    DEPRECATED - apps/v1beta1/StatefulSet is deprecated by apps/v1/StatefulSet and not supported by
+    Kubernetes v1.16+ clusters.
     
     StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      - Network: A single stable DNS and hostname.
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/ControllerRevision.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/ControllerRevision.py
index fc5d8fd606..04c252a125 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta2/ControllerRevision.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/ControllerRevision.py
@@ -13,8 +13,8 @@
 
 class ControllerRevision(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta2/ControllerRevision is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/ControllerRevision instead.
+    DEPRECATED - apps/v1beta2/ControllerRevision is deprecated by apps/v1/ControllerRevision and not
+    supported by Kubernetes v1.16+ clusters.
     
     ControllerRevision implements an immutable snapshot of state data. Clients are responsible for
     serializing and deserializing the objects that contain their internal state. Once a
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/DaemonSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/DaemonSet.py
index 4fce43fe08..b49eebbab5 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta2/DaemonSet.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/DaemonSet.py
@@ -13,8 +13,8 @@
 
 class DaemonSet(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta2/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/DaemonSet instead.
+    DEPRECATED - apps/v1beta2/DaemonSet is deprecated by apps/v1/DaemonSet and not supported by
+    Kubernetes v1.16+ clusters.
     
     DaemonSet represents the configuration of a daemon set.
     """
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py
index 5eb6a08114..e98aad9834 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py
@@ -13,8 +13,8 @@
 
 class Deployment(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta2/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/Deployment instead.
+    DEPRECATED - apps/v1beta2/Deployment is deprecated by apps/v1/Deployment and not supported by
+    Kubernetes v1.16+ clusters.
     
     Deployment enables declarative updates for Pods and ReplicaSets.
     
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/ReplicaSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/ReplicaSet.py
index a1f7e98d90..f5eeb6347f 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta2/ReplicaSet.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/ReplicaSet.py
@@ -13,8 +13,8 @@
 
 class ReplicaSet(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta2/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/ReplicaSet instead.
+    DEPRECATED - apps/v1beta2/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported by
+    Kubernetes v1.16+ clusters.
     
     ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     """
diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py
index 9478bd9a8e..b620f0d0cc 100755
--- a/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py
+++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py
@@ -13,8 +13,8 @@
 
 class StatefulSet(pulumi.CustomResource):
     """
-    DEPRECATED - apps/v1beta2/StatefulSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/StatefulSet instead.
+    DEPRECATED - apps/v1beta2/StatefulSet is deprecated by apps/v1/StatefulSet and not supported by
+    Kubernetes v1.16+ clusters.
     
     StatefulSet represents a set of pods with consistent identities. Identities are defined as:
      - Network: A single stable DNS and hostname.
diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/DaemonSet.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/DaemonSet.py
index 2e7bbd87b5..205ea3adf4 100755
--- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/DaemonSet.py
+++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/DaemonSet.py
@@ -13,8 +13,8 @@
 
 class DaemonSet(pulumi.CustomResource):
     """
-    DEPRECATED - extensions/v1beta1/DaemonSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/DaemonSet instead.
+    DEPRECATED - extensions/v1beta1/DaemonSet is deprecated by apps/v1/DaemonSet and not supported
+    by Kubernetes v1.16+ clusters.
     
     DaemonSet represents the configuration of a daemon set.
     """
diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py
index 1627314fda..18b2cf8e98 100755
--- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py
+++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py
@@ -13,8 +13,8 @@
 
 class Deployment(pulumi.CustomResource):
     """
-    DEPRECATED - extensions/v1beta1/Deployment is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/Deployment instead.
+    DEPRECATED - extensions/v1beta1/Deployment is deprecated by apps/v1/Deployment and not supported
+    by Kubernetes v1.16+ clusters.
     
     Deployment enables declarative updates for Pods and ReplicaSets.
     
diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py
index ae66aefdc6..c4a68b4fec 100755
--- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py
+++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py
@@ -13,8 +13,8 @@
 
 class Ingress(pulumi.CustomResource):
     """
-    DEPRECATED - extensions/v1beta1/Ingress is not supported by Kubernetes 1.16+ clusters. Use
-    networking/v1beta1/Ingress instead.
+    DEPRECATED - extensions/v1beta1/Ingress is deprecated by networking/v1beta1/Ingress and not
+    supported by Kubernetes v1.20+ clusters.
     
     Ingress is a collection of rules that allow inbound connections to reach the endpoints defined
     by a backend. An Ingress can be configured to give services externally-reachable urls, load
diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/ReplicaSet.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/ReplicaSet.py
index ccfaae633b..5d0dbc39e4 100755
--- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/ReplicaSet.py
+++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/ReplicaSet.py
@@ -13,8 +13,8 @@
 
 class ReplicaSet(pulumi.CustomResource):
     """
-    DEPRECATED - extensions/v1beta1/ReplicaSet is not supported by Kubernetes 1.16+ clusters. Use
-    apps/v1/ReplicaSet instead.
+    DEPRECATED - extensions/v1beta1/ReplicaSet is deprecated by apps/v1/ReplicaSet and not supported
+    by Kubernetes v1.16+ clusters.
     
     ReplicaSet ensures that a specified number of pod replicas are running at any given time.
     """
diff --git a/sdk/python/pulumi_kubernetes/storage/v1beta1/CSINode.py b/sdk/python/pulumi_kubernetes/storage/v1beta1/CSINode.py
index bc9c2e7f22..cb833e8c08 100755
--- a/sdk/python/pulumi_kubernetes/storage/v1beta1/CSINode.py
+++ b/sdk/python/pulumi_kubernetes/storage/v1beta1/CSINode.py
@@ -13,8 +13,8 @@
 
 class CSINode(pulumi.CustomResource):
     """
-    DEPRECATED - storage/v1beta1/CSINode is not supported by Kubernetes 1.16+ clusters. Use
-    storage/v1beta1/CSINode instead.
+    DEPRECATED - storage/v1beta1/CSINode is deprecated by storage/v1beta1/CSINode and not supported
+    by Kubernetes v<nil>+ clusters.
     
     CSINode holds information about all CSI drivers installed on a node. CSI drivers do not need to
     create the CSINode object directly. As long as they use the node-driver-registrar sidecar