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

Use include-crds flags when using helm v3 #1102

Merged
merged 8 commits into from
May 11, 2020
Merged

Use include-crds flags when using helm v3 #1102

merged 8 commits into from
May 11, 2020

Conversation

jaxxstorm
Copy link
Contributor

This PR adds a mechanism to detect if helm v3 is being used when the
chart is rendered. If it is, it includes the --include-crds flag so
that the CRDs are rendered as part of the YAML stream.

Fixes #1023

Proposed changes

Related issues (optional)

Copy link
Member

@lblackstone lblackstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly LGTM; just a couple small changes

provider/pkg/gen/nodejs-templates/helm/v2/helm.ts Outdated Show resolved Hide resolved
sdk/python/setup.py Outdated Show resolved Hide resolved
@lblackstone
Copy link
Member

Also need to update changelog

@jaxxstorm jaxxstorm requested a review from lblackstone May 7, 2020 03:09
sdk/nodejs/helm/v2/helm.ts Outdated Show resolved Hide resolved
@jaxxstorm
Copy link
Contributor Author

Looks like the tests surfaced an error, I'll take another look

@jaxxstorm
Copy link
Contributor Author

Ah, the include-crds flag was only added in helm v3.1. I guess I'm writing a regex then!

# This is the 1st commit message:

Use include-crds flags when using helm v3

This PR adds a mechanism to detect if helm v3 is being used when the
chart is rendered. If it is, it includes the `--include-crds` flag so
that the CRDs are rendered as part of the YAML stream.

Fixes #1023

# The commit message #2 will be skipped:

# Remove version hack

# The commit message #3 will be skipped:

# Remove unneeded execSync options
This PR adds a mechanism to detect if helm v3 is being used when the
chart is rendered. If it is, it includes the `--include-crds` flag so
that the CRDs are rendered as part of the YAML stream.

Fixes #1023
@jaxxstorm
Copy link
Contributor Author

@mikhailshilkov can you take a look at the csharp SDK changes?

provider/pkg/gen/nodejs-templates/helm/v2/helm.ts Outdated Show resolved Hide resolved
sdk/go/kubernetes/helm/v2/chart.go Outdated Show resolved Hide resolved
Copy link
Member

@mikhailshilkov mikhailshilkov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The C# code LGTM modulo two nits.

sdk/dotnet/Helm/ChartBase.cs Outdated Show resolved Hide resolved
sdk/dotnet/Helm/ChartBase.cs Outdated Show resolved Hide resolved
Copy link
Member

@lblackstone lblackstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more fix, and then LGTM

provider/pkg/gen/python-templates/helm/v2/helm.py Outdated Show resolved Hide resolved
@lblackstone
Copy link
Member

You'll probably need to run another build and push the updated SDK

@jaxxstorm jaxxstorm merged commit cf42dd9 into master May 11, 2020
@pulumi-bot pulumi-bot deleted the include-crds branch May 11, 2020 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Helm 3 not installing custom CRDs
3 participants