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.

Sign up for GitHub

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

Jump to bottom

Fix misleading message for disable Helm hook warnings #1683

Merged
merged 1 commit into from
Aug 20, 2021
Merged

Fix misleading message for disable Helm hook warnings #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## HEAD (Unreleased)

## 3.6.2 (August 19, 2021)

- Fix environment variable name in disable Helm hook warnings message (https://github.com/pulumi/pulumi-kubernetes/pull/1683)

## 3.6.1 (August 19, 2021)

- [sdk/python] Fix wait for metadata in `yaml._parse_yaml_object`. (https://github.com/pulumi/pulumi-kubernetes/pull/1675)
Expand Down
4 changes: 2 additions & 2 deletions provider/cmd/pulumi-resource-kubernetes/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"suppressHelmHookWarnings": {
"type": "boolean",
"description": "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable."
"description": "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable."
}
}
},
Expand Down Expand Up @@ -29625,7 +29625,7 @@
},
"suppressHelmHookWarnings": {
"type": "boolean",
"description": "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.",
"description": "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.",
"defaultInfo": {
"environment": [
"PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS"
Expand Down
4 changes: 2 additions & 2 deletions provider/pkg/gen/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
TypeSpec: pschema.TypeSpec{Type: "boolean"},
},
"suppressHelmHookWarnings": {
Description: "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.",
Description: "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.",
TypeSpec: pschema.TypeSpec{Type: "boolean"},
},
},
Expand Down Expand Up @@ -137,7 +137,7 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
"PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS",
},
},
Description: "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.",
Description: "If present and set to true, suppress unsupported Helm hook warnings from the CLI.\n\nThis config can be specified in the following ways, using this precedence:\n1. This `suppressHelmHookWarnings` parameter.\n2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.",
TypeSpec: pschema.TypeSpec{Type: "boolean"},
},
},
Expand Down
2 changes: 1 addition & 1 deletion provider/pkg/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ func (k *kubeProvider) helmHookWarning(ctx context.Context, newInputs *unstructu
"This resource contains Helm hooks that are not currently supported by Pulumi. The resource will "+
"be created, but any hooks will not be executed. Hooks support is tracked at "+
"https://github.com/pulumi/pulumi-kubernetes/issues/555 -- This warning can be disabled by setting "+
"the PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING environment variable")
"the PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS environment variable")
}
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Config/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void Set(T value)
///
/// This config can be specified in the following ways, using this precedence:
/// 1. This `suppressHelmHookWarnings` parameter.
/// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
/// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
/// </summary>
public static bool? SuppressHelmHookWarnings
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/Provider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public sealed class ProviderArgs : Pulumi.ResourceArgs
///
/// This config can be specified in the following ways, using this precedence:
/// 1. This `suppressHelmHookWarnings` parameter.
/// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
/// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
/// </summary>
[Input("suppressHelmHookWarnings", json: true)]
public Input<bool>? SuppressHelmHookWarnings { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/kubernetes/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func GetSuppressDeprecationWarnings(ctx *pulumi.Context) bool {
//
// This config can be specified in the following ways, using this precedence:
// 1. This `suppressHelmHookWarnings` parameter.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
func GetSuppressHelmHookWarnings(ctx *pulumi.Context) bool {
return config.GetBool(ctx, "kubernetes:suppressHelmHookWarnings")
}
4 changes: 2 additions & 2 deletions sdk/go/kubernetes/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type providerArgs struct {
//
// This config can be specified in the following ways, using this precedence:
// 1. This `suppressHelmHookWarnings` parameter.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
SuppressHelmHookWarnings *bool `pulumi:"suppressHelmHookWarnings"`
}

Expand Down Expand Up @@ -111,7 +111,7 @@ type ProviderArgs struct {
//
// This config can be specified in the following ways, using this precedence:
// 1. This `suppressHelmHookWarnings` parameter.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
// 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
SuppressHelmHookWarnings pulumi.BoolPtrInput
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/nodejs/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export interface ProviderArgs {
*
* This config can be specified in the following ways, using this precedence:
* 1. This `suppressHelmHookWarnings` parameter.
* 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
* 2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
*/
suppressHelmHookWarnings?: pulumi.Input<boolean>;
}
6 changes: 3 additions & 3 deletions sdk/python/pulumi_kubernetes/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(__self__, *,

This config can be specified in the following ways, using this precedence:
1. This `suppressHelmHookWarnings` parameter.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
"""
if cluster is not None:
pulumi.set(__self__, "cluster", cluster)
Expand Down Expand Up @@ -179,7 +179,7 @@ def suppress_helm_hook_warnings(self) -> Optional[pulumi.Input[bool]]:

This config can be specified in the following ways, using this precedence:
1. This `suppressHelmHookWarnings` parameter.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
"""
return pulumi.get(self, "suppress_helm_hook_warnings")

Expand Down Expand Up @@ -231,7 +231,7 @@ def __init__(__self__,

This config can be specified in the following ways, using this precedence:
1. This `suppressHelmHookWarnings` parameter.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNING` environment variable.
2. The `PULUMI_K8S_SUPPRESS_HELM_HOOK_WARNINGS` environment variable.
"""
...
@overload
Expand Down