Skip to content

Commit

Permalink
Support local charts in helm.Release resource
Browse files Browse the repository at this point in the history
  • Loading branch information
@lblackstone
lblackstone committed Dec 3, 2021
1 parent e38609c commit 8330f29
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 62 deletions.
101 changes: 42 additions & 59 deletions provider/pkg/provider/helm_release.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ type helmReleaseProvider struct {
enableSecrets bool
name string
settings *cli.EnvSettings
kubeconfig clientcmd.ClientConfig
}

func newHelmReleaseProvider(
Expand All @@ -191,6 +192,7 @@ func newHelmReleaseProvider(
registryConfigPath,
repositoryConfigPath,
repositoryCache string,
kubeconfig clientcmd.ClientConfig,
) (customResourceProvider, error) {
settings := cli.New()
settings.PluginsDirectory = pluginsDirectory
Expand All @@ -208,6 +210,7 @@ func newHelmReleaseProvider(
enableSecrets: enableSecrets,
name: "kubernetes:helmrelease",
settings: settings,
kubeconfig: kubeconfig,
}, nil
}

Expand All @@ -217,30 +220,7 @@ func debug(format string, a ...interface{}) {

func (r *helmReleaseProvider) getActionConfig(namespace string) (*action.Configuration, error) {
conf := new(action.Configuration)
var overrides clientcmd.ConfigOverrides
if r.defaultOverrides != nil {
overrides = *r.defaultOverrides
}

// This essentially points the client to use the specified namespace when a namespaced
// object doesn't have the namespace specified. This allows us to interpolate the
// release's namespace as the default namespace on charts with templates that don't
// explicitly set the namespace (e.g. through namespace: {{ .Release.Namespace }}).
overrides.Context.Namespace = namespace

var clientConfig clientcmd.ClientConfig
if r.apiConfig != nil {
clientConfig = clientcmd.NewDefaultClientConfig(*r.apiConfig, &overrides)
} else {
// Use client-go to resolve the final configuration values for the client. Typically these
// values would would reside in the $KUBECONFIG file, but can also be altered in several
// places, including in env variables, client-go default values, and (if we allowed it) CLI
// flags.
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig
clientConfig = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &overrides)
}
kc := newKubeConfig(r.restConfig, clientConfig)
kc := newKubeConfig(r.restConfig, r.kubeconfig)
if err := conf.Init(kc, namespace, r.helmDriver, debug); err != nil {
return nil, err
}
Expand Down Expand Up @@ -355,26 +335,19 @@ func (r *helmReleaseProvider) Check(ctx context.Context, req *pulumirpc.CheckReq
return &pulumirpc.CheckResponse{Inputs: autonamedInputs}, nil
}

func (r *helmReleaseProvider) helmCreate(ctx context.Context, urn resource.URN, news resource.PropertyMap, newRelease *Release) error {
func (r *helmReleaseProvider) helmCreate(ctx context.Context, urn resource.URN, newRelease *Release) error {
conf, err := r.getActionConfig(newRelease.Namespace)
if err != nil {
return err
}
client := action.NewInstall(conf)
logger.V(9).Infof("Looking up chart path options for release: %q", newRelease.Name)
cpo, chartName, err := chartPathOptions(newRelease)
if err != nil {
return err
}

logger.V(9).Infof("getChart: %q settings: %#v, cpo: %+v", chartName, r.settings, cpo)
c, path, err := getChart(chartName, r.settings, cpo)
c, path, err := getChart(r.settings, newRelease)
if err != nil {
logger.V(9).Infof("getChart failed: %+v", err)
return err
}

logger.V(9).Infof("Checking chart dependencies for chart: %q with path: %q", chartName, path)
logger.V(9).Infof("Checking chart dependencies for chart: %q with path: %q", newRelease.Chart, path)
// check and update the chart's dependencies if needed
updated, err := checkChartDependencies(
c,
Expand Down Expand Up @@ -405,7 +378,7 @@ func (r *helmReleaseProvider) helmCreate(ctx context.Context, urn resource.URN,
return err
}

client.ChartPathOptions = *cpo
//client.ChartPathOptions = *cpo // TODO: is this needed?
client.ClientOnly = false
client.DisableHooks = newRelease.DisableWebhooks
client.Wait = !newRelease.SkipAwait
Expand Down Expand Up @@ -467,14 +440,9 @@ func (r *helmReleaseProvider) helmCreate(ctx context.Context, urn resource.URN,
}

func (r *helmReleaseProvider) helmUpdate(ctx context.Context, urn resource.URN, news resource.PropertyMap, newRelease, oldRelease *Release) error {
cpo, chartName, err := chartPathOptions(newRelease)
if err != nil {
return err
}

logger.V(9).Infof("getChart: %q settings: %#v, cpo: %+v", chartName, r.settings, cpo)
logger.V(9).Infof("getChart: %q settings: %#v", newRelease.Chart, r.settings)
// Get Chart metadata, if we fail - we're done
chart, path, err := getChart(chartName, r.settings, cpo)
chart, path, err := getChart(r.settings, newRelease)
if err != nil {
return err
}
Expand All @@ -497,7 +465,7 @@ func (r *helmReleaseProvider) helmUpdate(ctx context.Context, urn resource.URN,
}

if newRelease.Lint {
if err := resourceReleaseValidate(newRelease, news, r.settings, cpo); err != nil {
if err := resourceReleaseValidate(newRelease, r.settings); err != nil {
return err
}
}
Expand All @@ -513,7 +481,7 @@ func (r *helmReleaseProvider) helmUpdate(ctx context.Context, urn resource.URN,
}

client := action.NewUpgrade(actionConfig)
client.ChartPathOptions = *cpo
//client.ChartPathOptions = *cpo // TODO: is this needed?
client.Devel = newRelease.Devel
client.Namespace = newRelease.Namespace
client.Timeout = time.Duration(newRelease.Timeout) * time.Second
Expand Down Expand Up @@ -689,7 +657,7 @@ func (r *helmReleaseProvider) Diff(ctx context.Context, req *pulumirpc.DiffReque
}, nil
}

func resourceReleaseValidate(release *Release, pm resource.PropertyMap, settings *cli.EnvSettings, cpo *action.ChartPathOptions) error {
func resourceReleaseValidate(release *Release, settings *cli.EnvSettings) error {
cpo, name, err := chartPathOptions(release)
if err != nil {
return fmt.Errorf("malformed values: \n\t%s", err)
Expand Down Expand Up @@ -753,7 +721,7 @@ func (r *helmReleaseProvider) Create(ctx context.Context, req *pulumirpc.CreateR
}

if !req.GetPreview() {
if err = r.helmCreate(ctx, urn, news, newRelease); err != nil {
if err = r.helmCreate(ctx, urn, newRelease); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -837,16 +805,11 @@ func (r *helmReleaseProvider) Read(ctx context.Context, req *pulumirpc.ReadReque
return nil, err
}

cpo, chartName, err := chartPathOptions(existingRelease)
if err != nil {
return nil, err
}

logger.V(9).Infof("Trying to get chart: %q, settings: %#v", chartName, r.settings)
logger.V(9).Infof("Trying to get chart: %q, settings: %#v", existingRelease.Chart, r.settings)

// Helm itself doesn't store any information about where the Chart was downloaded from.
// We need the user to ensure the chart is downloadable by using `helm repo add` etc.
_, _, err = getChart(chartName, r.settings, cpo)
_, _, err = getChart(r.settings, existingRelease)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1197,14 +1160,34 @@ func mergeMaps(a, b map[string]interface{}) map[string]interface{} {
return out
}

func getChart(name string, settings *cli.EnvSettings, cpo *action.ChartPathOptions) (*helmchart.Chart, string, error) {
path, err := cpo.LocateChart(name, settings)
if err != nil {
return nil, "", err
func getChart(settings *cli.EnvSettings, newRelease *Release) (*helmchart.Chart, string, error) {
logger.V(9).Infof("Looking up chart path options for release: %q", newRelease.Name)

var path string
if newRelease.RepositoryOpts != nil {
cpo, chartName, err := chartPathOptions(newRelease)
if err != nil {
return nil, "", err
}

path, err = cpo.LocateChart(chartName, settings)
if err != nil {
return nil, "", err
}

logger.V(9).Infof("Trying to load chart: %q from path: %q", chartName, path)
c, err := loader.Load(path)
if err != nil {
return nil, "", err
}

return c, path, nil
}

logger.V(9).Infof("Trying to load chart: %q from path: %q", name, path)
c, err := loader.Load(path)
path = newRelease.Chart

logger.V(9).Infof("Trying to load chart from path: %q", path)
c, err := loader.Load(newRelease.Chart)
if err != nil {
return nil, "", err
}
Expand Down
7 changes: 4 additions & 3 deletions provider/pkg/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,8 @@ func (k *kubeProvider) Configure(_ context.Context, req *pulumirpc.ConfigureRequ
}
}
} else {
// Use client-go to resolve the final configuration values for the client. Typically these
// values would would reside in the $KUBECONFIG file, but can also be altered in several
// Use client-go to resolve the final configuration values for the client. Typically, these
// values would reside in the $KUBECONFIG file, but can also be altered in several
// places, including in env variables, client-go default values, and (if we allowed it) CLI
// flags.
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
Expand Down Expand Up @@ -682,7 +682,8 @@ func (k *kubeProvider) Configure(_ context.Context, req *pulumirpc.ConfigureRequ
k.helmPluginsPath,
k.helmRegistryConfigPath,
k.helmRepositoryConfigPath,
k.helmRepositoryCache)
k.helmRepositoryCache,
k.kubeconfig)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 8330f29

Please sign in to comment.