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

Remove Helm Release Beta Warnings #1885

Merged
merged 6 commits into from Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 3 additions & 12 deletions provider/cmd/pulumi-resource-kubernetes/schema.json
Expand Up @@ -24627,7 +24627,7 @@
}
},
"kubernetes:index:HelmReleaseSettings": {
"description": "BETA FEATURE - Options to configure the Helm Release resource.",
"description": "Options to configure the Helm Release resource.",
"properties": {
"driver": {
"type": "string",
Expand Down Expand Up @@ -24673,15 +24673,6 @@
"PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH"
]
}
},
"suppressBetaWarning": {
"type": "boolean",
"description": "While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to \"true\", this warning is omitted.",
"defaultInfo": {
"environment": [
"PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING"
]
}
}
},
"type": "object"
Expand Down Expand Up @@ -31547,7 +31538,7 @@
},
"helmReleaseSettings": {
"$ref": "#/types/kubernetes:index:HelmReleaseSettings",
"description": "BETA FEATURE - Options to configure the Helm Release resource."
"description": "Options to configure the Helm Release resource."
},
"kubeClientSettings": {
"$ref": "#/types/kubernetes:index:KubeClientSettings",
Expand Down Expand Up @@ -41604,7 +41595,7 @@
"isComponent": true
},
"kubernetes:helm.sh/v3:Release": {
"description": "A Release is an instance of a chart running in a Kubernetes cluster.\nA Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.\nNote - Helm Release is currently in BETA and may change. Use in production environment is discouraged.\n",
"description": "A Release is an instance of a chart running in a Kubernetes cluster.\nA Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.\n",
"properties": {
"atomic": {
"type": "boolean",
Expand Down
1 change: 0 additions & 1 deletion provider/pkg/gen/examples/overlays/helmRelease.md
@@ -1,3 +1,2 @@
A Release is an instance of a chart running in a Kubernetes cluster.
A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.
11 changes: 1 addition & 10 deletions provider/pkg/gen/overlays.go
Expand Up @@ -474,7 +474,7 @@ var kubeClientSettings = pschema.ComplexTypeSpec{

var helmReleaseSettings = pschema.ComplexTypeSpec{
ObjectTypeSpec: pschema.ObjectTypeSpec{
Description: "BETA FEATURE - Options to configure the Helm Release resource.",
Description: "Options to configure the Helm Release resource.",
Properties: map[string]pschema.PropertySpec{
"driver": {
DefaultInfo: &pschema.DefaultSpec{
Expand Down Expand Up @@ -521,15 +521,6 @@ var helmReleaseSettings = pschema.ComplexTypeSpec{
Description: "The path to the file containing cached repository indexes.",
TypeSpec: pschema.TypeSpec{Type: "string"},
},
"suppressBetaWarning": {
DefaultInfo: &pschema.DefaultSpec{
Environment: []string{
"PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING",
},
},
Description: "While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to \"true\", this warning is omitted.",
TypeSpec: pschema.TypeSpec{Type: "boolean"},
},
},
Type: "object",
},
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/gen/schema.go
Expand Up @@ -159,7 +159,7 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
TypeSpec: pschema.TypeSpec{Ref: "#/types/kubernetes:index:KubeClientSettings"},
},
"helmReleaseSettings": {
Description: "BETA FEATURE - Options to configure the Helm Release resource.",
Description: "Options to configure the Helm Release resource.",
TypeSpec: pschema.TypeSpec{Ref: "#/types/kubernetes:index:HelmReleaseSettings"},
},
"suppressHelmHookWarnings": {
Expand Down
4 changes: 1 addition & 3 deletions provider/pkg/provider/types.go
Expand Up @@ -17,7 +17,7 @@ package provider
// Note: These types must match the types defined in the Go SDK (sdk/go/kubernetes/pulumiTypes.go).
// Copying the types avoids having the provider depend on the SDK.

// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
type HelmReleaseSettings struct {
// The backend storage driver for Helm. Values are: configmap, secret, memory, sql.
Driver *string `json:"driver"`
Expand All @@ -29,8 +29,6 @@ type HelmReleaseSettings struct {
RepositoryCache *string `json:"repositoryCache"`
// The path to the file containing repository names and URLs.
RepositoryConfigPath *string `json:"repositoryConfigPath"`
// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
SuppressBetaWarning *bool `json:"suppressBetaWarning"`
}

// Options for tuning the Kubernetes client used by a Provider.
Expand Down
1 change: 0 additions & 1 deletion sdk/dotnet/Helm/V3/Release.cs
Expand Up @@ -12,7 +12,6 @@ namespace Pulumi.Kubernetes.Helm.V3
/// <summary>
/// A Release is an instance of a chart running in a Kubernetes cluster.
/// A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
/// Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.
/// </summary>
[KubernetesResourceType("kubernetes:helm.sh/v3:Release")]
public partial class Release : KubernetesResource
Expand Down
9 changes: 1 addition & 8 deletions sdk/dotnet/Inputs/HelmReleaseSettingsArgs.cs
Expand Up @@ -11,7 +11,7 @@ namespace Pulumi.Kubernetes.Types.Inputs.Provider
{

/// <summary>
/// BETA FEATURE - Options to configure the Helm Release resource.
/// Options to configure the Helm Release resource.
/// </summary>
public class HelmReleaseSettingsArgs : Pulumi.ResourceArgs
{
Expand Down Expand Up @@ -45,20 +45,13 @@ public class HelmReleaseSettingsArgs : Pulumi.ResourceArgs
[Input("repositoryConfigPath")]
public Input<string>? RepositoryConfigPath { get; set; }

/// <summary>
/// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
/// </summary>
[Input("suppressBetaWarning")]
public Input<bool>? SuppressBetaWarning { get; set; }

public HelmReleaseSettingsArgs()
{
Driver = Utilities.GetEnv("PULUMI_K8S_HELM_DRIVER");
PluginsPath = Utilities.GetEnv("PULUMI_K8S_HELM_PLUGINS_PATH");
RegistryConfigPath = Utilities.GetEnv("PULUMI_K8S_HELM_REGISTRY_CONFIG_PATH");
RepositoryCache = Utilities.GetEnv("PULUMI_K8S_HELM_REPOSITORY_CACHE");
RepositoryConfigPath = Utilities.GetEnv("PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH");
SuppressBetaWarning = Utilities.GetEnvBoolean("PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING");
}
}
}
2 changes: 1 addition & 1 deletion sdk/dotnet/Provider.cs
Expand Up @@ -73,7 +73,7 @@ public sealed class ProviderArgs : Pulumi.ResourceArgs
public Input<bool>? EnableReplaceCRD { get; set; }

/// <summary>
/// BETA FEATURE - Options to configure the Helm Release resource.
/// Options to configure the Helm Release resource.
/// </summary>
[Input("helmReleaseSettings", json: true)]
public Input<Pulumi.Kubernetes.Types.Inputs.Provider.HelmReleaseSettingsArgs>? HelmReleaseSettings { get; set; }
Expand Down
1 change: 0 additions & 1 deletion sdk/go/kubernetes/helm/v3/release.go
Expand Up @@ -13,7 +13,6 @@ import (

// A Release is an instance of a chart running in a Kubernetes cluster.
// A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
// Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.
type Release struct {
pulumi.CustomResourceState

Expand Down
4 changes: 2 additions & 2 deletions sdk/go/kubernetes/provider.go
Expand Up @@ -64,7 +64,7 @@ type providerArgs struct {
// BETA FEATURE - If present and set to true, replace CRDs on update rather than patching.
// This feature is in developer preview, and is disabled by default.
EnableReplaceCRD *bool `pulumi:"enableReplaceCRD"`
// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
HelmReleaseSettings *HelmReleaseSettings `pulumi:"helmReleaseSettings"`
// Options for tuning the Kubernetes client used by a Provider.
KubeClientSettings *KubeClientSettings `pulumi:"kubeClientSettings"`
Expand Down Expand Up @@ -104,7 +104,7 @@ type ProviderArgs struct {
// BETA FEATURE - If present and set to true, replace CRDs on update rather than patching.
// This feature is in developer preview, and is disabled by default.
EnableReplaceCRD pulumi.BoolPtrInput
// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
HelmReleaseSettings HelmReleaseSettingsPtrInput
// Options for tuning the Kubernetes client used by a Provider.
KubeClientSettings KubeClientSettingsPtrInput
Expand Down
29 changes: 3 additions & 26 deletions sdk/go/kubernetes/pulumiTypes.go
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
)

// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
type HelmReleaseSettings struct {
// The backend storage driver for Helm. Values are: configmap, secret, memory, sql.
Driver *string `pulumi:"driver"`
Expand All @@ -22,8 +22,6 @@ type HelmReleaseSettings struct {
RepositoryCache *string `pulumi:"repositoryCache"`
// The path to the file containing repository names and URLs.
RepositoryConfigPath *string `pulumi:"repositoryConfigPath"`
// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
SuppressBetaWarning *bool `pulumi:"suppressBetaWarning"`
}

// Defaults sets the appropriate defaults for HelmReleaseSettings
Expand Down Expand Up @@ -52,10 +50,6 @@ func (val *HelmReleaseSettings) Defaults() *HelmReleaseSettings {
repositoryConfigPath_ := getEnvOrDefault("", nil, "PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH").(string)
tmp.RepositoryConfigPath = &repositoryConfigPath_
}
if isZero(tmp.SuppressBetaWarning) {
suppressBetaWarning_ := getEnvOrDefault(false, parseEnvBool, "PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING").(bool)
tmp.SuppressBetaWarning = &suppressBetaWarning_
}
return &tmp
}

Expand All @@ -70,7 +64,7 @@ type HelmReleaseSettingsInput interface {
ToHelmReleaseSettingsOutputWithContext(context.Context) HelmReleaseSettingsOutput
}

// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
type HelmReleaseSettingsArgs struct {
// The backend storage driver for Helm. Values are: configmap, secret, memory, sql.
Driver pulumi.StringPtrInput `pulumi:"driver"`
Expand All @@ -82,8 +76,6 @@ type HelmReleaseSettingsArgs struct {
RepositoryCache pulumi.StringPtrInput `pulumi:"repositoryCache"`
// The path to the file containing repository names and URLs.
RepositoryConfigPath pulumi.StringPtrInput `pulumi:"repositoryConfigPath"`
// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
SuppressBetaWarning pulumi.BoolPtrInput `pulumi:"suppressBetaWarning"`
}

func (HelmReleaseSettingsArgs) ElementType() reflect.Type {
Expand Down Expand Up @@ -139,7 +131,7 @@ func (i *helmReleaseSettingsPtrType) ToHelmReleaseSettingsPtrOutputWithContext(c
return pulumi.ToOutputWithContext(ctx, i).(HelmReleaseSettingsPtrOutput)
}

// BETA FEATURE - Options to configure the Helm Release resource.
// Options to configure the Helm Release resource.
type HelmReleaseSettingsOutput struct{ *pulumi.OutputState }

func (HelmReleaseSettingsOutput) ElementType() reflect.Type {
Expand Down Expand Up @@ -189,11 +181,6 @@ func (o HelmReleaseSettingsOutput) RepositoryConfigPath() pulumi.StringPtrOutput
return o.ApplyT(func(v HelmReleaseSettings) *string { return v.RepositoryConfigPath }).(pulumi.StringPtrOutput)
}

// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
func (o HelmReleaseSettingsOutput) SuppressBetaWarning() pulumi.BoolPtrOutput {
return o.ApplyT(func(v HelmReleaseSettings) *bool { return v.SuppressBetaWarning }).(pulumi.BoolPtrOutput)
}

type HelmReleaseSettingsPtrOutput struct{ *pulumi.OutputState }

func (HelmReleaseSettingsPtrOutput) ElementType() reflect.Type {
Expand Down Expand Up @@ -268,16 +255,6 @@ func (o HelmReleaseSettingsPtrOutput) RepositoryConfigPath() pulumi.StringPtrOut
}).(pulumi.StringPtrOutput)
}

// While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
func (o HelmReleaseSettingsPtrOutput) SuppressBetaWarning() pulumi.BoolPtrOutput {
return o.ApplyT(func(v *HelmReleaseSettings) *bool {
if v == nil {
return nil
}
return v.SuppressBetaWarning
}).(pulumi.BoolPtrOutput)
}

// Options for tuning the Kubernetes client used by a Provider.
type KubeClientSettings struct {
// Maximum burst for throttle. Default value is 10.
Expand Down
1 change: 0 additions & 1 deletion sdk/nodejs/helm/v3/release.ts
Expand Up @@ -8,7 +8,6 @@ import * as utilities from "../../utilities";
/**
* A Release is an instance of a chart running in a Kubernetes cluster.
* A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
* Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.
*/
export class Release extends pulumi.CustomResource {
/**
Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/provider.ts
Expand Up @@ -77,7 +77,7 @@ export interface ProviderArgs {
*/
enableReplaceCRD?: pulumi.Input<boolean>;
/**
* BETA FEATURE - Options to configure the Helm Release resource.
* Options to configure the Helm Release resource.
*/
helmReleaseSettings?: pulumi.Input<inputs.HelmReleaseSettings>;
/**
Expand Down
7 changes: 1 addition & 6 deletions sdk/nodejs/types/input.ts
Expand Up @@ -7,7 +7,7 @@ import { input as inputs, output as outputs, enums } from "../types";
import * as utilities from "../utilities";

/**
* BETA FEATURE - Options to configure the Helm Release resource.
* Options to configure the Helm Release resource.
*/
export interface HelmReleaseSettings {
/**
Expand All @@ -30,10 +30,6 @@ export interface HelmReleaseSettings {
* The path to the file containing repository names and URLs.
*/
repositoryConfigPath?: pulumi.Input<string>;
/**
* While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
*/
suppressBetaWarning?: pulumi.Input<boolean>;
}
/**
* helmReleaseSettingsProvideDefaults sets the appropriate defaults for HelmReleaseSettings
Expand All @@ -46,7 +42,6 @@ export function helmReleaseSettingsProvideDefaults(val: HelmReleaseSettings): He
registryConfigPath: (val.registryConfigPath) ?? utilities.getEnv("PULUMI_K8S_HELM_REGISTRY_CONFIG_PATH"),
repositoryCache: (val.repositoryCache) ?? utilities.getEnv("PULUMI_K8S_HELM_REPOSITORY_CACHE"),
repositoryConfigPath: (val.repositoryConfigPath) ?? utilities.getEnv("PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH"),
suppressBetaWarning: (val.suppressBetaWarning) ?? utilities.getEnvBoolean("PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING"),
};
}

Expand Down
22 changes: 2 additions & 20 deletions sdk/python/pulumi_kubernetes/_inputs.py
Expand Up @@ -20,16 +20,14 @@ def __init__(__self__, *,
plugins_path: Optional[pulumi.Input[str]] = None,
registry_config_path: Optional[pulumi.Input[str]] = None,
repository_cache: Optional[pulumi.Input[str]] = None,
repository_config_path: Optional[pulumi.Input[str]] = None,
suppress_beta_warning: Optional[pulumi.Input[bool]] = None):
repository_config_path: Optional[pulumi.Input[str]] = None):
"""
BETA FEATURE - Options to configure the Helm Release resource.
Options to configure the Helm Release resource.
:param pulumi.Input[str] driver: The backend storage driver for Helm. Values are: configmap, secret, memory, sql.
:param pulumi.Input[str] plugins_path: The path to the helm plugins directory.
:param pulumi.Input[str] registry_config_path: The path to the registry config file.
:param pulumi.Input[str] repository_cache: The path to the file containing cached repository indexes.
:param pulumi.Input[str] repository_config_path: The path to the file containing repository names and URLs.
:param pulumi.Input[bool] suppress_beta_warning: While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
"""
if driver is None:
driver = _utilities.get_env('PULUMI_K8S_HELM_DRIVER')
Expand All @@ -51,10 +49,6 @@ def __init__(__self__, *,
repository_config_path = _utilities.get_env('PULUMI_K8S_HELM_REPOSITORY_CONFIG_PATH')
if repository_config_path is not None:
pulumi.set(__self__, "repository_config_path", repository_config_path)
if suppress_beta_warning is None:
suppress_beta_warning = _utilities.get_env_bool('PULUMI_K8S_SUPPRESS_HELM_RELEASE_BETA_WARNING')
if suppress_beta_warning is not None:
pulumi.set(__self__, "suppress_beta_warning", suppress_beta_warning)

@property
@pulumi.getter
Expand Down Expand Up @@ -116,18 +110,6 @@ def repository_config_path(self) -> Optional[pulumi.Input[str]]:
def repository_config_path(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "repository_config_path", value)

@property
@pulumi.getter(name="suppressBetaWarning")
def suppress_beta_warning(self) -> Optional[pulumi.Input[bool]]:
"""
While Helm Release provider is in beta, by default 'pulumi up' will log a warning if the resource is used. If present and set to "true", this warning is omitted.
"""
return pulumi.get(self, "suppress_beta_warning")

@suppress_beta_warning.setter
def suppress_beta_warning(self, value: Optional[pulumi.Input[bool]]):
pulumi.set(self, "suppress_beta_warning", value)


@pulumi.input_type
class KubeClientSettingsArgs:
Expand Down
2 changes: 0 additions & 2 deletions sdk/python/pulumi_kubernetes/helm/v3/Release.py
Expand Up @@ -602,7 +602,6 @@ def __init__(__self__,
"""
A Release is an instance of a chart running in a Kubernetes cluster.
A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.

:param str resource_name: The name of the resource.
:param pulumi.ResourceOptions opts: Options for the resource.
Expand Down Expand Up @@ -649,7 +648,6 @@ def __init__(__self__,
"""
A Release is an instance of a chart running in a Kubernetes cluster.
A Chart is a Helm package. It contains all the resource definitions necessary to run an application, tool, or service inside a Kubernetes cluster.
Note - Helm Release is currently in BETA and may change. Use in production environment is discouraged.

:param str resource_name: The name of the resource.
:param ReleaseArgs args: The arguments to use to populate this resource's properties.
Expand Down