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 bug with Go Helm v3 transformation marshaling #1420

Merged
merged 2 commits into from
Jan 12, 2021
Merged

Fix bug with Go Helm v3 transformation marshaling #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15a8efe
Fix bug with Go Helm v3 transformation marshaling
lblackstone Jan 11, 2021
e78aadc
Make changes to the codegen template
lblackstone Jan 11, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## HEAD (Unreleased)

- Upgrade helm and k8s deps (https://github.com/pulumi/pulumi-kubernetes/pull/1414)
- Fix bug with Go Helm v3 transformation marshaling (https://github.com/pulumi/pulumi-kubernetes/pull/1420)

## 2.7.5 (December 16, 2020)

Expand Down
3 changes: 2 additions & 1 deletion provider/pkg/gen/go-templates/helm/v3/pulumiTypes.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,12 @@ type ChartArgs struct {
}

// chartArgs is a copy of ChartArgs but without using TInput in types.
// Note that Transformations are omitted in JSON marshaling because functions are not serializable.
type chartArgs struct {
APIVersions []string `json:"api_versions,omitempty" pulumi:"apiVersions"`
Namespace string `json:"namespace,omitempty" pulumi:"namespace"`
Values map[string]interface{} `json:"values,omitempty" pulumi:"values"`
Transformations []yaml.Transformation `json:"transformations,omitempty" pulumi:"transformations"`
Transformations []yaml.Transformation `json:"-" pulumi:"transformations"`
ResourcePrefix string `json:"resource_prefix,omitempty" pulumi:"resourcePrefix"`
Repo string `json:"repo,omitempty" pulumi:"repo"`
Chart string `json:"chart,omitempty" pulumi:"chart"`
Expand Down
3 changes: 2 additions & 1 deletion sdk/go/kubernetes/helm/v3/pulumiTypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,12 @@ type ChartArgs struct {
}

// chartArgs is a copy of ChartArgs but without using TInput in types.
// Note that Transformations are omitted in JSON marshaling because functions are not serializable.
type chartArgs struct {
APIVersions []string `json:"api_versions,omitempty" pulumi:"apiVersions"`
Namespace string `json:"namespace,omitempty" pulumi:"namespace"`
Values map[string]interface{} `json:"values,omitempty" pulumi:"values"`
Transformations []yaml.Transformation `json:"transformations,omitempty" pulumi:"transformations"`
Transformations []yaml.Transformation `json:"-" pulumi:"transformations"`
lblackstone marked this conversation as resolved.
Show resolved Hide resolved
ResourcePrefix string `json:"resource_prefix,omitempty" pulumi:"resourcePrefix"`
Repo string `json:"repo,omitempty" pulumi:"repo"`
Chart string `json:"chart,omitempty" pulumi:"chart"`
Expand Down