Skip to content

Commit

Permalink
fix: address PR comments (TBS)
Browse files Browse the repository at this point in the history
  • Loading branch information
edvald committed Aug 19, 2019
1 parent 68f87f3 commit 12c7ae5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/using-garden/using-helm-charts.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ values:
key: some-value
```

This will effectively create a new YAML with the supplies values and pass it to Helm when rendering/deploying the chart. This is particularly handy when you want to template in the values (see the next section for a good example).
This will effectively create a new YAML with the supplied values and pass it to Helm when rendering/deploying the chart. This is particularly handy when you want to template in the values (see the next section for a good example).

You can also provide you own value files, which will work much the same way. You just need to list the paths to them (relative to the module root, i.e. the directory containing the `garden.yml` file) and they will be supplied to Helm when rendering/deploying. For example:

Expand Down Expand Up @@ -151,9 +151,9 @@ some:
key: prod-value
```

In this example, `some.key` is set to `"prod-value"` for the `prod` environment, and `other.key` keep the default value set in `values.default.yaml`.
In this example, `some.key` is set to `"prod-value"` for the `prod` environment, and `other.key` maintains the default value set in `values.default.yaml`.

If you were to also set the `values` field in the Module configuration, the values there would take precedence over both of the value files.
If you also set the `values` field in the Module configuration, the values there take precedence over both of the value files.

## Linking container modules and Helm modules

Expand Down
2 changes: 2 additions & 0 deletions garden-service/src/plugins/kubernetes/helm/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ export async function getValueFileArgs(module: HelmModule) {
const chartPath = await getChartPath(module)
const gardenValuesPath = getGardenValuesPath(chartPath)

// The garden-values.yml file (which is created from the `values` field in the module config) takes precedence,
// so it's added to the end of the list.
const valueFiles = module.spec.valueFiles
.map(f => resolve(module.buildPath, f))
.concat([gardenValuesPath])
Expand Down

0 comments on commit 12c7ae5

Please sign in to comment.