Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions provider/pkg/gen/dotnet-templates/helm/v2/Chart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions provider/pkg/gen/go-templates/helm/v2/chart.tmpl
Original file line number Diff 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
3 changes: 0 additions & 3 deletions provider/pkg/gen/nodejs-templates/helm/v2/helm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand All @@ -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}`
}
Expand Down
7 changes: 0 additions & 7 deletions provider/pkg/gen/python-templates/helm/v2/helm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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):
Expand Down
3 changes: 0 additions & 3 deletions sdk/dotnet/Helm/V2/Chart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions sdk/go/kubernetes/helm/v2/chart.go
Original file line number Diff 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
3 changes: 0 additions & 3 deletions sdk/nodejs/helm/v2/helm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/**
Expand All @@ -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}`
}
Expand Down
7 changes: 0 additions & 7 deletions sdk/python/pulumi_kubernetes/helm/v2/helm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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):
Expand Down