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

Update helm-controller roadmap

.github/workflows/docs.yaml

@@ -14,10 +14,10 @@ jobs:
         uses: actions/checkout@v1
       - name: Copy assets
         env:
-          SOURCE_VER: ${{ 'v0.0.8' }}
+          SOURCE_VER: ${{ 'v0.0.10' }}
-          KUSTOMIZE_VER: ${{ 'v0.0.7' }}
+          KUSTOMIZE_VER: ${{ 'v0.0.8' }}
-          HELM_VER: ${{ 'v0.0.2' }}
+          HELM_VER: ${{ 'v0.0.4' }}
-          NOTIFICATION_VER: ${{ 'v0.0.6' }}
+          NOTIFICATION_VER: ${{ 'v0.0.7' }}
         run: |
           # source-controller CRDs
           curl "https://raw.githubusercontent.com/fluxcd/source-controller/$SOURCE_VER/docs/api/source.md" > docs/components/source/api.md

cmd/tk/create_kustomization.go

@@ -113,14 +113,6 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("path must begin with ./")
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	if !export {
 		logger.Generatef("generating kustomization")
 	}
@@ -190,6 +182,14 @@ func createKsCmdRun(cmd *cobra.Command, args []string) error {
 		return exportKs(kustomization)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	logger.Actionf("applying kustomization")
 	if err := upsertKustomization(ctx, kubeClient, kustomization); err != nil {
 		return err

cmd/tk/create_source_git.go

@@ -129,14 +129,6 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("git URL parse failed: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	gitRepository := sourcev1.GitRepository{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -163,6 +155,14 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
 		return exportGit(gitRepository)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	withAuth := false
 	// TODO(hidde): move all auth prep to separate func?
 	if u.Scheme == "ssh" {

cmd/tk/create_source_helm.go

@@ -101,14 +101,6 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("url parse failed: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	kubeClient, err := utils.kubeClient(kubeconfig)
-	if err != nil {
-		return err
-	}
-
 	helmRepository := sourcev1.HelmRepository{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -126,6 +118,14 @@ func createSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
 		return exportHelmRepository(helmRepository)
 	}
 
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	kubeClient, err := utils.kubeClient(kubeconfig)
+	if err != nil {
+		return err
+	}
+
 	logger.Generatef("generating source")
 
 	secret := corev1.Secret{

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
+    name: prod-tls-values
-    valuesKey: secret.yaml
+    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
+- `valuesKey` _(Optional)_: The data key where the values.yaml or a
-  found at. Defaults to `values.yaml` when ommitted.
+   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

@@ -38,6 +38,7 @@ Tasks
 - [ ]  Review the git source and kustomize APIs
 - [ ]  Implement the migration command in tk
 - [ ]  Create a migration guide for `flux.yaml` kustomize users
+- [ ]  Include [support for SOPS](https://github.com/fluxcd/toolkit/discussions/156)
 
 ### Flux image update feature parity
 
@@ -64,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:
+- [x]  <span style="color:grey">Discuss and design Helm releases based on source API:</span>
-    * [ ]  [Providing values from sources](https://github.com/fluxcd/toolkit/discussions/100)
+    * [x]  <span style="color:grey">Providing values from sources</span>
-    * [ ]  [Conditional remediation on failed Helm actions](https://github.com/fluxcd/toolkit/discussions/102)
+    * [x]  <span style="color:grey">Conditional remediation on failed Helm actions</span>
-    * [ ]  [Support running Helm test actions on an interval](https://github.com/fluxcd/toolkit/discussions/103)
+    * [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,10 +4,12 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/fluxcd/helm-controller v0.0.2
+	github.com/fluxcd/helm-controller/api v0.0.4
-	github.com/fluxcd/kustomize-controller v0.0.7
+	github.com/fluxcd/kustomize-controller/api v0.0.8
-	github.com/fluxcd/pkg v0.0.3
+	github.com/fluxcd/pkg/git v0.0.5
-	github.com/fluxcd/source-controller v0.0.8
+	github.com/fluxcd/pkg/ssh v0.0.5
+	github.com/fluxcd/pkg/untar v0.0.5
+	github.com/fluxcd/source-controller/api v0.0.10
 	github.com/manifoldco/promptui v0.7.0
 	github.com/spf13/cobra v1.0.0
 	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
@@ -23,6 +25,3 @@ require (
 	sigs.k8s.io/kustomize/api v0.5.1
 	sigs.k8s.io/yaml v1.2.0
 )
-
-// fix AKS auth
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.0.1+incompatible

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.2
+- github.com/fluxcd/helm-controller/config//crd?ref=v0.0.4
-- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.2
+- github.com/fluxcd/helm-controller/config//manager?ref=v0.0.4
 patchesJson6902:
 - target:
     group: apps

manifests/bases/kustomize-controller/kustomization.yaml

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

manifests/bases/source-controller/kustomization.yaml

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