Merge pull request #191 from phillebaba/feature/git

Add documentation for github commit status

.github/workflows/e2e.yaml

@@ -88,32 +88,41 @@ jobs:
       - name: gotk delete kustomization
         run: |
           ./bin/gotk delete kustomization podinfo --silent
-      - name: gotk delete source git
-        run: |
-          ./bin/gotk delete source git podinfo --silent
       - name: gotk create source helm
         run: |
           ./bin/gotk create source helm podinfo \
             --url https://stefanprodan.github.io/podinfo
-      - name: gotk create helmrelease
+      - name: gotk create helmrelease --source=HelmRepository/podinfo
         run: |
-          ./bin/gotk create hr podinfo \
+          ./bin/gotk create hr podinfo-helm \
             --target-namespace=default \
-            --source=podinfo \
+            --source=HelmRepository/podinfo \
-            --chart-name=podinfo \
+            --chart=podinfo \
             --chart-version=">4.0.0 <5.0.0"
+      - name: gotk create helmrelease --source=GitRepository/podinfo
+        run: |
+          ./bin/gotk create hr podinfo-git \
+            --target-namespace=default \
+            --source=GitRepository/podinfo \
+            --chart=./charts/podinfo
       - name: gotk get helmreleases
         run: |
           ./bin/gotk get helmreleases
       - name: gotk export helmrelease
         run: |
           ./bin/gotk export hr --all
-      - name: gotk delete helmrelease
+      - name: gotk delete helmrelease podinfo-helm
         run: |
-          ./bin/gotk delete hr podinfo --silent
+          ./bin/gotk delete hr podinfo-helm --silent
+      - name: gotk delete helmrelease podinfo-git
+        run: |
+          ./bin/gotk delete hr podinfo-git --silent
       - name: gotk delete source helm
         run: |
           ./bin/gotk delete source helm podinfo --silent
+      - name: gotk delete source git
+        run: |
+          ./bin/gotk delete source git podinfo --silent
       - name: gotk check
         run: |
           ./bin/gotk check

