Merge pull request #168 from fluxcd/update-helm-roadmap

Update helm-controller roadmap

.github/workflows/docs.yaml

@@ -16,7 +16,7 @@ jobs:
         env:
           SOURCE_VER: ${{ 'v0.0.10' }}
           KUSTOMIZE_VER: ${{ 'v0.0.8' }}
-          HELM_VER: ${{ 'v0.0.3' }}
+          HELM_VER: ${{ 'v0.0.4' }}
           NOTIFICATION_VER: ${{ 'v0.0.7' }}
         run: |
           # source-controller CRDs

docs/guides/helmreleases.md

@@ -87,7 +87,7 @@ artifact of the referenced `HelmRepository`, fetch the chart, and make
 it available as a `HelmChart` artifact to be used by the
 helm-controller.
 
-!!! Note
+!!! hint "Advanced configuration"
     The `HelmRelease` offers an extensive set of configurable flags
     for finer grain control over how Helm actions are performed.
     See the [`HelmRelease` CRD docs](../components/helm/helmreleases.md)
@@ -106,9 +106,11 @@ spec:
   valuesFrom:
   - kind: ConfigMap
     name: prod-env-values
+    valuesKey: values-prod.yaml
   - kind: Secret
-    name: prod-secret-values
-    valuesKey: secret.yaml
+    name: prod-tls-values
+    valuesKey: crt
+    targetPath: tls.crt
 ```
 
 The definition of the listed keys is as follows:
@@ -116,8 +118,20 @@ The definition of the listed keys is as follows:
 - `kind`: Kind of the values referent (`ConfigMap` or `Secret`).
 - `name`: Name of the values referent, in the same namespace as the
   `HelmRelease`.
-- `valuesKey` _(Optional)_: The key in the referent the values can be
-  found at. Defaults to `values.yaml` when ommitted.
+- `valuesKey` _(Optional)_: The data key where the values.yaml or a
+   specific value can be found. Defaults to `values.yaml` when omitted.
+- `targetPath` _(Optional)_: The YAML dot notation path at which the
+   value should be merged. When set, the `valuesKey` is expected to be
+   a single flat value. Defaults to `None` when omitted, which results
+   in the values getting merged at the root.
+
+!!! hint "Note"
+    The `targetPath` supports the same formatting as you would supply
+    as an argument to the `helm` binary using `--set [path]=[value]`.
+    In addition to this, the referred value can contain the same
+    value formats (e.g. `{a,b,c}` for a list).
+    You can read more about the available formats and limitations in
+    the [Helm documentation](https://helm.sh/docs/intro/using_helm/#the-format-and-limitations-of---set).
 
 ## Configure notifications
 

docs/roadmap/index.md

@@ -65,28 +65,29 @@ Tasks
 
 ### Helm v3 feature parity
 
-[= 50% "50%"]
+[= 70% "70%"]
 
 Goals
 
--  Offer a migration guide for those that are using Helm Operator with Helm v3 and Helm repositories
+-  Offer a migration guide for those that are using Helm Operator with Helm v3 and charts from
+   Helm and Git repositories
 
 Non-Goals
 
 -  Migrate users that are using Helm v2
 
-Stretch-Goals
-
--  [Migrate users that are using Helm charts from Git](https://github.com/fluxcd/toolkit/discussions/75#discussioncomment-38589)
-
 Tasks
 
 - [x]  <span style="color:grey">Implement a Helm controller for Helm v3 covering all the current release options</span>
-- [ ]  Discuss and design Helm releases based on source API:
-    * [ ]  [Providing values from sources](https://github.com/fluxcd/toolkit/discussions/100)
-    * [ ]  [Conditional remediation on failed Helm actions](https://github.com/fluxcd/toolkit/discussions/102)
-    * [ ]  [Support running Helm test actions on an interval](https://github.com/fluxcd/toolkit/discussions/103)
+- [x]  <span style="color:grey">Discuss and design Helm releases based on source API:</span>
+    * [x]  <span style="color:grey">Providing values from sources</span>
+    * [x]  <span style="color:grey">Conditional remediation on failed Helm actions</span>
+    * [x]  <span style="color:grey">Support for Helm charts from Git</span>
 - [x]  <span style="color:grey">Review the Helm release, chart and repository APIs</span>
 - [x]  <span style="color:grey">Implement events in Helm controller</span>
 - [x]  <span style="color:grey">Implement Prometheus metrics in Helm controller</span>
+- [x]  <span style="color:grey">Implement support for values from `Secret` and `ConfigMap` resources</span>
+- [ ]  [Implement conditional remediation on (failed) Helm actions](https://github.com/fluxcd/helm-controller/issues/41)
+- [ ]  [Implement support for Helm charts from Git](https://github.com/fluxcd/source-controller/issues/56)
+- [ ]  [Implement support for referring to an alternative chart values file](https://github.com/fluxcd/helm-controller/issues/4)
 - [ ]  Create a migration guide for Helm Operator users

go.mod

@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/fluxcd/helm-controller/api v0.0.3
+	github.com/fluxcd/helm-controller/api v0.0.4
 	github.com/fluxcd/kustomize-controller/api v0.0.8
 	github.com/fluxcd/pkg/git v0.0.5
 	github.com/fluxcd/pkg/ssh v0.0.5

go.sum

@@ -110,8 +110,8 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
 github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fluxcd/helm-controller/api v0.0.3 h1:W3/XAKjd6QOu6NG1KXsDXFlgEAukygLK8fhrAshtoyY=
-github.com/fluxcd/helm-controller/api v0.0.3/go.mod h1:YCQhNz7LkYyBGxDdMGSRK78nvhuHV2x/lrn2vuRlBNE=
+github.com/fluxcd/helm-controller/api v0.0.4 h1:ZV+VGQg8ch3icvIl/BJZDfGwV61a2jRlB2B0jLmyMCA=
+github.com/fluxcd/helm-controller/api v0.0.4/go.mod h1:YCQhNz7LkYyBGxDdMGSRK78nvhuHV2x/lrn2vuRlBNE=
 github.com/fluxcd/kustomize-controller/api v0.0.8 h1:Yi5/MZuS2jXiRV73fuUkBCyRTuG0yx2HJTpWZaM+WHA=
 github.com/fluxcd/kustomize-controller/api v0.0.8/go.mod h1:c4035rZrt2p3RExpLe64ASVEvePm7FjiY4PzHKpRJXI=
 github.com/fluxcd/pkg/git v0.0.5 h1:6ahtjxZid8r94jmfOf1JUO42jX98FgdzBHrOaTGMCqY=

manifests/bases/helm-controller/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.3
-- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.3
+- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.4
+- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.4
 patchesJson6902:
 - target:
     group: apps