Revert "Deprecate Helm v2 SDKs (#1344)" (#1352)

This reverts commit b71e4d4.
pulumi · Oct 12, 2020 · 04777ff · 04777ff
1 parent 2c206f4
commit 04777ff
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## HEAD (Unreleased)
 
+## 2.6.3 (October 12, 2020)
+
+-   Revert Helm v2 deprecation warnings (https://github.com/pulumi/pulumi-kubernetes/pull/1352)
+
 ## 2.6.2 (October 7, 2020)
 
 ## Important Note

diff --git a/provider/pkg/gen/dotnet-templates/helm/v2/Chart.cs b/provider/pkg/gen/dotnet-templates/helm/v2/Chart.cs
@@ -15,8 +15,6 @@
 // *** WARNING: this file was generated by pulumigen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-using System;
-
 namespace Pulumi.Kubernetes.Helm.V2
 {
     /// <summary>
@@ -219,7 +217,6 @@ namespace Pulumi.Kubernetes.Helm.V2
     /// }
     /// ```
     /// </summary>
-    [Obsolete(@"Helm.V2.Chart has been deprecated in favor of Helm.V3.Chart and will be removed in a future release.")]
     public sealed class Chart : ChartBase
     {
         /// <summary>

diff --git a/provider/pkg/gen/go-templates/helm/v2/chart.tmpl b/provider/pkg/gen/go-templates/helm/v2/chart.tmpl
@@ -218,8 +218,6 @@ import (
 //     })
 // }
 // ```
-//
-// Deprecated: helm/v2/Chart has been deprecated in favor of helm/v3/Chart and will be removed in a future release.
 type Chart struct {
 	pulumi.ResourceState
 

diff --git a/provider/pkg/gen/nodejs-templates/helm/v2/helm.ts b/provider/pkg/gen/nodejs-templates/helm/v2/helm.ts
@@ -130,8 +130,6 @@ import * as yaml from "../../yaml/index";
  *   ],
  * });
  * ```
- *
- * @deprecated helm.v2.Chart has been deprecated in favor of helm.v3.Chart
  */
 export class Chart extends yaml.CollectionComponentResource {
     /**
@@ -145,7 +143,6 @@ export class Chart extends yaml.CollectionComponentResource {
         config: ChartOpts | LocalChartOpts,
         opts?: pulumi.ComponentResourceOptions
     ) {
-        pulumi.log.warn("Chart is deprecated: helm.v2.Chart is deprecated in favor of helm.v3.Chart and will be removed in a future release.")
         if (config.resourcePrefix !== undefined) {
             releaseName = `${config.resourcePrefix}-${releaseName}`
         }

diff --git a/provider/pkg/gen/python-templates/helm/v2/helm.py b/provider/pkg/gen/python-templates/helm/v2/helm.py
@@ -8,16 +8,12 @@
 import subprocess
 from tempfile import mkdtemp, mkstemp
 from typing import Any, Callable, Optional, Sequence, TextIO, Tuple, Union
-import warnings
 
 import pulumi.runtime
 from pulumi_kubernetes.yaml import _parse_yaml_document
 
 from ... import _utilities
 
-warnings.warn("helm.v2.Chart has been deprecated in favor of helm.v3.Chart and will be removed in a future release.",
-              DeprecationWarning)
-
 
 class Chart(pulumi.ComponentResource):
     resources: pulumi.Output[dict]
@@ -157,9 +153,6 @@ def omit_resource(obj, opts):
         :param Optional[pulumi.ResourceOptions] opts: A bag of options that control this
                resource's behavior.
         """
-        warnings.warn(
-            "helm.v2.Chart has been deprecated in favor of helm.v3.Chart and will be removed in a future release.",
-            DeprecationWarning)
         if not release_name:
             raise TypeError('Missing release name argument')
         if not isinstance(release_name, str):

diff --git a/sdk/dotnet/Helm/V2/Chart.cs b/sdk/dotnet/Helm/V2/Chart.cs
@@ -15,8 +15,6 @@
 // *** WARNING: this file was generated by pulumigen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-using System;
-
 namespace Pulumi.Kubernetes.Helm.V2
 {
     /// <summary>
@@ -219,7 +217,6 @@ namespace Pulumi.Kubernetes.Helm.V2
     /// }
     /// ```
     /// </summary>
-    [Obsolete(@"Helm.V2.Chart has been deprecated in favor of Helm.V3.Chart and will be removed in a future release.")]
     public sealed class Chart : ChartBase
     {
         /// <summary>

diff --git a/sdk/go/kubernetes/helm/v2/chart.go b/sdk/go/kubernetes/helm/v2/chart.go
@@ -218,8 +218,6 @@ import (
 //     })
 // }
 // ```
-//
-// Deprecated: helm/v2/Chart has been deprecated in favor of helm/v3/Chart and will be removed in a future release.
 type Chart struct {
 	pulumi.ResourceState
 

diff --git a/sdk/nodejs/helm/v2/helm.ts b/sdk/nodejs/helm/v2/helm.ts
@@ -130,8 +130,6 @@ import * as yaml from "../../yaml/index";
  *   ],
  * });
  * ```
- *
- * @deprecated helm.v2.Chart has been deprecated in favor of helm.v3.Chart
  */
 export class Chart extends yaml.CollectionComponentResource {
     /**
@@ -145,7 +143,6 @@ export class Chart extends yaml.CollectionComponentResource {
         config: ChartOpts | LocalChartOpts,
         opts?: pulumi.ComponentResourceOptions
     ) {
-        pulumi.log.warn("Chart is deprecated: helm.v2.Chart is deprecated in favor of helm.v3.Chart and will be removed in a future release.")
         if (config.resourcePrefix !== undefined) {
             releaseName = `${config.resourcePrefix}-${releaseName}`
         }

diff --git a/sdk/python/pulumi_kubernetes/helm/v2/helm.py b/sdk/python/pulumi_kubernetes/helm/v2/helm.py
@@ -8,16 +8,12 @@
 import subprocess
 from tempfile import mkdtemp, mkstemp
 from typing import Any, Callable, Optional, Sequence, TextIO, Tuple, Union
-import warnings
 
 import pulumi.runtime
 from pulumi_kubernetes.yaml import _parse_yaml_document
 
 from ... import _utilities
 
-warnings.warn("helm.v2.Chart has been deprecated in favor of helm.v3.Chart and will be removed in a future release.",
-              DeprecationWarning)
-
 
 class Chart(pulumi.ComponentResource):
     resources: pulumi.Output[dict]
@@ -157,9 +153,6 @@ def omit_resource(obj, opts):
         :param Optional[pulumi.ResourceOptions] opts: A bag of options that control this
                resource's behavior.
         """
-        warnings.warn(
-            "helm.v2.Chart has been deprecated in favor of helm.v3.Chart and will be removed in a future release.",
-            DeprecationWarning)
         if not release_name:
             raise TypeError('Missing release name argument')
         if not isinstance(release_name, str):
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,8 +218,6 @@ import ( @@
     //     })
     // }
     // ```
-    //
-    // Deprecated: helm/v2/Chart has been deprecated in favor of helm/v3/Chart and will be removed in a future release.
     type Chart struct {
     	pulumi.ResourceState
@@ Expand Down @@