cmd/gotk/create_helmrelease.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"strings"
 
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
@@ -41,28 +42,36 @@ var createHelmReleaseCmd = &cobra.Command{
 	Aliases: []string{"hr"},
 	Short:   "Create or update a HelmRelease resource",
 	Long:    "The helmrelease create command generates a HelmRelease resource for a given HelmRepository source.",
-	Example: `  # Create a HelmRelease from a source
+	Example: `  # Create a HelmRelease from a HelmRepository source
   gotk create hr podinfo \
     --interval=10m \
     --release-name=podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=">4.0.0"
 
+  # Create a HelmRelease from a GitRepository source
+  gotk create hr podinfo \
+    --interval=10m \
+    --release-name=podinfo \
+    --target-namespace=default \
+    --source=GitRepository/podinfo \
+    --chart=./charts/podinfo
+
   # Create a HelmRelease with values for a local YAML file
   gotk create hr podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=4.0.5 \
     --values=./my-values.yaml
 
   # Create a HelmRelease definition on disk without applying it on the cluster
   gotk create hr podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=4.0.5 \
     --values=./values.yaml \
     --export > podinfo-release.yaml
@@ -74,7 +83,7 @@ var (
 	hrName            string
 	hrSource          string
 	hrDependsOn       []string
-	hrChartName       string
+	hrChart           string
 	hrChartVersion    string
 	hrTargetNamespace string
 	hrValuesFile      string
@@ -82,9 +91,9 @@ var (
 
 func init() {
 	createHelmReleaseCmd.Flags().StringVar(&hrName, "release-name", "", "name used for the Helm release, defaults to a composition of '<target-namespace>-<hr-name>'")
-	createHelmReleaseCmd.Flags().StringVar(&hrSource, "source", "", "HelmRepository name")
+	createHelmReleaseCmd.Flags().StringVar(&hrSource, "source", "", "source that contains the chart (<kind>/<name>)")
-	createHelmReleaseCmd.Flags().StringVar(&hrChartName, "chart-name", "", "Helm chart name")
+	createHelmReleaseCmd.Flags().StringVar(&hrChart, "chart", "", "Helm chart name or path")
-	createHelmReleaseCmd.Flags().StringVar(&hrChartVersion, "chart-version", "", "Helm chart version, accepts semver range")
+	createHelmReleaseCmd.Flags().StringVar(&hrChartVersion, "chart-version", "", "Helm chart version, accepts semver range (ignored for charts from GitRepository sources)")
 	createHelmReleaseCmd.Flags().StringArrayVar(&hrDependsOn, "depends-on", nil, "HelmReleases that must be ready before this release can be installed")
 	createHelmReleaseCmd.Flags().StringVar(&hrTargetNamespace, "target-namespace", "", "namespace to install this release, defaults to the HelmRelease namespace")
 	createHelmReleaseCmd.Flags().StringVar(&hrValuesFile, "values", "", "local path to the values.yaml file")
@@ -100,11 +109,16 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 	if hrSource == "" {
 		return fmt.Errorf("source is required")
 	}
-	if hrChartName == "" {
+	hrSourceElements := strings.Split(hrSource, "/")
-		return fmt.Errorf("chart name is required")
+	if len(hrSourceElements) != 2 {
+		return fmt.Errorf("source must be in format <kind>/<name>")
 	}
-	if hrChartVersion == "" {
+	hrSourceKind, hrSourceName := hrSourceElements[0], hrSourceElements[1]
-		return fmt.Errorf("chart version is required")
+	if hrSourceKind != sourcev1.HelmRepositoryKind && hrSourceKind != sourcev1.GitRepositoryKind {
+		return fmt.Errorf("source kind must be one of: %s", []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind})
+	}
+	if hrChart == "" {
+		return fmt.Errorf("chart name or path is required")
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
@@ -132,11 +146,13 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
 			},
 			TargetNamespace: hrTargetNamespace,
 			Chart: helmv2.HelmChartTemplate{
-				Name:    hrChartName,
+				Spec: helmv2.HelmChartTemplateSpec{
-				Version: hrChartVersion,
+					Chart:   hrChart,
-				SourceRef: helmv2.CrossNamespaceObjectReference{
+					Version: hrChartVersion,
-					Kind: sourcev1.HelmRepositoryKind,
+					SourceRef: helmv2.CrossNamespaceObjectReference{
-					Name: hrSource,
+						Kind: hrSourceKind,
+						Name: hrSourceName,
+					},
 				},
 			},
 			Suspend: false,

cmd/gotk/reconcile_helmrelease.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"time"
 
+	sourcev1 "github.com/fluxcd/source-controller/api/v1alpha1"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -81,7 +82,12 @@ func reconcileHrCmdRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if syncHrWithSource {
-		err := syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.SourceRef.Name})
+		switch helmRelease.Spec.Chart.Spec.SourceRef.Kind {
+		case sourcev1.HelmRepositoryKind:
+			err = syncSourceHelmCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name})
+		case sourcev1.GitRepositoryKind:
+			err = syncSourceGitCmdRun(nil, []string{helmRelease.Spec.Chart.Spec.SourceRef.Name})
+		}
 		if err != nil {
 			return err
 		}

docs/cmd/gotk_create_helmrelease.md

@@ -13,28 +13,36 @@ gotk create helmrelease [name] [flags]
 ### Examples
 
 ```
-  # Create a HelmRelease from a source
+  # Create a HelmRelease from a HelmRepository source
   gotk create hr podinfo \
     --interval=10m \
     --release-name=podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=">4.0.0"
 
+  # Create a HelmRelease from a GitRepository source
+  gotk create hr podinfo \
+    --interval=10m \
+    --release-name=podinfo \
+    --target-namespace=default \
+    --source=GitRepository/podinfo \
+    --chart=./charts/podinfo
+
   # Create a HelmRelease with values for a local YAML file
   gotk create hr podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=4.0.5 \
     --values=./my-values.yaml
 
   # Create a HelmRelease definition on disk without applying it on the cluster
   gotk create hr podinfo \
     --target-namespace=default \
-    --source=podinfo \
+    --source=HelmRepository/podinfo \
-    --chart-name=podinfo \
+    --chart=podinfo \
     --chart-version=4.0.5 \
     --values=./values.yaml \
     --export > podinfo-release.yaml
@@ -44,12 +52,12 @@ gotk create helmrelease [name] [flags]
 ### Options
 
 ```
-      --chart-name string         Helm chart name
+      --chart string              Helm chart name or path
-      --chart-version string      Helm chart version, accepts semver range
+      --chart-version string      Helm chart version, accepts semver range (ignored for charts from GitRepository sources)
       --depends-on stringArray    HelmReleases that must be ready before this release can be installed
   -h, --help                      help for helmrelease
       --release-name string       name used for the Helm release, defaults to a composition of '<target-namespace>-<hr-name>'
-      --source string             HelmRepository name
+      --source string             source that contains the chart (<kind>/<name>)
       --target-namespace string   namespace to install this release, defaults to the HelmRelease namespace
       --values string             local path to the values.yaml file
 ```

docs/components/helm/controller.md

@@ -6,18 +6,20 @@ releases with Kubernetes manifests.
 ![](../../_files/helm-controller.png)
 
 The desired state of a Helm release is described through a Kubernetes Custom Resource named `HelmRelease`.
-Based on the creation, mutation or removal of a HelmRelease resource in the cluster,
+Based on the creation, mutation or removal of a `HelmRelease` resource in the cluster,
 Helm actions are performed by the controller.
 
 Features:
 
 - Watches for `HelmRelease` objects and generates `HelmChart` objects
+- Supports `HelmChart` artifacts produced from `HelmRepository` and `GitRepository` sources
 - Fetches artifacts produced by [source-controller](../source/controller.md) from `HelmChart` objects
-- Watches `HelmChart` objects for revision changes (semver ranges)
+- Watches `HelmChart` objects for revision changes (including semver ranges for charts from `HelmRepository` sources)
-- Performs Helm v3 actions including Helm tests as configured in the `HelmRelease` objects
+- Performs automated Helm actions, including Helm tests, rollbacks and uninstalls
-- Runs Helm install/upgrade in a specific order, taking into account the depends-on relationship
+- Offers extensive configuration options for automated remediation (rollback, uninstall, retry) on failed Helm install, upgrade or test actions
+- Runs Helm install/upgrade in a specific order, taking into account the depends-on relationship defined in a set of `HelmRelease` objects
 - Prunes Helm releases removed from cluster (garbage collection) 
-- Reports Helm releases status (alerting provided by [notification-controller](../notification/controller.md))
+- Reports Helm releases statuses (alerting provided by [notification-controller](../notification/controller.md))
 
 Links:
 

docs/faq/index.md

@@ -55,12 +55,14 @@ Support for custom commands and generators executed by fluxd in a POSIX shell |
 
 Flux v1                            | Toolkit component driven "Flux v2"
 ---------------------------------- | ----------------------------------
-Declarative config in a single Helm custom resource | Declarative config through `HelmRepository`, `HelmChart` and `HelmRelease` custom resources
+Declarative config in a single Helm custom resource | Declarative config through `HelmRepository`, `GitRepository`, `HelmChart` and `HelmRelease` custom resources
 Chart synchronisation embedded in the operator | Extensive release configuration options, and a reconciliation interval per source
 Support for fixed SemVer versions from Helm repositories | Support for SemVer ranges for `HelmChart` resources
 Git repository synchronisation on a global interval | Planned support for charts from GitRepository sources
 Limited observability via the status object of the HelmRelease resource | Better observability via the HelmRelease status object, Kubernetes events, and notifications
 Resource heavy, relatively slow | Better performance
+Chart changes from Git sources are determined from Git metadata | Chart changes must be accompanied by a version bump in `Chart.yaml` to produce a new artifact
+Chart dependencies for charts from Git sources are downloaded by the operator | Chart dependencies must be committed to Git
 
 #### Notifications, webhooks, observability
 

docs/guides/helmreleases.md

@@ -4,7 +4,7 @@ The [helm-controller](../components/helm/controller.md) allows you to
 declaratively manage Helm chart releases with Kubernetes manifests.
 It makes use of the artifacts produced by the
 [source-controller](../components/source/controller.md) from
-`HelmRepository` and `HelmChart` resources.
+`HelmRepository`, `GitRepository`, and `HelmChart` resources.
 The helm-controller is part of the default toolkit installation.
 
 ## Prerequisites
@@ -63,25 +63,26 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
+    spec:
-    version: '^4.0.0'
+      chart: podinfo
-    sourceRef:
+      version: '4.0.x'
-      kind: HelmRepository
+      sourceRef:
-      name: podinfo
+        kind: HelmRepository
-      namespace: gitops-system
+        name: podinfo
-    interval: 1m
+        namespace: gitops-system
+      interval: 1m
   values:
     replicaCount: 2
 ```
 
-The `chart.name` is the name of the chart as made available by the Helm
+The `chart.spec.chart` is the name of the chart as made available by
-repository, and may not include any aliases.
+the Helm repository, and may not include any aliases.
 
-The `chart.version` can be a fixed semver, or any semver range (i.e.
+The `chart.spec.version` can be a fixed semver, or any semver range
-`>=4.0.0 <4.0.2`).
+(i.e. `>=4.0.0 <5.0.0`).
 
-The `chart` values are used by the helm-controller as a template to
+The `chart.spec` values are used by the helm-controller as a template
-create a new `HelmChart` resource in the same namespace as the
+to create a new `HelmChart` resource in the same namespace as the
 `sourceRef`. The source-controller will then lookup the chart in the
 artifact of the referenced `HelmRepository`, fetch the chart, and make
 it available as a `HelmChart` artifact to be used by the

docs/guides/notifications.md

@@ -3,12 +3,12 @@
 When operating a cluster, different teams may wish to receive notifications about
 the status of their GitOps pipelines.
 For example, the on-call team would receive alerts about reconciliation
-failures in the cluster, while the dev team may wish to be alerted when a new version 
+failures in the cluster, while the dev team may wish to be alerted when a new version
 of an app was deployed and if the deployment is healthy.
 
 ## Prerequisites
 
-To follow this guide you'll need a Kubernetes cluster with the GitOps 
+To follow this guide you'll need a Kubernetes cluster with the GitOps
 toolkit controllers installed on it.
 Please see the [get started guide](../get-started/index.md)
 or the [installation guide](installation.md).
@@ -48,8 +48,8 @@ spec:
 The provider type can be `slack`, `msteams`, `discord`, `rocket` or `generic`.
 
 When type `generic` is specified, the notification controller will post the incoming
-[event](../components/notification/event.md) in JSON format to the webhook address. 
+[event](../components/notification/event.md) in JSON format to the webhook address.
-This way you can create custom handlers that can store the events in 
+This way you can create custom handlers that can store the events in
 Elasticsearch, CloudWatch, Stackdriver, etc.
 
 ## Define an alert
@@ -63,7 +63,7 @@ metadata:
   name: on-call-webapp
   namespace: gitops-system
 spec:
-  providerRef: 
+  providerRef:
     name: slack
   eventSeverity: info
   eventSources:
@@ -102,3 +102,58 @@ When the verbosity is set to `info`, the controller will alert if:
 * an error occurs
 
 ![info alert](../diagrams/slack-info-alert.png)
+
+## GitHub commit status
+
+The GitHub provider is a special kind of notification provider that based on the
+state of a Kustomization resource, will update the
+[commit status](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-status-checks) for the currently reconciled commit id.
+
+The resulting status will contain information from the event in the format `{{ .Kind }}/{{ .Name }} - {{ .Reason }}`.
+![github commit status](../diagrams/github-commit-status.png)
+
+It is important to note that the referenced provider needs to refer to the
+same GitHub repository as the Kustomization originates from. If these do
+not match the notification will fail as the commit id will not be present.
+
+```yaml
+apiVersion: notification.toolkit.fluxcd.io/v1alpha1
+kind: Provider
+metadata:
+  name: podinfo
+  namespace: gitops-system
+spec:
+  type: github
+  channel: general
+  address: https://github.com/stefanprodan/podinfo
+  secretRef:
+    name: github
+---
+apiVersion: notification.toolkit.fluxcd.io/v1alpha1
+kind: Alert
+metadata:
+  name: podinfo
+  namespace: gitops-system
+spec:
+  providerRef:
+    name: podinfo
+  eventSeverity: info
+  eventSources:
+    - kind: Kustomization
+      name: podinfo
+      namespace: gitops-system
+```
+
+The secret referenced in the provider is expected to contain a [personal access token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token)
+to authenticate with the GitHub API.
+```yaml
+apiVersion: v1
+kind: Secret
+metadata:
+  name: github
+  namespace: gitops-system
+data:
+  token: <token>
+```
+
+

docs/guides/sealed-secrets.md

@@ -136,11 +136,12 @@ metadata:
   namespace: gitops-system
 spec:
   chart:
-    name: sealed-secrets
+    spec:
-    sourceRef:
+      chart: sealed-secrets
-      kind: HelmRepository
+      sourceRef:
-      name: stable
+        kind: HelmRepository
-    version: "^1.10.0"
+        name: stable
+      version: "1.10.x"
   interval: 1h0m0s
   releaseName: sealed-secrets
   targetNamespace: gitops-system

docs/roadmap/index.md

@@ -1,16 +1,18 @@
 # Roadmap
 
-!!! hint "Work in Progress"
+In our planning discussions for the GitOps Toolkit we identified largely three areas of work:
-    We will be building the roadmap together with the Flux community,
+
-    our end-users and everyone who is interested in integrating with us.
+- Feature parity with Flux v1 in read-only mode
-    So a lot of this is still TBD - read this as our shopping list of
+- Feature parity with the image-update functionality in Flux v1
-    ideas after some brainstorming as Flux maintainers.
+- Feature parity with Helm Operator v1
+
+All of the above will constitute "Flux v2".
 
 ## The road to Flux v2
 
 ### Flux read-only feature parity
 
-[= 80% "80%"]
+[= 90% "90%"]
 
 This would be the first stepping stone: we want the GitOps Toolkit to be on-par with today's Flux in
 [read-only mode](https://github.com/fluxcd/flux/blob/master/docs/faq.md#can-i-run-flux-with-readonly-git-access)
@@ -38,7 +40,7 @@ Tasks
 - [ ]  Review the git source and kustomize APIs
 - [ ]  Implement the migration command in gotk
 - [ ]  Create a migration guide for `flux.yaml` kustomize users
-- [ ]  Include [support for SOPS](https://github.com/fluxcd/toolkit/discussions/156)
+- [x]  <span style="color:grey">Include support for SOPS</span>
 
 ### Flux image update feature parity
 
@@ -65,7 +67,7 @@ Tasks
 
 ### Helm v3 feature parity
 
-[= 70% "70%"]
+[= 90% "90%"]
 
 Goals
 
@@ -87,7 +89,7 @@ Tasks
 - [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)
+- [x]  <span style="color:grey">Implement conditional remediation on (failed) Helm actions</span>
-- [ ]  [Implement support for Helm charts from Git](https://github.com/fluxcd/source-controller/issues/56)
+- [x]  <span style="color:grey">Implement support for Helm charts from Git</span>
 - [ ]  [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,12 +4,12 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/fluxcd/helm-controller/api v0.0.5
+	github.com/fluxcd/helm-controller/api v0.0.6
 	github.com/fluxcd/kustomize-controller/api v0.0.8
 	github.com/fluxcd/pkg/git v0.0.6
 	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/fluxcd/source-controller/api v0.0.13
 	github.com/manifoldco/promptui v0.7.0
 	github.com/spf13/cobra v1.0.0
 	golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
@@ -17,11 +17,11 @@ require (
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
-	k8s.io/api v0.18.4
+	k8s.io/api v0.18.8
-	k8s.io/apiextensions-apiserver v0.18.4
+	k8s.io/apiextensions-apiserver v0.18.8
-	k8s.io/apimachinery v0.18.4
+	k8s.io/apimachinery v0.18.8
-	k8s.io/client-go v0.18.4
+	k8s.io/client-go v0.18.8
-	sigs.k8s.io/controller-runtime v0.6.1
+	sigs.k8s.io/controller-runtime v0.6.2
 	sigs.k8s.io/kustomize/api v0.5.1
 	sigs.k8s.io/yaml v1.2.0
 )

go.sum

@@ -106,12 +106,13 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 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.5 h1:rB4IycwXjeN6h3te7WFW5XDJ0oP59fV+RiM6/TJucjM=
+github.com/fluxcd/helm-controller/api v0.0.6 h1:EpP1/cYClFrZqaw4B2mZ/qxTSDmvxJxj+VYZZR1XaTI=
-github.com/fluxcd/helm-controller/api v0.0.5/go.mod h1:YCQhNz7LkYyBGxDdMGSRK78nvhuHV2x/lrn2vuRlBNE=
+github.com/fluxcd/helm-controller/api v0.0.6/go.mod h1:KlzwTkpphQxulgWBwCl/uxfBU0QxK/X+w4YcJqGy/1c=
 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.6 h1:4qktw8M3zj98MAs4ny6qSi36sYvTiI1czif5FqlQl4o=
@@ -120,8 +121,8 @@ github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A=
 github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs=
 github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk=
 github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw=
-github.com/fluxcd/source-controller/api v0.0.10 h1:j4ldVKx/ACq5eP98at71DzD9wSNqCE2018skIdkaamE=
+github.com/fluxcd/source-controller/api v0.0.13 h1:rf0uZ20OAN+yJVs0uHJUhw3n3ci9ZyjaLqt5Jt/5K9A=
-github.com/fluxcd/source-controller/api v0.0.10/go.mod h1:Q0bjU4/O1C4FoQT/O2YgGtJnoRWtrw4R/MowywCaDNg=
+github.com/fluxcd/source-controller/api v0.0.13/go.mod h1:PUe+EYQ/s+KPnz2iOCgdf+L6clM0SWkyvdXIpbfpkQE=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -727,17 +728,35 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 k8s.io/api v0.17.0/go.mod h1:npsyOePkeP0CPwyGfXDHxvypiYMJxBWAMpQxCaJ4ZxI=
 k8s.io/api v0.18.4 h1:8x49nBRxuXGUlDlwlWd3RMY1SayZrzFfxea3UZSkFw4=
 k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
+k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
+k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4=
+k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY=
 k8s.io/apiextensions-apiserver v0.18.4 h1:Y3HGERmS8t9u12YNUFoOISqefaoGRuTc43AYCLzWmWE=
 k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio=
+k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M=
+k8s.io/apiextensions-apiserver v0.18.8 h1:pkqYPKTHa0/3lYwH7201RpF9eFm0lmZDFBNzhN+k/sA=
+k8s.io/apiextensions-apiserver v0.18.8/go.mod h1:7f4ySEkkvifIr4+BRrRWriKKIJjPyg9mb/p63dJKnlM=
 k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
 k8s.io/apimachinery v0.18.4 h1:ST2beySjhqwJoIFk6p7Hp5v5O0hYY6Gngq/gUYXTPIA=
 k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
+k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
+k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0=
+k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
 k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8=
+k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg=
+k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM=
 k8s.io/client-go v0.17.0/go.mod h1:TYgR6EUHs6k45hb6KWjVD6jFZvJV4gHDikv/It0xz+k=
 k8s.io/client-go v0.18.4 h1:un55V1Q/B3JO3A76eS0kUSywgGK/WR3BQ8fHQjNa6Zc=
 k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g=
+k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
+k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM=
+k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
 k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
+k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
+k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk=
+k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=
+k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@@ -759,6 +778,8 @@ mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZI
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
 sigs.k8s.io/controller-runtime v0.6.1 h1:LcK2+nk0kmaOnKGN+vBcWHqY5WDJNJNB/c5pW+sU8fc=
 sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A=
+sigs.k8s.io/controller-runtime v0.6.2 h1:jkAnfdTYBpFwlmBn3pS5HFO06SfxvnTZ1p5PeEF/zAA=
+sigs.k8s.io/controller-runtime v0.6.2/go.mod h1:vhcq/rlnENJ09SIRp3EveTaZ0yqH526hjf9iJdbUJ/E=
 sigs.k8s.io/kustomize/api v0.5.1 h1:iHGTs5LcnJGqHstUSxWD/kX6XZgmd82x79LLlZwDU0I=
 sigs.k8s.io/kustomize/api v0.5.1/go.mod h1:LGqJ9ZWOnWDqlECqrFgNUyEqSJc6ooA9ZiWZ4KFZv+I=
 sigs.k8s.io/kustomize/kyaml v0.4.1 h1:NEqA/35upoAjb+I5vh1ODUqxoX4DOrezeQa9BhhG5Co=

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

manifests/bases/notification-controller/kustomization.yaml

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

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.10
+- github.com/fluxcd/source-controller/config//crd?ref=v0.0.13
-- github.com/fluxcd/source-controller/config//manager?ref=v0.0.10
+- github.com/fluxcd/source-controller/config//manager?ref=v0.0.13
 patchesJson6902:
 - target:
     group: apps