From e7051201458c5bb9369401b94058e50744cf05cf Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 21 Jun 2019 13:26:43 +0200
Subject: [PATCH 001/158] List --registry-use-labels flag in daemon docs

---
 site/daemon.md | 95 +++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/site/daemon.md b/site/daemon.md
index 968b9d5c4..fdf67137d 100644
--- a/site/daemon.md
+++ b/site/daemon.md
@@ -42,58 +42,59 @@ document.
 
 fluxd requires setup and offers customization though a multitude of flags.
 
-| Flag                                             | Default                  | Purpose
-| ------------------------------------------------ | ------------------------ | ---
-| --listen -l                                      | `:3030`                  | listen address where /metrics and API will be served
-| --listen-metrics                                 |                          | listen address for /metrics endpoint
-| --kubernetes-kubectl                             |                          | optional, explicit path to kubectl tool
-| --version                                        | false                    | output the version number and exit
+| Flag                                             | Default                            | Purpose
+| ------------------------------------------------ | ---------------------------------- | ---
+| --listen -l                                      | `:3030`                            | listen address where /metrics and API will be served
+| --listen-metrics                                 |                                    | listen address for /metrics endpoint
+| --kubernetes-kubectl                             |                                    | optional, explicit path to kubectl tool
+| --version                                        | false                              | output the version number and exit
 | **Git repo & key etc.**
-| --git-url                                        |                          | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
-| --git-branch                                     | `master`                 | branch of git repo to use for Kubernetes manifests
-| --git-ci-skip                                    | false                    | when set, fluxd will append `\n\n[ci skip]` to its commit messages
-| --git-ci-skip-message                            | `""`                     | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
-| --git-path                                       |                          | path within git repo to locate Kubernetes manifests (relative path)
-| --git-user                                       | `Weave Flux`             | username to use as git committer
-| --git-email                                      | `support@weave.works`    | email to use as git committer
-| --git-set-author                                 | false                    | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
-| --git-gpg-key-import                             |                          | if set, fluxd will attempt to import the gpg key(s) found on the given path
-| --git-signing-key                                |                          | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key. See [Git commit signing](git-commit-signing.md) to learn how to use this feature
-| --git-label                                      |                          | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
-| --git-sync-tag                                   | `flux-sync`              | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
-| --git-notes-ref                                  | `flux`                   | ref to use for keeping commit annotations in git notes
-| --git-poll-interval                              | `5m`                     | period at which to fetch any new commits from the git repo
-| --git-timeout                                    | `20s`                    | duration after which git operations time out
-| --git-secret                                     | false                    | if set, git-secret will be run on every git checkout. A gpg key must be imported using  --git-gpg-key-import or by mounting a keyring containing it directly
+| --git-url                                        |                                    | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
+| --git-branch                                     | `master`                           | branch of git repo to use for Kubernetes manifests
+| --git-ci-skip                                    | false                              | when set, fluxd will append `\n\n[ci skip]` to its commit messages
+| --git-ci-skip-message                            | `""`                               | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
+| --git-path                                       |                                    | path within git repo to locate Kubernetes manifests (relative path)
+| --git-user                                       | `Weave Flux`                       | username to use as git committer
+| --git-email                                      | `support@weave.works`              | email to use as git committer
+| --git-set-author                                 | false                              | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
+| --git-gpg-key-import                             |                                    | if set, fluxd will attempt to import the gpg key(s) found on the given path
+| --git-signing-key                                |                                    | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key. See [Git commit signing](git-commit-signing.md) to learn how to use this feature
+| --git-label                                      |                                    | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
+| --git-sync-tag                                   | `flux-sync`                        | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
+| --git-notes-ref                                  | `flux`                             | ref to use for keeping commit annotations in git notes
+| --git-poll-interval                              | `5m`                               | period at which to fetch any new commits from the git repo
+| --git-timeout                                    | `20s`                              | duration after which git operations time out
+| --git-secret                                     | false                              | if set, git-secret will be run on every git checkout. A gpg key must be imported using  --git-gpg-key-import or by mounting a keyring containing it directly
 | **syncing:** control over how config is applied to the cluster
-| --sync-interval                                  | `5m`                     | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
-| --sync-garbage-collection                        | `false`                  | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
+| --sync-interval                                  | `5m`                               | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
+| --sync-garbage-collection                        | `false`                            | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
 | **registry cache:** (none of these need overriding, usually)
-| --memcached-hostname                             | `memcached`              | hostname for memcached service to use for caching image metadata
-| --memcached-timeout                              | `1s`                     | maximum time to wait before giving up on memcached requests
-| --memcached-service                              | `memcached`              | SRV service used to discover memcache servers
-| --registry-cache-expiry                          | `1h`                     | Duration to keep cached registry tag info. Must be < 1 month.
-| --registry-poll-interval                         | `5m`                     | period at which to poll registry for new images
-| --registry-rps                                   | `200`                    | maximum registry requests per second per host
-| --registry-burst                                 | `125`                    | maximum number of warmer connections to remote and memcache
-| --registry-insecure-host                         | []                       | registry hosts to use HTTP for (instead of HTTPS)
-| --registry-exclude-image                         | `["k8s.gcr.io/*"]`       | do not scan images that match these glob expressions
-| --docker-config                                  | `""`                     | path to a Docker config file with default image registry credentials
-| --registry-ecr-region                            | `[]`                     | Allow these AWS regions when scanning images from ECR (multiple values allowed); defaults to the detected cluster region
-| --registry-ecr-include-id                        | `[]`                     | Include these AWS account ID(s) when scanning images in ECR (multiple values allowed); empty means allow all, unless excluded
-| --registry-ecr-exclude-id                        | `[<EKS SYSTEM ACCOUNT>]` | Exclude these AWS account ID(s) when scanning ECR (multiple values allowed); defaults to the EKS system account, so system images will not be scanned
-| --registry-require                               | `[]`                  | exit with an error if the given services are not available. Useful for escalating misconfiguration or outages that might otherwise go undetected. Presently supported values: {`ecr`} |
+| --memcached-hostname                             | `memcached`                        | hostname for memcached service to use for caching image metadata
+| --memcached-timeout                              | `1s`                               | maximum time to wait before giving up on memcached requests
+| --memcached-service                              | `memcached`                        | SRV service used to discover memcache servers
+| --registry-cache-expiry                          | `1h`                               | Duration to keep cached registry tag info. Must be < 1 month.
+| --registry-poll-interval                         | `5m`                               | period at which to poll registry for new images
+| --registry-rps                                   | `200`                              | maximum registry requests per second per host
+| --registry-burst                                 | `125`                              | maximum number of warmer connections to remote and memcache
+| --registry-insecure-host                         | []                                 | registry hosts to use HTTP for (instead of HTTPS)
+| --registry-exclude-image                         | `["k8s.gcr.io/*"]`                 | do not scan images that match these glob expressions
+| --registry-use-labels                            | `["index.docker.io/weaveworks/*"]` | use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expressions
+| --docker-config                                  | `""`                               | path to a Docker config file with default image registry credentials
+| --registry-ecr-region                            | `[]`                               | allow these AWS regions when scanning images from ECR (multiple values allowed); defaults to the detected cluster region
+| --registry-ecr-include-id                        | `[]`                               | include these AWS account ID(s) when scanning images in ECR (multiple values allowed); empty means allow all, unless excluded
+| --registry-ecr-exclude-id                        | `[<EKS SYSTEM ACCOUNT>]`           | exclude these AWS account ID(s) when scanning ECR (multiple values allowed); defaults to the EKS system account, so system images will not be scanned
+| --registry-require                               | `[]`                               | exit with an error if the given services are not available. Useful for escalating misconfiguration or outages that might otherwise go undetected. Presently supported values: {`ecr`} |
 | **k8s-secret backed ssh keyring configuration**
-| --k8s-secret-name                                | `flux-git-deploy`        | name of the k8s secret used to store the private SSH key
-| --k8s-secret-volume-mount-path                   | `/etc/fluxd/ssh`         | mount location of the k8s secret storing the private SSH key
-| --k8s-secret-data-key                            | `identity`               | data key holding the private SSH key within the k8s secret
+| --k8s-secret-name                                | `flux-git-deploy`                  | name of the k8s secret used to store the private SSH key
+| --k8s-secret-volume-mount-path                   | `/etc/fluxd/ssh`                   | mount location of the k8s secret storing the private SSH key
+| --k8s-secret-data-key                            | `identity`                         | data key holding the private SSH key within the k8s secret
 | **k8s configuration**
-| --k8s-allow-namespace                            |                          | experimental: restrict all operations to the provided namespaces
+| --k8s-allow-namespace                            |                                    | experimental: restrict all operations to the provided namespaces
 | **upstream service**
-| --connect                                        |                          | connect to an upstream service e.g., Weave Cloud, at this base address
-| --token                                          |                          | authentication token for upstream service
+| --connect                                        |                                    | connect to an upstream service e.g., Weave Cloud, at this base address
+| --token                                          |                                    | authentication token for upstream service
 | **SSH key generation**
-| --ssh-keygen-bits                                |                          | -b argument to ssh-keygen (default unspecified)
-| --ssh-keygen-type                                |                          | -t argument to ssh-keygen (default unspecified)
+| --ssh-keygen-bits                                |                                    | -b argument to ssh-keygen (default unspecified)
+| --ssh-keygen-type                                |                                    | -t argument to ssh-keygen (default unspecified)
 | **manifest generation**
-| --manifest-generation                            | false                    | experimental; search for .flux.yaml files to generate manifests
+| --manifest-generation                            | false                              | experimental; search for .flux.yaml files to generate manifests

From 2a39f87ce37ef98fba95795160e4ff82aa6c501c Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 21 Jun 2019 13:30:55 +0200
Subject: [PATCH 002/158] Implement label whitelist in Helm chart

---
 chart/flux/README.md                 | 1 +
 chart/flux/templates/deployment.yaml | 3 +++
 chart/flux/values.yaml               | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/chart/flux/README.md b/chart/flux/README.md
index 7257d1b10..94d3fa78d 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -234,6 +234,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `registry.insecureHosts`                          | `None`                                               | Use HTTP rather than HTTPS for the image registry domains
 | `registry.cacheExpiry`                            | `None`                                               | Duration to keep cached image info (deprecated)
 | `registry.excludeImage`                           | `None`                                               | Do not scan images that match these glob expressions; if empty, 'k8s.gcr.io/*' images are excluded
+| `registry.useTimestampLabels`                     | `None`                                               | Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions; if empty, 'index.docker.io/weaveworks/*' images are allowed
 | `registry.ecr.region`                             | `None`                                               | Restrict ECR scanning to these AWS regions; if empty, only the cluster's region will be scanned
 | `registry.ecr.includeId`                          | `None`                                               | Restrict ECR scanning to these AWS account IDs; if empty, all account IDs that aren't excluded may be scanned
 | `registry.ecr.excludeId`                          | `602401143452`                                       | Do not scan ECR for images in these AWS account IDs; the default is to exclude the EKS system account
diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index 4000938f2..5b44f4778 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -199,6 +199,9 @@ spec:
           {{- if .Values.registry.excludeImage }}
           - --registry-exclude-image={{ .Values.registry.excludeImage }}
           {{- end }}
+          {{- if .Values.registry.useTimestampLabels }}
+          - --registry-use-labels={{ .Values.registry.useTimestampLabels }}
+          {{- end }}
           {{- if .Values.registry.ecr.region }}
           - --registry-ecr-region={{ .Values.registry.ecr.region }}
           {{- end }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 9389c8dad..285c669ab 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -184,6 +184,8 @@ registry:
   cacheExpiry:
   # Do not scan images that match these glob expressions
   excludeImage:
+  # Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions
+  useTimestampLabels:
   # AWS ECR settings
   ecr:
     region:

From ec9bbdcafe73baafcc1adb799502dfccba3695e0 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 8 Jul 2019 19:12:48 +0200
Subject: [PATCH 003/158] Whitelist label ts using registry cache decorator

We did not take the inheritance of labels from base images into account
while developing the timestamps from image labels feature. As a result,
users started experiencing issues with automated image updates, due to
the (moderately old) timestamp from the base image being picked up and
prioritized over the timestamp from the registry.

This commits adds the ability to decorate `ImageRepository` structures
before they are returned from cache by `GetImageRepositoryMetadata`.

The sole decorator for now is `TimestampLabelWhitelist`, which replaces
the `CreatedAt` field on the image info with the timestamp specified in
one of the labels if the canonical name of the image matches one of
the glob patterns on the whitelist.

As a result, the labels from images will only be used if explicitly
instructed by the user, dealing with the problem described at the top
of this comment.
---
 cmd/fluxd/main.go                            |  4 ++
 registry/cache/memcached/integration_test.go |  2 +-
 registry/cache/registry.go                   | 49 ++++++++++++-
 registry/cache/registry_test.go              | 74 ++++++++++++++++++++
 4 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 registry/cache/registry_test.go

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 5d558767f..6fefd9bd5 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -146,6 +146,7 @@ func main() {
 		registryTrace        = fs.Bool("registry-trace", false, "output trace of image registry requests to log")
 		registryInsecure     = fs.StringSlice("registry-insecure-host", []string{}, "let these registry hosts skip TLS host verification and fall back to using HTTP instead of HTTPS; this allows man-in-the-middle attacks, so use with extreme caution")
 		registryExcludeImage = fs.StringSlice("registry-exclude-image", []string{"k8s.gcr.io/*"}, "do not scan images that match these glob expressions; the default is to exclude the 'k8s.gcr.io/*' images")
+		registryUseLabels    = fs.StringSlice("registry-use-labels", []string{"index.docker.io/weaveworks/*"}, "use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expression")
 
 		// AWS authentication
 		registryAWSRegions         = fs.StringSlice("registry-ecr-region", nil, "include just these AWS regions when scanning images in ECR; when not supplied, the cluster's region will included if it can be detected through the AWS API")
@@ -498,6 +499,9 @@ func main() {
 
 		cacheRegistry = &cache.Cache{
 			Reader: cacheClient,
+			Decorators: []cache.Decorator{
+				cache.TimestampLabelWhitelist(*registryUseLabels),
+			},
 		}
 		cacheRegistry = registry.NewInstrumentedRegistry(cacheRegistry)
 
diff --git a/registry/cache/memcached/integration_test.go b/registry/cache/memcached/integration_test.go
index cfbd529ec..f25c0e82d 100644
--- a/registry/cache/memcached/integration_test.go
+++ b/registry/cache/memcached/integration_test.go
@@ -48,7 +48,7 @@ func TestWarming_WarmerWriteCacheRead(t *testing.T) {
 		Trace:    true,
 	}
 
-	r := &cache.Cache{mc}
+	r := &cache.Cache{Reader: mc}
 
 	w, _ := cache.NewWarmer(remote, mc, 125)
 	shutdown := make(chan struct{})
diff --git a/registry/cache/registry.go b/registry/cache/registry.go
index 967bae3ec..d238dc5e9 100644
--- a/registry/cache/registry.go
+++ b/registry/cache/registry.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/ryanuber/go-glob"
 
 	fluxerr "github.com/weaveworks/flux/errors"
 	"github.com/weaveworks/flux/image"
@@ -28,7 +29,48 @@ repository.
 
 // Cache is a local cache of image metadata.
 type Cache struct {
-	Reader Reader
+	Reader     Reader
+	Decorators []Decorator
+}
+
+// Decorator is for decorating an ImageRepository before it is returned.
+type Decorator interface {
+	apply(*ImageRepository)
+}
+
+// TimestampLabelWhitelist contains a string slice of glob patterns. Any
+// canonical image reference that matches one of the glob patterns will
+// prefer creation timestamps from labels over the one it received from
+// the registry.
+type TimestampLabelWhitelist []string
+
+// apply checks if any of the canonical image references from the
+// repository matches a glob pattern from the list. If it does, and the
+// image record has a valid timestamp label, it will replace the Created
+// field with the value from the label for all images in the repository.
+func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
+	var match bool
+	for k, i := range r.Images {
+		if !match {
+			for _, exp := range l {
+				if glob.Glob(exp, i.ID.CanonicalName().String()) {
+					match = true
+					break
+				}
+			}
+			if !match {
+				return
+			}
+		}
+
+		switch {
+		case !i.Labels.Created.IsZero():
+			i.CreatedAt = i.Labels.Created
+		case !i.Labels.BuildDate.IsZero():
+			i.CreatedAt = i.Labels.BuildDate
+		}
+		r.Images[k] = i
+	}
 }
 
 // GetImageRepositoryMetadata returns the metadata from an image
@@ -53,6 +95,11 @@ func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetad
 		return image.RepositoryMetadata{}, ErrNotCached
 	}
 
+	// (Maybe) decorate the image repository.
+	for _, d := range c.Decorators {
+		d.apply(&repo)
+	}
+
 	return repo.RepositoryMetadata, nil
 }
 
diff --git a/registry/cache/registry_test.go b/registry/cache/registry_test.go
new file mode 100644
index 000000000..84cd15949
--- /dev/null
+++ b/registry/cache/registry_test.go
@@ -0,0 +1,74 @@
+package cache
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/weaveworks/flux/image"
+)
+
+// mockStorage holds a fixed ImageRepository item.
+type mockStorage struct {
+	Item ImageRepository
+}
+
+// GetKey will always return the same item from the storage,
+// and does not care about the key it receives.
+func (m *mockStorage) GetKey(k Keyer) ([]byte, time.Time, error) {
+	b, err := json.Marshal(m.Item)
+	if err != nil {
+		return []byte{}, time.Time{}, err
+	}
+	return b, time.Time{}, nil
+}
+
+// appendImage adds an image to the mocked storage item.
+func (m *mockStorage) appendImage(i image.Info) {
+	tag := i.ID.Tag
+
+	m.Item.Images[tag] = i
+	m.Item.Tags = append(m.Item.Tags, tag)
+}
+
+func mockReader() *mockStorage {
+	return &mockStorage{
+		Item: ImageRepository{
+			RepositoryMetadata: image.RepositoryMetadata{
+				Tags: []string{},
+				Images: map[string]image.Info{},
+			},
+			LastUpdate: time.Now(),
+		},
+	}
+}
+
+func Test_WhitelabelDecorator(t *testing.T) {
+	r := mockReader()
+
+	// Image with no timestamp label
+	r.appendImage(mustMakeInfo("docker.io/fluxcd/flux:equal", time.Time{}, time.Now().UTC()))
+	// Image with a timestamp label
+	r.appendImage(mustMakeInfo("docker.io/fluxcd/flux:label", time.Now().Add(-10*time.Second).UTC(), time.Now().UTC()))
+
+	c := Cache{r, []Decorator{TimestampLabelWhitelist{"index.docker.io/fluxcd/*"}}}
+
+	rm, err := c.GetImageRepositoryMetadata(image.Name{})
+	assert.NoError(t, err)
+
+	assert.Equal(t, r.Item.Images["equal"].CreatedAt, rm.Images["equal"].CreatedAt)
+	assert.Equal(t, r.Item.Images["label"].Labels.Created, rm.Images["label"].CreatedAt)
+}
+
+func mustMakeInfo(ref string, label time.Time, created time.Time) image.Info {
+	r, err := image.ParseRef(ref)
+	if err != nil {
+		panic(err)
+	}
+	var labels image.Labels
+	if !label.IsZero() {
+		labels.Created = label
+	}
+	return image.Info{ID: r, Labels: labels, CreatedAt: created}
+}

From 6a3835ae55ce7ff6489391c29571b4b295b07e03 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 10 Jul 2019 11:13:42 +0200
Subject: [PATCH 004/158] Add FluxCD DockerHub organization to whitelist

---
 cmd/fluxd/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 6fefd9bd5..81a29befc 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -146,7 +146,7 @@ func main() {
 		registryTrace        = fs.Bool("registry-trace", false, "output trace of image registry requests to log")
 		registryInsecure     = fs.StringSlice("registry-insecure-host", []string{}, "let these registry hosts skip TLS host verification and fall back to using HTTP instead of HTTPS; this allows man-in-the-middle attacks, so use with extreme caution")
 		registryExcludeImage = fs.StringSlice("registry-exclude-image", []string{"k8s.gcr.io/*"}, "do not scan images that match these glob expressions; the default is to exclude the 'k8s.gcr.io/*' images")
-		registryUseLabels    = fs.StringSlice("registry-use-labels", []string{"index.docker.io/weaveworks/*"}, "use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expression")
+		registryUseLabels    = fs.StringSlice("registry-use-labels", []string{"index.docker.io/weaveworks/*", "index.docker.io/fluxcd/*"}, "use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expression")
 
 		// AWS authentication
 		registryAWSRegions         = fs.StringSlice("registry-ecr-region", nil, "include just these AWS regions when scanning images in ECR; when not supplied, the cluster's region will included if it can be detected through the AWS API")

From aed61613e2279e625ecba177a4919d4a5ed0c520 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Wed, 3 Jul 2019 14:50:54 +0200
Subject: [PATCH 005/158] Push images to DockerHub fluxcd org (#2213)

Push images to DockerHub fluxcd org
---
 .circleci/config.yml      | 28 +++++++++++++++++++++++++---
 Makefile                  |  2 +-
 test/bin/test-flux        |  2 +-
 test/e2e/run.sh           |  6 ++++--
 test/flux-deploy-all.yaml |  2 +-
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4b6e3bd51..26f198c24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,13 +61,22 @@ jobs:
           name: Maybe push prerelease images
           command: |
             if [ -z "${CIRCLE_TAG}" -a "${CIRCLE_BRANCH}" == "master" ]; then
+              # Push to weaveworks org
               echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin
 
-              docker tag "docker.io/weaveworks/flux:$(docker/image-tag)" "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)"
+              docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)"
               docker push "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)"
 
-              docker tag "docker.io/weaveworks/helm-operator:$(docker/image-tag)" "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
+              docker tag "docker.io/fluxcd/helm-operator:$(docker/image-tag)" "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
               docker push "docker.io/weaveworks/helm-operator-prerelease:$(docker/image-tag)"
+
+              # Push to fluxcd org
+              echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
+              docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)"
+              docker push "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)"
+
+              docker tag "docker.io/fluxcd/helm-operator:$(docker/image-tag)" "docker.io/fluxcd/helm-operator-prerelease:$(docker/image-tag)"
+              docker push "docker.io/fluxcd/helm-operator-prerelease:$(docker/image-tag)"
             fi
       - deploy:
           name: Maybe push release image and upload binaries
@@ -76,13 +85,26 @@ jobs:
               go get github.com/weaveworks/github-release
               make release-bins
               bin/upload-binaries
+              # Push to weaveworks org
               echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin
+              docker tag "docker.io/fluxcd/flux:${CIRCLE_TAG}" "docker.io/weaveworks/flux:${CIRCLE_TAG}"
               docker push "docker.io/weaveworks/flux:${CIRCLE_TAG}"
+
+              # Push to fluxcd org
+              echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
+              docker push "docker.io/fluxcd/flux:${CIRCLE_TAG}"
             fi
             if echo "${CIRCLE_TAG}" | grep -Eq "helm-[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
-              echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin
               RELEASE_TAG=$(echo "$CIRCLE_TAG" | cut -c 6-)
+
+              # Push to weaveworks org
+              echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin
+              docker tag "docker.io/fluxcd/helm-operator:${RELEASE_TAG}" "docker.io/weaveworks/helm-operator:${RELEASE_TAG}"
               docker push "docker.io/weaveworks/helm-operator:${RELEASE_TAG}"
+
+              # Push to fluxcd org
+              echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
+              docker push "docker.io/fluxcd/helm-operator:${RELEASE_TAG}"
             fi
 
 workflows:
diff --git a/Makefile b/Makefile
index b44de0b31..e9e2a3f01 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ e2e: test/bin/helm test/bin/kubectl build/.flux.done build/.helm-operator.done
 build/.%.done: docker/Dockerfile.%
 	mkdir -p ./build/docker/$*
 	cp $^ ./build/docker/$*/
-	$(SUDO) docker build -t docker.io/weaveworks/$* -t docker.io/weaveworks/$*:$(IMAGE_TAG) \
+	$(SUDO) docker build -t docker.io/fluxcd/$* -t docker.io/fluxcd/$*:$(IMAGE_TAG) \
 		--build-arg VCS_REF="$(VCS_REF)" \
 		--build-arg BUILD_DATE="$(BUILD_DATE)" \
 		-f build/docker/$*/Dockerfile.$* ./build/docker/$*
diff --git a/test/bin/test-flux b/test/bin/test-flux
index 0ba284995..3e2cf2c80 100755
--- a/test/bin/test-flux
+++ b/test/bin/test-flux
@@ -22,7 +22,7 @@ minikube start --profile "$PROFILE" --keep-context
 MINIKUBE_IP=$(minikube --profile "$PROFILE" ip)
 
 # Copy the latest Flux image into the minikube VM
-docker save "docker.io/weaveworks/flux:latest" | (eval $(minikube --profile "$PROFILE" docker-env) && docker load)
+docker save "docker.io/fluxcd/flux:latest" | (eval $(minikube --profile "$PROFILE" docker-env) && docker load)
 
 # Create a central git repo inside the minikube VM and get the host key for ssh access
 minikube --profile "$PROFILE" ssh -- git init --bare /home/docker/flux.git
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
index b5f400a3b..19d3b49b7 100755
--- a/test/e2e/run.sh
+++ b/test/e2e/run.sh
@@ -76,8 +76,8 @@ kubectl -n "${FLUX_NAMESPACE}" rollout status deployment/gitsrv
 
 if [ "${USING_KIND}" = 'true' ]; then
     echo '>>> Loading images into the Kind cluster'
-    kind --name "${KIND_CLUSTER}" load docker-image 'docker.io/weaveworks/flux:latest'
-    kind --name "${KIND_CLUSTER}" load docker-image 'docker.io/weaveworks/helm-operator:latest'
+    kind --name "${KIND_CLUSTER}" load docker-image 'docker.io/fluxcd/flux:latest'
+    kind --name "${KIND_CLUSTER}" load docker-image 'docker.io/fluxcd/helm-operator:latest'
 fi
 
 echo '>>> Installing Flux with Helm'
@@ -100,6 +100,7 @@ defer helm delete --purge flux > /dev/null 2>&1
 
 helm install --name flux --wait \
 --namespace "${FLUX_NAMESPACE}" \
+--set image.repository=docker.io/fluxcd/flux \
 --set image.tag=latest \
 --set git.url=ssh://git@gitsrv/git-server/repos/cluster.git \
 --set git.secretName=ssh-git \
@@ -107,6 +108,7 @@ helm install --name flux --wait \
 --set git.config.secretName=gitconfig \
 --set git.config.enabled=true \
 --set-string git.config.data="${GITCONFIG}" \
+--set helmOperator.repository=docker.io/fluxcd/helm-operator \
 --set helmOperator.tag=latest \
 --set helmOperator.create=true \
 --set helmOperator.createCRD=true \
diff --git a/test/flux-deploy-all.yaml b/test/flux-deploy-all.yaml
index cd94bb58f..8af30e1ef 100644
--- a/test/flux-deploy-all.yaml
+++ b/test/flux-deploy-all.yaml
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: flux
         # Require locally built image
-        image: docker.io/weaveworks/flux:latest
+        image: docker.io/fluxcd/flux:latest
         imagePullPolicy: Never
         ports:
         - containerPort: 3030 # informational

From 4a10ee9c4aca14b55e9d813d8aa464bcb7632978 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Mon, 1 Jul 2019 16:14:46 +0200
Subject: [PATCH 006/158] Only require image TS when it is used for sorting
 (#2175)

Only require image TS when it is used for sorting
---
 daemon/images.go      |  2 +-
 daemon/images_test.go | 29 +++++++++++++++++++++++++----
 policy/pattern.go     | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/daemon/images.go b/daemon/images.go
index 6404b825b..f32281b1e 100644
--- a/daemon/images.go
+++ b/daemon/images.go
@@ -103,7 +103,7 @@ func calculateChanges(logger log.Logger, candidateWorkloads resources, workloads
 					continue containers
 				}
 				current := repoMetadata.FindImageWithRef(currentImageID)
-				if current.CreatedTS().IsZero() || latest.CreatedTS().IsZero() {
+				if pattern.RequiresTimestamp() && (current.CreatedTS().IsZero() || latest.CreatedTS().IsZero()) {
 					logger.Log("warning", "image with zero created timestamp", "current", fmt.Sprintf("%s (%s)", current.ID, current.CreatedTS()), "latest", fmt.Sprintf("%s (%s)", latest.ID, latest.CreatedTS()), "action", "skip container")
 					continue containers
 				}
diff --git a/daemon/images_test.go b/daemon/images_test.go
index 2d2295f25..9fdcfcb5c 100644
--- a/daemon/images_test.go
+++ b/daemon/images_test.go
@@ -18,6 +18,7 @@ import (
 const (
 	container1 = "container1"
 	container2 = "container2"
+	container3 = "container3"
 
 	currentContainer1Image = "container1/application:current"
 	newContainer1Image     = "container1/application:new"
@@ -25,6 +26,9 @@ const (
 	currentContainer2Image = "container2/application:current"
 	newContainer2Image     = "container2/application:new"
 	noTagContainer2Image   = "container2/application"
+
+	currentContainer3Image = "container3/application:1.0.0"
+	newContainer3Image     = "container3/application:1.1.0"
 )
 
 type candidate struct {
@@ -152,6 +156,7 @@ func TestCalculateChanges_UntaggedImage(t *testing.T) {
 		t.Errorf("Expected changed image to be %s, got %s", newContainer1Image, newImage)
 	}
 }
+
 func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 	logger := log.NewNopLogger()
 	resourceID := flux.MakeResourceID(ns, "deployment", "application")
@@ -159,7 +164,8 @@ func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 		resourceID: candidate{
 			resourceID: resourceID,
 			policies: policy.Set{
-				policy.Automated: "true",
+				policy.Automated:             "true",
+				policy.TagPrefix(container3): "semver:^1.0",
 			},
 		},
 	}
@@ -176,6 +182,10 @@ func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 						Name:  container2,
 						Image: mustParseImageRef(currentContainer2Image),
 					},
+					{
+						Name:  container3,
+						Image: mustParseImageRef(currentContainer3Image),
+					},
 				},
 			},
 		},
@@ -184,14 +194,21 @@ func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 	{
 		current1 := makeImageInfo(currentContainer1Image, time.Now())
 		new1 := makeImageInfo(newContainer1Image, time.Now().Add(1*time.Second))
+
 		zeroTimestampCurrent2 := image.Info{ID: mustParseImageRef(currentContainer2Image)}
 		new2 := makeImageInfo(newContainer2Image, time.Now().Add(1*time.Second))
+
+		current3 := makeImageInfo(currentContainer3Image, time.Now())
+		zeroTimestampNew3 := image.Info{ID: mustParseImageRef(newContainer3Image)}
+
 		imageRegistry = &registryMock.Registry{
 			Images: []image.Info{
 				current1,
 				new1,
 				zeroTimestampCurrent2,
 				new2,
+				current3,
+				zeroTimestampNew3,
 			},
 		}
 	}
@@ -202,9 +219,13 @@ func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 
 	changes := calculateChanges(logger, candidateWorkloads, workloads, imageRepos)
 
-	if len := len(changes.Changes); len != 1 {
-		t.Errorf("Expected exactly 1 change, got %d changes", len)
-	} else if newImage := changes.Changes[0].ImageID.String(); newImage != newContainer1Image {
+	if len := len(changes.Changes); len != 2 {
+		t.Fatalf("Expected exactly 2 changes, got %d changes: %v", len, changes.Changes)
+	}
+	if newImage := changes.Changes[0].ImageID.String(); newImage != newContainer1Image {
 		t.Errorf("Expected changed image to be %s, got %s", newContainer1Image, newImage)
 	}
+	if newImage := changes.Changes[1].ImageID.String(); newImage != newContainer3Image {
+		t.Errorf("Expected changed image to be %s, got %s", newContainer3Image, newImage)
+	}
 }
diff --git a/policy/pattern.go b/policy/pattern.go
index 56380ab05..5f0d317ba 100644
--- a/policy/pattern.go
+++ b/policy/pattern.go
@@ -32,6 +32,8 @@ type Pattern interface {
 	Newer(a, b *image.Info) bool
 	// Valid returns true if the pattern is considered valid.
 	Valid() bool
+	// RequiresTimestamp returns true if the pattern orders based on timestamp data.
+	RequiresTimestamp() bool
 }
 
 type GlobPattern string
@@ -87,6 +89,10 @@ func (g GlobPattern) Valid() bool {
 	return true
 }
 
+func (g GlobPattern) RequiresTimestamp() bool {
+	return true
+}
+
 func (s SemverPattern) Matches(tag string) bool {
 	v, err := semver.NewVersion(tag)
 	if err != nil {
@@ -111,6 +117,10 @@ func (s SemverPattern) Valid() bool {
 	return s.constraints != nil
 }
 
+func (s SemverPattern) RequiresTimestamp() bool {
+	return false
+}
+
 func (r RegexpPattern) Matches(tag string) bool {
 	if r.regexp == nil {
 		// Invalid regexp match anything
@@ -130,3 +140,7 @@ func (r RegexpPattern) Newer(a, b *image.Info) bool {
 func (r RegexpPattern) Valid() bool {
 	return r.regexp != nil
 }
+
+func (r RegexpPattern) RequiresTimestamp() bool {
+	return true
+}

From 9c90dcbaa0f1223a97661fd6fe10a4bea72ea638 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Wed, 10 Jul 2019 12:25:44 +0200
Subject: [PATCH 007/158] Implement whitelist for usage of TS from labels
 (#2176)

Implement whitelist for usage of TS from labels
---
 chart/flux/README.md                         |  1 +
 chart/flux/templates/deployment.yaml         |  3 +
 chart/flux/values.yaml                       |  2 +
 cmd/fluxd/main.go                            |  4 +
 registry/cache/memcached/integration_test.go |  2 +-
 registry/cache/registry.go                   | 49 ++++++++++-
 registry/cache/registry_test.go              | 74 ++++++++++++++++
 site/daemon.md                               | 93 ++++++++++----------
 8 files changed, 180 insertions(+), 48 deletions(-)
 create mode 100644 registry/cache/registry_test.go

diff --git a/chart/flux/README.md b/chart/flux/README.md
index fc281dc4d..1353abe89 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -232,6 +232,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 | `registry.insecureHosts`                          | `None`                                               | Use HTTP rather than HTTPS for the image registry domains
 | `registry.cacheExpiry`                            | `None`                                               | Duration to keep cached image info (deprecated)
 | `registry.excludeImage`                           | `None`                                               | Do not scan images that match these glob expressions; if empty, 'k8s.gcr.io/*' images are excluded
+| `registry.useTimestampLabels`                     | `None`                                               | Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions; if empty, 'index.docker.io/weaveworks/*' images are allowed
 | `registry.ecr.region`                             | `None`                                               | Restrict ECR scanning to these AWS regions; if empty, only the cluster's region will be scanned
 | `registry.ecr.includeId`                          | `None`                                               | Restrict ECR scanning to these AWS account IDs; if empty, all account IDs that aren't excluded may be scanned
 | `registry.ecr.excludeId`                          | `602401143452`                                       | Do not scan ECR for images in these AWS account IDs; the default is to exclude the EKS system account
diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index e292dbabe..737c2d2d2 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -196,6 +196,9 @@ spec:
           {{- if .Values.registry.excludeImage }}
           - --registry-exclude-image={{ .Values.registry.excludeImage }}
           {{- end }}
+          {{- if .Values.registry.useTimestampLabels }}
+          - --registry-use-labels={{ .Values.registry.useTimestampLabels }}
+          {{- end }}
           {{- if .Values.registry.ecr.region }}
           - --registry-ecr-region={{ .Values.registry.ecr.region }}
           {{- end }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 344134e87..63fbd6668 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -177,6 +177,8 @@ registry:
   cacheExpiry:
   # Do not scan images that match these glob expressions
   excludeImage:
+  # Allow usage of (RFC3339) timestamp labels from (canonical) image refs that match these glob expressions
+  useTimestampLabels:
   # AWS ECR settings
   ecr:
     region:
diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 75979707e..481886993 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -145,6 +145,7 @@ func main() {
 		registryTrace        = fs.Bool("registry-trace", false, "output trace of image registry requests to log")
 		registryInsecure     = fs.StringSlice("registry-insecure-host", []string{}, "let these registry hosts skip TLS host verification and fall back to using HTTP instead of HTTPS; this allows man-in-the-middle attacks, so use with extreme caution")
 		registryExcludeImage = fs.StringSlice("registry-exclude-image", []string{"k8s.gcr.io/*"}, "do not scan images that match these glob expressions; the default is to exclude the 'k8s.gcr.io/*' images")
+		registryUseLabels    = fs.StringSlice("registry-use-labels", []string{"index.docker.io/weaveworks/*", "index.docker.io/fluxcd/*"}, "use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expression")
 
 		// AWS authentication
 		registryAWSRegions         = fs.StringSlice("registry-ecr-region", nil, "include just these AWS regions when scanning images in ECR; when not supplied, the cluster's region will included if it can be detected through the AWS API")
@@ -493,6 +494,9 @@ func main() {
 
 		cacheRegistry = &cache.Cache{
 			Reader: cacheClient,
+			Decorators: []cache.Decorator{
+				cache.TimestampLabelWhitelist(*registryUseLabels),
+			},
 		}
 		cacheRegistry = registry.NewInstrumentedRegistry(cacheRegistry)
 
diff --git a/registry/cache/memcached/integration_test.go b/registry/cache/memcached/integration_test.go
index cfbd529ec..f25c0e82d 100644
--- a/registry/cache/memcached/integration_test.go
+++ b/registry/cache/memcached/integration_test.go
@@ -48,7 +48,7 @@ func TestWarming_WarmerWriteCacheRead(t *testing.T) {
 		Trace:    true,
 	}
 
-	r := &cache.Cache{mc}
+	r := &cache.Cache{Reader: mc}
 
 	w, _ := cache.NewWarmer(remote, mc, 125)
 	shutdown := make(chan struct{})
diff --git a/registry/cache/registry.go b/registry/cache/registry.go
index 967bae3ec..d238dc5e9 100644
--- a/registry/cache/registry.go
+++ b/registry/cache/registry.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/ryanuber/go-glob"
 
 	fluxerr "github.com/weaveworks/flux/errors"
 	"github.com/weaveworks/flux/image"
@@ -28,7 +29,48 @@ repository.
 
 // Cache is a local cache of image metadata.
 type Cache struct {
-	Reader Reader
+	Reader     Reader
+	Decorators []Decorator
+}
+
+// Decorator is for decorating an ImageRepository before it is returned.
+type Decorator interface {
+	apply(*ImageRepository)
+}
+
+// TimestampLabelWhitelist contains a string slice of glob patterns. Any
+// canonical image reference that matches one of the glob patterns will
+// prefer creation timestamps from labels over the one it received from
+// the registry.
+type TimestampLabelWhitelist []string
+
+// apply checks if any of the canonical image references from the
+// repository matches a glob pattern from the list. If it does, and the
+// image record has a valid timestamp label, it will replace the Created
+// field with the value from the label for all images in the repository.
+func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
+	var match bool
+	for k, i := range r.Images {
+		if !match {
+			for _, exp := range l {
+				if glob.Glob(exp, i.ID.CanonicalName().String()) {
+					match = true
+					break
+				}
+			}
+			if !match {
+				return
+			}
+		}
+
+		switch {
+		case !i.Labels.Created.IsZero():
+			i.CreatedAt = i.Labels.Created
+		case !i.Labels.BuildDate.IsZero():
+			i.CreatedAt = i.Labels.BuildDate
+		}
+		r.Images[k] = i
+	}
 }
 
 // GetImageRepositoryMetadata returns the metadata from an image
@@ -53,6 +95,11 @@ func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetad
 		return image.RepositoryMetadata{}, ErrNotCached
 	}
 
+	// (Maybe) decorate the image repository.
+	for _, d := range c.Decorators {
+		d.apply(&repo)
+	}
+
 	return repo.RepositoryMetadata, nil
 }
 
diff --git a/registry/cache/registry_test.go b/registry/cache/registry_test.go
new file mode 100644
index 000000000..84cd15949
--- /dev/null
+++ b/registry/cache/registry_test.go
@@ -0,0 +1,74 @@
+package cache
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/weaveworks/flux/image"
+)
+
+// mockStorage holds a fixed ImageRepository item.
+type mockStorage struct {
+	Item ImageRepository
+}
+
+// GetKey will always return the same item from the storage,
+// and does not care about the key it receives.
+func (m *mockStorage) GetKey(k Keyer) ([]byte, time.Time, error) {
+	b, err := json.Marshal(m.Item)
+	if err != nil {
+		return []byte{}, time.Time{}, err
+	}
+	return b, time.Time{}, nil
+}
+
+// appendImage adds an image to the mocked storage item.
+func (m *mockStorage) appendImage(i image.Info) {
+	tag := i.ID.Tag
+
+	m.Item.Images[tag] = i
+	m.Item.Tags = append(m.Item.Tags, tag)
+}
+
+func mockReader() *mockStorage {
+	return &mockStorage{
+		Item: ImageRepository{
+			RepositoryMetadata: image.RepositoryMetadata{
+				Tags: []string{},
+				Images: map[string]image.Info{},
+			},
+			LastUpdate: time.Now(),
+		},
+	}
+}
+
+func Test_WhitelabelDecorator(t *testing.T) {
+	r := mockReader()
+
+	// Image with no timestamp label
+	r.appendImage(mustMakeInfo("docker.io/fluxcd/flux:equal", time.Time{}, time.Now().UTC()))
+	// Image with a timestamp label
+	r.appendImage(mustMakeInfo("docker.io/fluxcd/flux:label", time.Now().Add(-10*time.Second).UTC(), time.Now().UTC()))
+
+	c := Cache{r, []Decorator{TimestampLabelWhitelist{"index.docker.io/fluxcd/*"}}}
+
+	rm, err := c.GetImageRepositoryMetadata(image.Name{})
+	assert.NoError(t, err)
+
+	assert.Equal(t, r.Item.Images["equal"].CreatedAt, rm.Images["equal"].CreatedAt)
+	assert.Equal(t, r.Item.Images["label"].Labels.Created, rm.Images["label"].CreatedAt)
+}
+
+func mustMakeInfo(ref string, label time.Time, created time.Time) image.Info {
+	r, err := image.ParseRef(ref)
+	if err != nil {
+		panic(err)
+	}
+	var labels image.Labels
+	if !label.IsZero() {
+		labels.Created = label
+	}
+	return image.Info{ID: r, Labels: labels, CreatedAt: created}
+}
diff --git a/site/daemon.md b/site/daemon.md
index 15544f2a0..3e896d249 100644
--- a/site/daemon.md
+++ b/site/daemon.md
@@ -42,57 +42,58 @@ document.
 
 fluxd requires setup and offers customization though a multitude of flags.
 
-| Flag                                             | Default                  | Purpose
-| ------------------------------------------------ | ------------------------ | ---
-| --listen -l                                      | `:3030`                  | listen address where /metrics and API will be served
-| --listen-metrics                                 |                          | listen address for /metrics endpoint
-| --kubernetes-kubectl                             |                          | optional, explicit path to kubectl tool
-| --version                                        | false                    | output the version number and exit
+| Flag                                             | Default                            | Purpose
+| ------------------------------------------------ | ---------------------------------- | ---
+| --listen -l                                      | `:3030`                            | listen address where /metrics and API will be served
+| --listen-metrics                                 |                                    | listen address for /metrics endpoint
+| --kubernetes-kubectl                             |                                    | optional, explicit path to kubectl tool
+| --version                                        | false                              | output the version number and exit
 | **Git repo & key etc.**
-| --git-url                                        |                          | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
-| --git-branch                                     | `master`                 | branch of git repo to use for Kubernetes manifests
-| --git-ci-skip                                    | false                    | when set, fluxd will append `\n\n[ci skip]` to its commit messages
-| --git-ci-skip-message                            | `""`                     | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
-| --git-path                                       |                          | path within git repo to locate Kubernetes manifests (relative path)
-| --git-user                                       | `Weave Flux`             | username to use as git committer
-| --git-email                                      | `support@weave.works`    | email to use as git committer
-| --git-set-author                                 | false                    | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
-| --git-gpg-key-import                             |                          | if set, fluxd will attempt to import the gpg key(s) found on the given path
-| --git-signing-key                                |                          | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key. See [Git commit signing](git-commit-signing.md) to learn how to use this feature
-| --git-label                                      |                          | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
-| --git-sync-tag                                   | `flux-sync`              | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
-| --git-notes-ref                                  | `flux`                   | ref to use for keeping commit annotations in git notes
-| --git-poll-interval                              | `5m`                     | period at which to fetch any new commits from the git repo
-| --git-timeout                                    | `20s`                    | duration after which git operations time out
+| --git-url                                        |                                    | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
+| --git-branch                                     | `master`                           | branch of git repo to use for Kubernetes manifests
+| --git-ci-skip                                    | false                              | when set, fluxd will append `\n\n[ci skip]` to its commit messages
+| --git-ci-skip-message                            | `""`                               | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
+| --git-path                                       |                                    | path within git repo to locate Kubernetes manifests (relative path)
+| --git-user                                       | `Weave Flux`                       | username to use as git committer
+| --git-email                                      | `support@weave.works`              | email to use as git committer
+| --git-set-author                                 | false                              | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
+| --git-gpg-key-import                             |                                    | if set, fluxd will attempt to import the gpg key(s) found on the given path
+| --git-signing-key                                |                                    | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key. See [Git commit signing](git-commit-signing.md) to learn how to use this feature
+| --git-label                                      |                                    | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
+| --git-sync-tag                                   | `flux-sync`                        | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
+| --git-notes-ref                                  | `flux`                             | ref to use for keeping commit annotations in git notes
+| --git-poll-interval                              | `5m`                               | period at which to fetch any new commits from the git repo
+| --git-timeout                                    | `20s`                              | duration after which git operations time out
 | **syncing:** control over how config is applied to the cluster
-| --sync-interval                                  | `5m`                     | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
-| --sync-garbage-collection                        | `false`                  | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
+| --sync-interval                                  | `5m`                               | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
+| --sync-garbage-collection                        | `false`                            | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
 | **registry cache:** (none of these need overriding, usually)
-| --memcached-hostname                             | `memcached`              | hostname for memcached service to use for caching image metadata
-| --memcached-timeout                              | `1s`                     | maximum time to wait before giving up on memcached requests
-| --memcached-service                              | `memcached`              | SRV service used to discover memcache servers
-| --registry-cache-expiry                          | `1h`                     | Duration to keep cached registry tag info. Must be < 1 month.
-| --registry-poll-interval                         | `5m`                     | period at which to poll registry for new images
-| --registry-rps                                   | `200`                    | maximum registry requests per second per host
-| --registry-burst                                 | `125`                    | maximum number of warmer connections to remote and memcache
-| --registry-insecure-host                         | []                       | registry hosts to use HTTP for (instead of HTTPS)
-| --registry-exclude-image                         | `["k8s.gcr.io/*"]`       | do not scan images that match these glob expressions
-| --docker-config                                  | `""`                     | path to a Docker config file with default image registry credentials
-| --registry-ecr-region                            | `[]`                     | Allow these AWS regions when scanning images from ECR (multiple values allowed); defaults to the detected cluster region
-| --registry-ecr-include-id                        | `[]`                     | Include these AWS account ID(s) when scanning images in ECR (multiple values allowed); empty means allow all, unless excluded
-| --registry-ecr-exclude-id                        | `[<EKS SYSTEM ACCOUNT>]` | Exclude these AWS account ID(s) when scanning ECR (multiple values allowed); defaults to the EKS system account, so system images will not be scanned
-| --registry-require                               | `[]`                  | exit with an error if the given services are not available. Useful for escalating misconfiguration or outages that might otherwise go undetected. Presently supported values: {`ecr`} |
+| --memcached-hostname                             | `memcached`                        | hostname for memcached service to use for caching image metadata
+| --memcached-timeout                              | `1s`                               | maximum time to wait before giving up on memcached requests
+| --memcached-service                              | `memcached`                        | SRV service used to discover memcache servers
+| --registry-cache-expiry                          | `1h`                               | Duration to keep cached registry tag info. Must be < 1 month.
+| --registry-poll-interval                         | `5m`                               | period at which to poll registry for new images
+| --registry-rps                                   | `200`                              | maximum registry requests per second per host
+| --registry-burst                                 | `125`                              | maximum number of warmer connections to remote and memcache
+| --registry-insecure-host                         | []                                 | registry hosts to use HTTP for (instead of HTTPS)
+| --registry-exclude-image                         | `["k8s.gcr.io/*"]`                 | do not scan images that match these glob expressions
+| --registry-use-labels                            | `["index.docker.io/weaveworks/*", "index.docker.io/fluxcd/*"]` | use the timestamp (RFC3339) from labels for (canonical) image refs that match these glob expressions
+| --docker-config                                  | `""`                               | path to a Docker config file with default image registry credentials
+| --registry-ecr-region                            | `[]`                               | allow these AWS regions when scanning images from ECR (multiple values allowed); defaults to the detected cluster region
+| --registry-ecr-include-id                        | `[]`                               | include these AWS account ID(s) when scanning images in ECR (multiple values allowed); empty means allow all, unless excluded
+| --registry-ecr-exclude-id                        | `[<EKS SYSTEM ACCOUNT>]`           | exclude these AWS account ID(s) when scanning ECR (multiple values allowed); defaults to the EKS system account, so system images will not be scanned
+| --registry-require                               | `[]`                               | exit with an error if the given services are not available. Useful for escalating misconfiguration or outages that might otherwise go undetected. Presently supported values: {`ecr`} |
 | **k8s-secret backed ssh keyring configuration**
-| --k8s-secret-name                                | `flux-git-deploy`        | name of the k8s secret used to store the private SSH key
-| --k8s-secret-volume-mount-path                   | `/etc/fluxd/ssh`         | mount location of the k8s secret storing the private SSH key
-| --k8s-secret-data-key                            | `identity`               | data key holding the private SSH key within the k8s secret
+| --k8s-secret-name                                | `flux-git-deploy`                  | name of the k8s secret used to store the private SSH key
+| --k8s-secret-volume-mount-path                   | `/etc/fluxd/ssh`                   | mount location of the k8s secret storing the private SSH key
+| --k8s-secret-data-key                            | `identity`                         | data key holding the private SSH key within the k8s secret
 | **k8s configuration**
-| --k8s-allow-namespace                            |                          | experimental: restrict all operations to the provided namespaces
+| --k8s-allow-namespace                            |                                    | experimental: restrict all operations to the provided namespaces
 | **upstream service**
-| --connect                                        |                          | connect to an upstream service e.g., Weave Cloud, at this base address
-| --token                                          |                          | authentication token for upstream service
+| --connect                                        |                                    | connect to an upstream service e.g., Weave Cloud, at this base address
+| --token                                          |                                    | authentication token for upstream service
 | **SSH key generation**
-| --ssh-keygen-bits                                |                          | -b argument to ssh-keygen (default unspecified)
-| --ssh-keygen-type                                |                          | -t argument to ssh-keygen (default unspecified)
+| --ssh-keygen-bits                                |                                    | -b argument to ssh-keygen (default unspecified)
+| --ssh-keygen-type                                |                                    | -t argument to ssh-keygen (default unspecified)
 | **manifest generation**
-| --manifest-generation                            | false                    | experimental; search for .flux.yaml files to generate manifests
+| --manifest-generation                            | false                              | experimental; search for .flux.yaml files to generate manifests

From ede3e65a2f24f0e1eeffda0b51fa3a74399b8bf1 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 26 Jun 2019 23:32:23 +0200
Subject: [PATCH 008/158] Merge pull request #2195 from
 2opremio/bump-circleci-image

Upgrade CircleCI image to ubuntu-1604:201903-01
---
 .circleci/config.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 26f198c24..0bbb1ff91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,8 @@ version: 2
 jobs:
   build:
     working_directory: ~/flux
-    machine: true
+    machine:
+      image: ubuntu-1604:201903-01
     environment:
       GO_VERSION: 1.12.5
       # We don't need a GOPATH but CircleCI defines it, so we override it
@@ -22,10 +23,8 @@ jobs:
       - run:
           name: Update packages and Start Memcached
           command: |
-            # These repos fail and we don't need them:
-            sudo rm /etc/apt/sources.list.d/circleci_trusty.list /etc/apt/sources.list.d/google-chrome.list
             sudo apt-get update
-            sudo apt-get install -y git rng-tools docker-ce memcached
+            sudo apt-get install -y git rng-tools memcached
             git version
             docker version
       - restore_cache:

From d6f7fd0f61c03ba33be1bcfcde295b6ae5133825 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Mon, 8 Jul 2019 12:15:15 +0100
Subject: [PATCH 009/158] Merge pull request #2222 from
 weaveworks/issue/2119-allow-google-cloudsdk-env

Allow Google Cloud SDK env entries for git
---
 git/operations.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/git/operations.go b/git/operations.go
index ef25c8211..2d6f2f52f 100644
--- a/git/operations.go
+++ b/git/operations.go
@@ -24,8 +24,16 @@ var exemptedTraceCommands = []string{
 	// "config",
 }
 
-// Env vars that are allowed to be inherited from the os
-var allowedEnvVars = []string{"http_proxy", "https_proxy", "no_proxy", "HOME", "GNUPGHOME"}
+// Env vars that are allowed to be inherited from the OS
+var allowedEnvVars = []string{
+	// these are for people using (no) proxies
+	"http_proxy", "https_proxy", "no_proxy",
+	// these are needed for GPG to find its files
+	"HOME", "GNUPGHOME",
+	// these are for Google Cloud SDK to find its files (which will
+	// have to be mounted, if running in a container)
+	"CLOUDSDK_CONFIG", "CLOUDSDK_PYTHON",
+}
 
 type gitCmdConfig struct {
 	dir string

From 779051f214a616aac6e1394db70edcb1e58043e7 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Fri, 28 Jun 2019 13:12:46 +0200
Subject: [PATCH 010/158] Merge pull request #2207 from
 2opremio/get-dependencies-faster

Optimize make dependecy obtention
---
 Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e9e2a3f01..578f1b974 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ GOBIN?=$(shell echo `go env GOPATH`/bin)
 # if you're testing out the Makefile with `-W` (pretend a file is
 # new); use the full path to the pretend-new file, e.g.,
 #  `make -W $PWD/registry/registry.go`
-godeps=$(shell go list -f '{{join .Deps "\n"}}' $1 | grep -v /vendor/ | xargs go list -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}')
+godeps=$(shell go list -deps -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}' $(1))
 
-FLUXD_DEPS:=$(call godeps,./cmd/fluxd)
-FLUXCTL_DEPS:=$(call godeps,./cmd/fluxctl)
-HELM_OPERATOR_DEPS:=$(call godeps,./cmd/helm-operator)
+FLUXD_DEPS:=$(call godeps,./cmd/fluxd/...)
+FLUXCTL_DEPS:=$(call godeps,./cmd/fluxctl/...)
+HELM_OPERATOR_DEPS:=$(call godeps,./cmd/helm-operator/...)
 
 IMAGE_TAG:=$(shell ./docker/image-tag)
 VCS_REF:=$(shell git rev-parse HEAD)
@@ -113,15 +113,12 @@ cache/%/helm-$(HELM_VERSION): docker/helm.version
 	mv cache/$*/helm $@
 
 $(GOBIN)/fluxctl: $(FLUXCTL_DEPS)
-$(GOBIN)/fluxctl: ./cmd/fluxctl/*.go
 	go install ./cmd/fluxctl
 
 $(GOBIN)/fluxd: $(FLUXD_DEPS)
-$(GOBIN)/fluxd: cmd/fluxd/*.go
 	go install ./cmd/fluxd
 
 $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
-$(GOBIN)/help-operator: cmd/helm-operator/*.go
 	go install ./cmd/helm-operator
 
 integration-test: all

From d7df66a5c48ed89856cafcab28499b43af9c1700 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Thu, 27 Jun 2019 16:59:26 +0300
Subject: [PATCH 011/158] Merge pull request #2202 from weaveworks/kind-0.4

Update Kubernetes Kind to v0.4.0
---
 test/e2e/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/run.sh b/test/e2e/run.sh
index 19d3b49b7..4ef3f8ebc 100755
--- a/test/e2e/run.sh
+++ b/test/e2e/run.sh
@@ -26,7 +26,7 @@ function defer() {
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
 SCRIPT_DIR="${REPO_ROOT}/test/e2e"
-KIND_VERSION=0.2.1
+KIND_VERSION="v0.4.0"
 CACHE_DIR="${REPO_ROOT}/cache/$CURRENT_OS_ARCH"
 KIND_CACHE_PATH="${CACHE_DIR}/kind-$KIND_VERSION"
 KIND_CLUSTER=flux-e2e

From 553c0d7bc9fb1f1490f48ca55ec7e5a70005ec16 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Thu, 27 Jun 2019 19:40:24 +0300
Subject: [PATCH 012/158] Merge pull request #2201 from weaveworks/refac

Move ResourceID from root to resource package
---
 api/v11/api.go                                |   4 +-
 api/v6/api.go                                 |   8 +-
 cluster/cluster.go                            |   9 +-
 cluster/kubernetes/images.go                  |   4 +-
 cluster/kubernetes/kubernetes.go              |  16 +-
 cluster/kubernetes/manifests.go               |   3 +-
 cluster/kubernetes/patch.go                   |  22 +-
 cluster/kubernetes/policies.go                |   4 +-
 cluster/kubernetes/policies_test.go           |  48 ++--
 cluster/kubernetes/resource/load_test.go      |  13 +-
 cluster/kubernetes/resource/resource.go       |   7 +-
 cluster/kubernetes/resourcekinds.go           |   9 +-
 cluster/kubernetes/sync.go                    |  15 +-
 cluster/kubernetes/sync_test.go               |  19 +-
 cluster/kubernetes/testfiles/data.go          |  40 +--
 cluster/kubernetes/update.go                  |   4 +-
 cluster/kubernetes/update_test.go             |   4 +-
 cluster/mock/mock.go                          |  18 +-
 cluster/sync.go                               |   3 +-
 cmd/fluxctl/args.go                           |   5 +-
 cmd/fluxctl/args_test.go                      |  23 +-
 cmd/fluxctl/list_images_cmd.go                |   4 +-
 cmd/fluxctl/policy_cmd.go                     |  13 +-
 cmd/fluxctl/release_cmd.go                    |   8 +-
 cmd/fluxctl/release_cmd_test.go               |   8 +-
 daemon/daemon.go                              |  19 +-
 daemon/daemon_test.go                         |  31 ++-
 daemon/errors.go                              |   4 +-
 daemon/images.go                              |   7 +-
 daemon/images_test.go                         |  14 +-
 daemon/sync.go                                |   7 +-
 daemon/sync_test.go                           |  18 +-
 event/event.go                                |   9 +-
 flux.go                                       | 240 ------------------
 git/gittest/repo.go                           |   4 +-
 http/daemon/server.go                         |  13 +-
 image/image.go                                |   2 +-
 image/image_test.go                           |   4 +-
 .../apis/flux.weave.works/v1beta1/types.go    |   6 +-
 integrations/helm/release/release.go          |  14 +-
 manifests/configaware.go                      |  10 +-
 manifests/configaware_test.go                 |   9 +-
 manifests/configfile.go                       |   8 +-
 manifests/configfile_test.go                  |   6 +-
 manifests/manifests.go                        |   6 +-
 manifests/rawfiles.go                         |   8 +-
 manifests/store.go                            |   6 +-
 policy/policy.go                              |   9 -
 registry/client.go                            |   6 +-
 registry/credentials.go                       |  10 +-
 release/context.go                            |   7 +-
 release/releaser_test.go                      |  97 ++++---
 remote/mock.go                                |  12 +-
 remote/rpc/clientV11.go                       |   2 +-
 remote/rpc/compat.go                          |  10 +-
 remote/rpc/server.go                          |   2 +-
 resource/id.go                                | 240 ++++++++++++++++++
 resourceid_test.go => resource/id_test.go     |   6 +-
 resource/policy.go                            |  10 +-
 resource/resource.go                          |   9 +-
 sync/mock.go                                  |   6 +-
 update/automated.go                           |  16 +-
 update/filter.go                              |   6 +-
 update/menu.go                                |  14 +-
 update/print_test.go                          |  14 +-
 update/release_containers.go                  |   5 +-
 update/release_image.go                       |  20 +-
 update/result.go                              |   8 +-
 update/spec.go                                |   4 +-
 update/workload.go                            |   3 +-
 70 files changed, 618 insertions(+), 654 deletions(-)
 delete mode 100644 flux.go
 create mode 100644 resource/id.go
 rename resourceid_test.go => resource/id_test.go (87%)

diff --git a/api/v11/api.go b/api/v11/api.go
index 1e0034204..5b591b9a1 100644
--- a/api/v11/api.go
+++ b/api/v11/api.go
@@ -4,14 +4,14 @@ package v11
 import (
 	"context"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v6"
+	"github.com/weaveworks/flux/resource"
 )
 
 type ListServicesOptions struct {
 	Namespace string
-	Services  []flux.ResourceID
+	Services  []resource.ID
 }
 
 type Server interface {
diff --git a/api/v6/api.go b/api/v6/api.go
index a95f2a4f3..4b8e341d5 100644
--- a/api/v6/api.go
+++ b/api/v6/api.go
@@ -3,16 +3,16 @@ package v6
 import (
 	"context"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/git"
 	"github.com/weaveworks/flux/job"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/ssh"
 	"github.com/weaveworks/flux/update"
 )
 
 type ImageStatus struct {
-	ID         flux.ResourceID
+	ID         resource.ID
 	Containers []Container
 }
 
@@ -31,13 +31,13 @@ const (
 )
 
 type ControllerStatus struct {
-	ID         flux.ResourceID
+	ID         resource.ID
 	Containers []Container
 	ReadOnly   ReadOnlyReason
 	Status     string
 	Rollout    cluster.RolloutStatus
 	SyncError  string
-	Antecedent flux.ResourceID
+	Antecedent resource.ID
 	Labels     map[string]string
 	Automated  bool
 	Locked     bool
diff --git a/cluster/cluster.go b/cluster/cluster.go
index 5fedba272..e8d203a67 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/ssh"
@@ -27,8 +26,8 @@ const (
 type Cluster interface {
 	// Get all of the services (optionally, from a specific namespace), excluding those
 	AllWorkloads(ctx context.Context, maybeNamespace string) ([]Workload, error)
-	SomeWorkloads(ctx context.Context, ids []flux.ResourceID) ([]Workload, error)
-	IsAllowedResource(flux.ResourceID) bool
+	SomeWorkloads(ctx context.Context, ids []resource.ID) ([]Workload, error)
+	IsAllowedResource(resource.ID) bool
 	Ping() error
 	Export(ctx context.Context) ([]byte, error)
 	Sync(SyncSet) error
@@ -60,7 +59,7 @@ type RolloutStatus struct {
 
 // Workload describes a cluster resource that declares versioned images.
 type Workload struct {
-	ID     flux.ResourceID
+	ID     resource.ID
 	Status string // A status summary for display
 	// Is the controller considered read-only because it's under the
 	// control of the platform. In the case of Kubernetes, we simply
@@ -70,7 +69,7 @@ type Workload struct {
 	// resource through some mechanism (like an operator, or custom
 	// resource controller), we try to record the ID of that resource
 	// in this field.
-	Antecedent flux.ResourceID
+	Antecedent resource.ID
 	Labels     map[string]string
 	Policies   policy.Set
 	Rollout    RolloutStatus
diff --git a/cluster/kubernetes/images.go b/cluster/kubernetes/images.go
index e4fdcc912..89196fe10 100644
--- a/cluster/kubernetes/images.go
+++ b/cluster/kubernetes/images.go
@@ -11,9 +11,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/registry"
+	"github.com/weaveworks/flux/resource"
 )
 
 func mergeCredentials(log func(...interface{}) error,
@@ -145,7 +145,7 @@ func (c *Cluster) ImagesToFetch() registry.ImageCreds {
 
 			imageCreds := make(registry.ImageCreds)
 			for _, workload := range workloads {
-				logger := log.With(c.logger, "resource", flux.MakeResourceID(ns.Name, kind, workload.GetName()))
+				logger := log.With(c.logger, "resource", resource.MakeID(ns.Name, kind, workload.GetName()))
 				mergeCredentials(logger.Log, c.includeImage, c.client, ns.Name, workload.podTemplate, imageCreds, seenCreds)
 			}
 
diff --git a/cluster/kubernetes/kubernetes.go b/cluster/kubernetes/kubernetes.go
index 188f6b0d2..6547f4b91 100644
--- a/cluster/kubernetes/kubernetes.go
+++ b/cluster/kubernetes/kubernetes.go
@@ -17,11 +17,11 @@ import (
 	k8sclientdynamic "k8s.io/client-go/dynamic"
 	k8sclient "k8s.io/client-go/kubernetes"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
-	"github.com/weaveworks/flux/cluster/kubernetes/resource"
+	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	fhrclient "github.com/weaveworks/flux/integrations/client/clientset/versioned"
 	"github.com/weaveworks/flux/ssh"
+	"github.com/weaveworks/flux/resource"
 )
 
 type coreClient k8sclient.Interface
@@ -98,7 +98,7 @@ type Cluster struct {
 
 	// syncErrors keeps a record of all per-resource errors during
 	// the sync from Git repo to the cluster.
-	syncErrors   map[flux.ResourceID]error
+	syncErrors   map[resource.ID]error
 	muSyncErrors sync.RWMutex
 
 	allowedNamespaces []string
@@ -128,7 +128,7 @@ func NewCluster(client ExtendedClient, applier Applier, sshKeyRing ssh.KeyRing,
 // SomeWorkloads returns the workloads named, missing out any that don't
 // exist in the cluster or aren't in an allowed namespace.
 // They do not necessarily have to be returned in the order requested.
-func (c *Cluster) SomeWorkloads(ctx context.Context, ids []flux.ResourceID) (res []cluster.Workload, err error) {
+func (c *Cluster) SomeWorkloads(ctx context.Context, ids []resource.ID) (res []cluster.Workload, err error) {
 	var workloads []cluster.Workload
 	for _, id := range ids {
 		if !c.IsAllowedResource(id) {
@@ -192,7 +192,7 @@ func (c *Cluster) AllWorkloads(ctx context.Context, namespace string) (res []clu
 
 			for _, workload := range workloads {
 				if !isAddon(workload) {
-					id := flux.MakeResourceID(ns.Name, kind, workload.GetName())
+					id := resource.MakeID(ns.Name, kind, workload.GetName())
 					c.muSyncErrors.RLock()
 					workload.syncError = c.syncErrors[id]
 					c.muSyncErrors.RUnlock()
@@ -208,7 +208,7 @@ func (c *Cluster) AllWorkloads(ctx context.Context, namespace string) (res []clu
 func (c *Cluster) setSyncErrors(errs cluster.SyncError) {
 	c.muSyncErrors.Lock()
 	defer c.muSyncErrors.Unlock()
-	c.syncErrors = make(map[flux.ResourceID]error)
+	c.syncErrors = make(map[resource.ID]error)
 	for _, e := range errs {
 		c.syncErrors[e.ResourceID] = e.Error
 	}
@@ -317,7 +317,7 @@ func (c *Cluster) getAllowedAndExistingNamespaces(ctx context.Context) ([]apiv1.
 	return namespaces.Items, nil
 }
 
-func (c *Cluster) IsAllowedResource(id flux.ResourceID) bool {
+func (c *Cluster) IsAllowedResource(id resource.ID) bool {
 	if len(c.allowedNamespaces) == 0 {
 		// All resources are allowed when all namespaces are allowed
 		return true
@@ -326,7 +326,7 @@ func (c *Cluster) IsAllowedResource(id flux.ResourceID) bool {
 	namespace, kind, name := id.Components()
 	namespaceToCheck := namespace
 
-	if namespace == resource.ClusterScope {
+	if namespace == kresource.ClusterScope {
 		// All cluster-scoped resources (not namespaced) are allowed ...
 		if kind != "namespace" {
 			return true
diff --git a/cluster/kubernetes/manifests.go b/cluster/kubernetes/manifests.go
index 0dcf28237..26abae33b 100644
--- a/cluster/kubernetes/manifests.go
+++ b/cluster/kubernetes/manifests.go
@@ -10,7 +10,6 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/weaveworks/flux"
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/resource"
@@ -133,7 +132,7 @@ func (m *manifests) ParseManifest(def []byte, source string) (map[string]resourc
 	return result, nil
 }
 
-func (m *manifests) SetWorkloadContainerImage(def []byte, id flux.ResourceID, container string, image image.Ref) ([]byte, error) {
+func (m *manifests) SetWorkloadContainerImage(def []byte, id resource.ID, container string, image image.Ref) ([]byte, error) {
 	return updateWorkload(def, id, container, image)
 }
 
diff --git a/cluster/kubernetes/patch.go b/cluster/kubernetes/patch.go
index 808f795f5..50307e665 100644
--- a/cluster/kubernetes/patch.go
+++ b/cluster/kubernetes/patch.go
@@ -15,17 +15,17 @@ import (
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 
-	"github.com/weaveworks/flux"
-	"github.com/weaveworks/flux/cluster/kubernetes/resource"
+	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
+	"github.com/weaveworks/flux/resource"
 )
 
 func createManifestPatch(originalManifests, modifiedManifests []byte, originalSource, modifiedSource string) ([]byte, error) {
-	originalResources, err := resource.ParseMultidoc(originalManifests, originalSource)
+	originalResources, err := kresource.ParseMultidoc(originalManifests, originalSource)
 	if err != nil {
 		fmt.Errorf("cannot parse %s: %s", originalSource, err)
 	}
 
-	modifiedResources, err := resource.ParseMultidoc(modifiedManifests, modifiedSource)
+	modifiedResources, err := kresource.ParseMultidoc(modifiedManifests, modifiedSource)
 	if err != nil {
 		fmt.Errorf("cannot parse %s: %s", modifiedSource, err)
 	}
@@ -61,12 +61,12 @@ func createManifestPatch(originalManifests, modifiedManifests []byte, originalSo
 }
 
 func applyManifestPatch(originalManifests, patchManifests []byte, originalSource, patchSource string) ([]byte, error) {
-	originalResources, err := resource.ParseMultidoc(originalManifests, originalSource)
+	originalResources, err := kresource.ParseMultidoc(originalManifests, originalSource)
 	if err != nil {
 		return nil, fmt.Errorf("cannot parse %s: %s", originalSource, err)
 	}
 
-	patchResources, err := resource.ParseMultidoc(patchManifests, patchSource)
+	patchResources, err := kresource.ParseMultidoc(patchManifests, patchSource)
 	if err != nil {
 		return nil, fmt.Errorf("cannot parse %s: %s", patchSource, err)
 	}
@@ -120,7 +120,7 @@ func getFullScheme() *runtime.Scheme {
 	return fullScheme
 }
 
-func getPatch(originalManifest resource.KubeManifest, modifiedManifest resource.KubeManifest, scheme *runtime.Scheme) ([]byte, error) {
+func getPatch(originalManifest kresource.KubeManifest, modifiedManifest kresource.KubeManifest, scheme *runtime.Scheme) ([]byte, error) {
 	groupVersion, err := schema.ParseGroupVersion(originalManifest.GroupVersion())
 	if err != nil {
 		return nil, fmt.Errorf("cannot parse groupVersion %q: %s", originalManifest.GroupVersion(), err)
@@ -192,7 +192,7 @@ func addIdentifyingData(apiVersion string, kind string, name string, namespace s
 	return obj, err
 }
 
-func applyPatch(originalManifest, patchManifest resource.KubeManifest, scheme *runtime.Scheme) ([]byte, error) {
+func applyPatch(originalManifest, patchManifest kresource.KubeManifest, scheme *runtime.Scheme) ([]byte, error) {
 	groupVersion, err := schema.ParseGroupVersion(originalManifest.GroupVersion())
 	if err != nil {
 		return nil, fmt.Errorf("cannot parse groupVersion %q: %s", originalManifest.GroupVersion(), err)
@@ -227,8 +227,8 @@ func applyPatch(originalManifest, patchManifest resource.KubeManifest, scheme *r
 	return patched, nil
 }
 
-// resourceID works like Resource.ResourceID() but avoids <cluster> namespaces,
+// resourceID works like Resource.ID() but avoids <cluster> namespaces,
 // since they may be incorrect
-func resourceID(manifest resource.KubeManifest) flux.ResourceID {
-	return flux.MakeResourceID(manifest.GetNamespace(), manifest.GetKind(), manifest.GetKind())
+func resourceID(manifest kresource.KubeManifest) resource.ID {
+	return resource.MakeID(manifest.GetNamespace(), manifest.GetKind(), manifest.GetKind())
 }
diff --git a/cluster/kubernetes/policies.go b/cluster/kubernetes/policies.go
index 0136ee072..5418035d2 100644
--- a/cluster/kubernetes/policies.go
+++ b/cluster/kubernetes/policies.go
@@ -5,13 +5,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/flux"
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 )
 
-func (m *manifests) UpdateWorkloadPolicies(def []byte, id flux.ResourceID, update policy.Update) ([]byte, error) {
+func (m *manifests) UpdateWorkloadPolicies(def []byte, id resource.ID, update resource.PolicyUpdate) ([]byte, error) {
 	resources, err := m.ParseManifest(def, "stdin")
 	if err != nil {
 		return nil, err
diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
index 2438a21ec..edc33ebee 100644
--- a/cluster/kubernetes/policies_test.go
+++ b/cluster/kubernetes/policies_test.go
@@ -9,22 +9,22 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 )
 
 func TestUpdatePolicies(t *testing.T) {
 	for _, c := range []struct {
 		name    string
 		in, out []string
-		update  policy.Update
+		update  resource.PolicyUpdate
 		wantErr bool
 	}{
 		{
 			name: "adding annotation with others existing",
 			in:   []string{"prometheus.io.scrape", "'false'"},
 			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/automated", "'true'"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -32,7 +32,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "adding annotation when already has annotation",
 			in:   []string{"flux.weave.works/automated", "'true'"},
 			out:  []string{"flux.weave.works/automated", "'true'"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -40,7 +40,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "adding annotation when already has annotation and others",
 			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
 			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -48,7 +48,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "adding first annotation",
 			in:   nil,
 			out:  []string{"flux.weave.works/automated", "'true'"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -56,7 +56,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add and remove different annotations at the same time",
 			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
 			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/locked", "'true'"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Automated: "true"},
 			},
@@ -65,7 +65,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "remove overrides add for same key",
 			in:   nil,
 			out:  nil,
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Locked: "true"},
 			},
@@ -74,7 +74,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "remove annotation with others existing",
 			in:   []string{"flux.weave.works/automated", "true", "prometheus.io.scrape", "false"},
 			out:  []string{"prometheus.io.scrape", "false"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -82,7 +82,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "remove last annotation",
 			in:   []string{"flux.weave.works/automated", "true"},
 			out:  nil,
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -90,7 +90,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "remove annotation with no annotations",
 			in:   nil,
 			out:  nil,
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -98,7 +98,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "remove annotation with only others",
 			in:   []string{"prometheus.io.scrape", "false"},
 			out:  []string{"prometheus.io.scrape", "false"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
 		},
@@ -106,7 +106,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "multiline",
 			in:   []string{"flux.weave.works/locked_msg", "|-\n      first\n      second"},
 			out:  nil,
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.LockedMsg: "foo"},
 			},
 		},
@@ -114,7 +114,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "multiline with empty line",
 			in:   []string{"flux.weave.works/locked_msg", "|-\n      first\n\n      third"},
 			out:  nil,
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.LockedMsg: "foo"},
 			},
 		},
@@ -122,7 +122,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "glob:*"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "glob:*"},
 			},
 		},
@@ -130,7 +130,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add non-glob tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "foo"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "foo"},
 			},
 		},
@@ -138,7 +138,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add semver tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "semver:*"},
 			},
 		},
@@ -146,7 +146,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add invalid semver tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "semver:invalid"},
 			},
 			wantErr: true,
@@ -155,7 +155,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add regexp tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "regexp:(.*?)"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "regexp:(.*?)"},
 			},
 		},
@@ -163,7 +163,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "add invalid regexp tag policy",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "regexp:(.*?)"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "regexp:*"},
 			},
 			wantErr: true,
@@ -172,7 +172,7 @@ func TestUpdatePolicies(t *testing.T) {
 			name: "set tag to all containers",
 			in:   nil,
 			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
-			update: policy.Update{
+			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagAll: "semver:*"},
 			},
 		},
@@ -180,7 +180,7 @@ func TestUpdatePolicies(t *testing.T) {
 		t.Run(c.name, func(t *testing.T) {
 			caseIn := templToString(t, annotationsTemplate, c.in)
 			caseOut := templToString(t, annotationsTemplate, c.out)
-			resourceID := flux.MustParseResourceID("default:deployment/nginx")
+			resourceID := resource.MustParseID("default:deployment/nginx")
 			manifests := NewManifests(ConstNamespacer("default"), log.NewLogfmtLogger(os.Stdout))
 			out, err := manifests.UpdateWorkloadPolicies([]byte(caseIn), resourceID, c.update)
 			assert.Equal(t, c.wantErr, err != nil, "unexpected error value: %s", err)
@@ -192,8 +192,8 @@ func TestUpdatePolicies(t *testing.T) {
 }
 
 func TestUpdatePolicies_invalidTagPattern(t *testing.T) {
-	resourceID := flux.MustParseResourceID("default:deployment/nginx")
-	update := policy.Update{
+	resourceID := resource.MustParseID("default:deployment/nginx")
+	update := resource.PolicyUpdate{
 		Add: policy.Set{policy.TagPrefix("nginx"): "semver:invalid"},
 	}
 	_, err := (&manifests{}).UpdateWorkloadPolicies(nil, resourceID, update)
diff --git a/cluster/kubernetes/resource/load_test.go b/cluster/kubernetes/resource/load_test.go
index ffffbe79f..9d42dcdb3 100644
--- a/cluster/kubernetes/resource/load_test.go
+++ b/cluster/kubernetes/resource/load_test.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
 	"github.com/weaveworks/flux/resource"
 )
@@ -211,9 +210,9 @@ items:
 	if len(list.Items) != 2 {
 		t.Fatalf("expected two items, got %+v", list.Items)
 	}
-	for i, id := range []flux.ResourceID{
-		flux.MustParseResourceID("ns:deployment/foo"),
-		flux.MustParseResourceID("ns:service/bar")} {
+	for i, id := range []resource.ID{
+		resource.MustParseID("ns:deployment/foo"),
+		resource.MustParseID("ns:service/bar")} {
 		if list.Items[i].ResourceID() != id {
 			t.Errorf("At %d, expected %q, got %q", i, id, list.Items[i].ResourceID())
 		}
@@ -246,9 +245,9 @@ items:
 	if len(list.Items) != 2 {
 		t.Fatalf("expected two items, got %+v", list.Items)
 	}
-	for i, id := range []flux.ResourceID{
-		flux.MustParseResourceID("ns:deployment/foo"),
-		flux.MustParseResourceID("ns:deployment/bar")} {
+	for i, id := range []resource.ID{
+		resource.MustParseID("ns:deployment/foo"),
+		resource.MustParseID("ns:deployment/bar")} {
 		if list.Items[i].ResourceID() != id {
 			t.Errorf("At %d, expected %q, got %q", i, id, list.Items[i].ResourceID())
 		}
diff --git a/cluster/kubernetes/resource/resource.go b/cluster/kubernetes/resource/resource.go
index 4599a9a1b..2a010dec7 100644
--- a/cluster/kubernetes/resource/resource.go
+++ b/cluster/kubernetes/resource/resource.go
@@ -3,9 +3,8 @@ package resource
 import (
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 
-	"github.com/weaveworks/flux"
 	fluxerr "github.com/weaveworks/flux/errors"
 	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
@@ -65,12 +64,12 @@ func (o baseObject) GetName() string {
 	return o.Meta.Name
 }
 
-func (o baseObject) ResourceID() flux.ResourceID {
+func (o baseObject) ResourceID() resource.ID {
 	ns := o.Meta.Namespace
 	if ns == "" {
 		ns = ClusterScope
 	}
-	return flux.MakeResourceID(ns, o.Kind, o.Meta.Name)
+	return resource.MakeID(ns, o.Kind, o.Meta.Name)
 }
 
 // SetNamespace implements KubeManifest.SetNamespace, so things with
diff --git a/cluster/kubernetes/resourcekinds.go b/cluster/kubernetes/resourcekinds.go
index a7416c64f..9905b7733 100644
--- a/cluster/kubernetes/resourcekinds.go
+++ b/cluster/kubernetes/resourcekinds.go
@@ -9,7 +9,6 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	"github.com/weaveworks/flux/image"
@@ -24,7 +23,7 @@ import (
 // FluxHelmRelease. We use this rather than the `OwnerReference` type
 // built into Kubernetes so that there are no garbage-collection
 // implications. The value is expected to be a serialised
-// `flux.ResourceID`.
+// `resource.ID`.
 const AntecedentAnnotation = "flux.weave.works/antecedent"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -56,7 +55,7 @@ type workload struct {
 	podTemplate apiv1.PodTemplateSpec
 }
 
-func (w workload) toClusterWorkload(resourceID flux.ResourceID) cluster.Workload {
+func (w workload) toClusterWorkload(resourceID resource.ID) cluster.Workload {
 	var clusterContainers []resource.Container
 	var excuse string
 	for _, container := range w.podTemplate.Spec.Containers {
@@ -78,9 +77,9 @@ func (w workload) toClusterWorkload(resourceID flux.ResourceID) cluster.Workload
 		clusterContainers = append(clusterContainers, resource.Container{Name: container.Name, Image: ref})
 	}
 
-	var antecedent flux.ResourceID
+	var antecedent resource.ID
 	if ante, ok := w.GetAnnotations()[AntecedentAnnotation]; ok {
-		id, err := flux.ParseResourceID(ante)
+		id, err := resource.ParseID(ante)
 		if err == nil {
 			antecedent = id
 		}
diff --git a/cluster/kubernetes/sync.go b/cluster/kubernetes/sync.go
index 502de85fe..33a70e3f0 100644
--- a/cluster/kubernetes/sync.go
+++ b/cluster/kubernetes/sync.go
@@ -25,7 +25,6 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	"github.com/weaveworks/flux/policy"
@@ -169,14 +168,14 @@ type kuberesource struct {
 	namespaced bool
 }
 
-// ResourceID returns the ResourceID for this resource loaded from the
+// ResourceID returns the ID for this resource loaded from the
 // cluster.
-func (r *kuberesource) ResourceID() flux.ResourceID {
+func (r *kuberesource) ResourceID() resource.ID {
 	ns, kind, name := r.obj.GetNamespace(), r.obj.GetKind(), r.obj.GetName()
 	if !r.namespaced {
 		ns = kresource.ClusterScope
 	}
-	return flux.MakeResourceID(ns, kind, name)
+	return resource.MakeID(ns, kind, name)
 }
 
 // Bytes returns a byte slice description, including enough info to
@@ -368,7 +367,7 @@ func makeGCMark(syncSetName, resourceID string) string {
 // --- internal types for keeping track of syncing
 
 type applyObject struct {
-	ResourceID flux.ResourceID
+	ResourceID resource.ID
 	Source     string
 	Payload    []byte
 }
@@ -381,13 +380,13 @@ func makeChangeSet() changeSet {
 	return changeSet{objs: make(map[string][]applyObject)}
 }
 
-func (c *changeSet) stage(cmd string, id flux.ResourceID, source string, bytes []byte) {
+func (c *changeSet) stage(cmd string, id resource.ID, source string, bytes []byte) {
 	c.objs[cmd] = append(c.objs[cmd], applyObject{id, source, bytes})
 }
 
 // Applier is something that will apply a changeset to the cluster.
 type Applier interface {
-	apply(log.Logger, changeSet, map[flux.ResourceID]error) cluster.SyncError
+	apply(log.Logger, changeSet, map[resource.ID]error) cluster.SyncError
 }
 
 type Kubectl struct {
@@ -472,7 +471,7 @@ func (objs applyOrder) Less(i, j int) bool {
 	return ranki < rankj
 }
 
-func (c *Kubectl) apply(logger log.Logger, cs changeSet, errored map[flux.ResourceID]error) (errs cluster.SyncError) {
+func (c *Kubectl) apply(logger log.Logger, cs changeSet, errored map[resource.ID]error) (errs cluster.SyncError) {
 	f := func(objs []applyObject, cmd string, args ...string) {
 		if len(objs) == 0 {
 			return
diff --git a/cluster/kubernetes/sync_test.go b/cluster/kubernetes/sync_test.go
index e83e297fd..349d019bc 100644
--- a/cluster/kubernetes/sync_test.go
+++ b/cluster/kubernetes/sync_test.go
@@ -9,26 +9,21 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/go-kit/kit/log"
+	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
+	crdfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	//	"k8s.io/apimachinery/pkg/runtime/serializer"
-	//	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/client-go/dynamic"
-	//	dynamicfake "k8s.io/client-go/dynamic/fake"
-	//	k8sclient "k8s.io/client-go/kubernetes"
-	"github.com/stretchr/testify/assert"
-	crdfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	"k8s.io/client-go/discovery"
+	"k8s.io/client-go/dynamic"
 	dynamicfake "k8s.io/client-go/dynamic/fake"
 	k8sclient "k8s.io/client-go/kubernetes"
 	corefake "k8s.io/client-go/kubernetes/fake"
 	k8s_testing "k8s.io/client-go/testing"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	fluxfake "github.com/weaveworks/flux/integrations/client/clientset/versioned/fake"
@@ -116,7 +111,7 @@ func groupVersionResource(res *unstructured.Unstructured) schema.GroupVersionRes
 	return schema.GroupVersionResource{Group: gvk.Group, Version: gvk.Version, Resource: strings.ToLower(gvk.Kind) + "s"}
 }
 
-func (a fakeApplier) apply(_ log.Logger, cs changeSet, errored map[flux.ResourceID]error) cluster.SyncError {
+func (a fakeApplier) apply(_ log.Logger, cs changeSet, errored map[resource.ID]error) cluster.SyncError {
 	var errs []cluster.ResourceError
 
 	operate := func(obj applyObject, cmd string) {
@@ -730,9 +725,9 @@ spec:
 // TestApplyOrder checks that applyOrder works as expected.
 func TestApplyOrder(t *testing.T) {
 	objs := []applyObject{
-		{ResourceID: flux.MakeResourceID("test", "Deployment", "deploy")},
-		{ResourceID: flux.MakeResourceID("test", "Secret", "secret")},
-		{ResourceID: flux.MakeResourceID("", "Namespace", "namespace")},
+		{ResourceID: resource.MakeID("test", "Deployment", "deploy")},
+		{ResourceID: resource.MakeID("test", "Secret", "secret")},
+		{ResourceID: resource.MakeID("", "Namespace", "namespace")},
 	}
 	sort.Sort(applyOrder(objs))
 	for i, name := range []string{"namespace", "secret", "deploy"} {
diff --git a/cluster/kubernetes/testfiles/data.go b/cluster/kubernetes/testfiles/data.go
index b47ce105c..3504bd3f2 100644
--- a/cluster/kubernetes/testfiles/data.go
+++ b/cluster/kubernetes/testfiles/data.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 )
 
 func TempDir(t *testing.T) (string, func()) {
@@ -44,30 +44,30 @@ func WriteTestFiles(dir string) error {
 
 // ResourceMap is the map of resource names to relative paths, which
 // must correspond with `Files` below.
-var ResourceMap = map[flux.ResourceID]string{
-	flux.MustParseResourceID("default:deployment/helloworld"):     "helloworld-deploy.yaml",
-	flux.MustParseResourceID("default:deployment/locked-service"): "locked-service-deploy.yaml",
-	flux.MustParseResourceID("default:deployment/test-service"):   "test/test-service-deploy.yaml",
-	flux.MustParseResourceID("default:deployment/multi-deploy"):   "multi.yaml",
-	flux.MustParseResourceID("default:service/multi-service"):     "multi.yaml",
-	flux.MustParseResourceID("default:deployment/list-deploy"):    "list.yaml",
-	flux.MustParseResourceID("default:service/list-service"):      "list.yaml",
-	flux.MustParseResourceID("default:deployment/semver"):         "semver-deploy.yaml",
-	flux.MustParseResourceID("default:daemonset/init"):            "init.yaml",
+var ResourceMap = map[resource.ID]string{
+	resource.MustParseID("default:deployment/helloworld"):     "helloworld-deploy.yaml",
+	resource.MustParseID("default:deployment/locked-service"): "locked-service-deploy.yaml",
+	resource.MustParseID("default:deployment/test-service"):   "test/test-service-deploy.yaml",
+	resource.MustParseID("default:deployment/multi-deploy"):   "multi.yaml",
+	resource.MustParseID("default:service/multi-service"):     "multi.yaml",
+	resource.MustParseID("default:deployment/list-deploy"):    "list.yaml",
+	resource.MustParseID("default:service/list-service"):      "list.yaml",
+	resource.MustParseID("default:deployment/semver"):         "semver-deploy.yaml",
+	resource.MustParseID("default:daemonset/init"):            "init.yaml",
 }
 
 // WorkloadMap ... given a base path, construct the map representing
 // the services given in the test data. Must be kept in sync with
 // `Files` below. TODO(michael): derive from ResourceMap, or similar.
-func WorkloadMap(dir string) map[flux.ResourceID][]string {
-	return map[flux.ResourceID][]string{
-		flux.MustParseResourceID("default:deployment/helloworld"):     []string{filepath.Join(dir, "helloworld-deploy.yaml")},
-		flux.MustParseResourceID("default:deployment/locked-service"): []string{filepath.Join(dir, "locked-service-deploy.yaml")},
-		flux.MustParseResourceID("default:deployment/test-service"):   []string{filepath.Join(dir, "test/test-service-deploy.yaml")},
-		flux.MustParseResourceID("default:deployment/multi-deploy"):   []string{filepath.Join(dir, "multi.yaml")},
-		flux.MustParseResourceID("default:deployment/list-deploy"):    []string{filepath.Join(dir, "list.yaml")},
-		flux.MustParseResourceID("default:deployment/semver"):         []string{filepath.Join(dir, "semver-deploy.yaml")},
-		flux.MustParseResourceID("default:daemonset/init"):            []string{filepath.Join(dir, "init.yaml")},
+func WorkloadMap(dir string) map[resource.ID][]string {
+	return map[resource.ID][]string{
+		resource.MustParseID("default:deployment/helloworld"):     []string{filepath.Join(dir, "helloworld-deploy.yaml")},
+		resource.MustParseID("default:deployment/locked-service"): []string{filepath.Join(dir, "locked-service-deploy.yaml")},
+		resource.MustParseID("default:deployment/test-service"):   []string{filepath.Join(dir, "test/test-service-deploy.yaml")},
+		resource.MustParseID("default:deployment/multi-deploy"):   []string{filepath.Join(dir, "multi.yaml")},
+		resource.MustParseID("default:deployment/list-deploy"):    []string{filepath.Join(dir, "list.yaml")},
+		resource.MustParseID("default:deployment/semver"):         []string{filepath.Join(dir, "semver-deploy.yaml")},
+		resource.MustParseID("default:daemonset/init"):            []string{filepath.Join(dir, "init.yaml")},
 	}
 }
 
diff --git a/cluster/kubernetes/update.go b/cluster/kubernetes/update.go
index d2ac4debf..eb9a1fdc8 100644
--- a/cluster/kubernetes/update.go
+++ b/cluster/kubernetes/update.go
@@ -3,8 +3,8 @@ package kubernetes
 import (
 	"strings"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
+	"github.com/weaveworks/flux/resource"
 )
 
 // updateWorkload takes a YAML document stream (one or more YAML
@@ -12,7 +12,7 @@ import (
 // container name, and the name of the new image that should be used
 // for the container. It returns a new YAML stream where the image for
 // the container has been replaced with the imageRef supplied.
-func updateWorkload(in []byte, resource flux.ResourceID, container string, newImageID image.Ref) ([]byte, error) {
+func updateWorkload(in []byte, resource resource.ID, container string, newImageID image.Ref) ([]byte, error) {
 	namespace, kind, name := resource.Components()
 	if _, ok := resourceKinds[strings.ToLower(kind)]; !ok {
 		return nil, UpdateNotSupportedError(kind)
diff --git a/cluster/kubernetes/update_test.go b/cluster/kubernetes/update_test.go
index caacf09ea..ea2ed46e8 100644
--- a/cluster/kubernetes/update_test.go
+++ b/cluster/kubernetes/update_test.go
@@ -3,8 +3,8 @@ package kubernetes
 import (
 	"testing"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
+	"github.com/weaveworks/flux/resource"
 )
 
 type update struct {
@@ -25,7 +25,7 @@ func testUpdate(t *testing.T, u update) {
 	for _, container := range u.containers {
 		var out []byte
 		var err error
-		if out, err = updateWorkload([]byte(manifest), flux.MustParseResourceID(u.resourceID), container, id); err != nil {
+		if out, err = updateWorkload([]byte(manifest), resource.MustParseID(u.resourceID), container, id); err != nil {
 			t.Errorf("Failed: %s", err.Error())
 			return
 		}
diff --git a/cluster/mock/mock.go b/cluster/mock/mock.go
index a16633fd0..96aba0406 100644
--- a/cluster/mock/mock.go
+++ b/cluster/mock/mock.go
@@ -4,11 +4,9 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/manifests"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/ssh"
 )
@@ -16,16 +14,16 @@ import (
 // Doubles as a cluster.Cluster and cluster.Manifests implementation
 type Mock struct {
 	AllWorkloadsFunc              func(ctx context.Context, maybeNamespace string) ([]cluster.Workload, error)
-	SomeWorkloadsFunc             func(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error)
-	IsAllowedResourceFunc         func(flux.ResourceID) bool
+	SomeWorkloadsFunc             func(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error)
+	IsAllowedResourceFunc         func(resource.ID) bool
 	PingFunc                      func() error
 	ExportFunc                    func(ctx context.Context) ([]byte, error)
 	SyncFunc                      func(cluster.SyncSet) error
 	PublicSSHKeyFunc              func(regenerate bool) (ssh.PublicKey, error)
-	SetWorkloadContainerImageFunc func(def []byte, id flux.ResourceID, container string, newImageID image.Ref) ([]byte, error)
+	SetWorkloadContainerImageFunc func(def []byte, id resource.ID, container string, newImageID image.Ref) ([]byte, error)
 	LoadManifestsFunc             func(base string, paths []string) (map[string]resource.Resource, error)
 	ParseManifestFunc             func(def []byte, source string) (map[string]resource.Resource, error)
-	UpdateWorkloadPoliciesFunc    func([]byte, flux.ResourceID, policy.Update) ([]byte, error)
+	UpdateWorkloadPoliciesFunc    func([]byte, resource.ID, resource.PolicyUpdate) ([]byte, error)
 	CreateManifestPatchFunc       func(originalManifests, modifiedManifests []byte, originalSource, modifiedSource string) ([]byte, error)
 	ApplyManifestPatchFunc        func(originalManifests, patch []byte, originalSource, patchSource string) ([]byte, error)
 	AppendManifestToBufferFunc    func([]byte, *bytes.Buffer) error
@@ -38,11 +36,11 @@ func (m *Mock) AllWorkloads(ctx context.Context, maybeNamespace string) ([]clust
 	return m.AllWorkloadsFunc(ctx, maybeNamespace)
 }
 
-func (m *Mock) SomeWorkloads(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error) {
+func (m *Mock) SomeWorkloads(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error) {
 	return m.SomeWorkloadsFunc(ctx, ids)
 }
 
-func (m *Mock) IsAllowedResource(id flux.ResourceID) bool {
+func (m *Mock) IsAllowedResource(id resource.ID) bool {
 	return m.IsAllowedResourceFunc(id)
 }
 
@@ -62,7 +60,7 @@ func (m *Mock) PublicSSHKey(regenerate bool) (ssh.PublicKey, error) {
 	return m.PublicSSHKeyFunc(regenerate)
 }
 
-func (m *Mock) SetWorkloadContainerImage(def []byte, id flux.ResourceID, container string, newImageID image.Ref) ([]byte, error) {
+func (m *Mock) SetWorkloadContainerImage(def []byte, id resource.ID, container string, newImageID image.Ref) ([]byte, error) {
 	return m.SetWorkloadContainerImageFunc(def, id, container, newImageID)
 }
 
@@ -74,7 +72,7 @@ func (m *Mock) ParseManifest(def []byte, source string) (map[string]resource.Res
 	return m.ParseManifestFunc(def, source)
 }
 
-func (m *Mock) UpdateWorkloadPolicies(def []byte, id flux.ResourceID, p policy.Update) ([]byte, error) {
+func (m *Mock) UpdateWorkloadPolicies(def []byte, id resource.ID, p resource.PolicyUpdate) ([]byte, error) {
 	return m.UpdateWorkloadPoliciesFunc(def, id, p)
 }
 
diff --git a/cluster/sync.go b/cluster/sync.go
index ebe3aab9e..2638302d4 100644
--- a/cluster/sync.go
+++ b/cluster/sync.go
@@ -3,7 +3,6 @@ package cluster
 import (
 	"strings"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/resource"
 )
 
@@ -22,7 +21,7 @@ type SyncSet struct {
 }
 
 type ResourceError struct {
-	ResourceID flux.ResourceID
+	ResourceID resource.ID
 	Source     string
 	Error      error
 }
diff --git a/cmd/fluxctl/args.go b/cmd/fluxctl/args.go
index 2c864c523..b1fc7916b 100644
--- a/cmd/fluxctl/args.go
+++ b/cmd/fluxctl/args.go
@@ -3,9 +3,9 @@ package main
 import (
 	"bytes"
 	"fmt"
-        "io/ioutil"
+	"io/ioutil"
 	"os/exec"
-        "strings"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -35,6 +35,7 @@ func getCommitAuthor() string {
 }
 
 var execCommand = exec.Command
+
 func getUserGitConfigValue(arg string) string {
 	var out bytes.Buffer
 	cmd := execCommand("git", "config", "--get", "--null", arg)
diff --git a/cmd/fluxctl/args_test.go b/cmd/fluxctl/args_test.go
index 1c634f964..9b6385daf 100644
--- a/cmd/fluxctl/args_test.go
+++ b/cmd/fluxctl/args_test.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-        "fmt"
-	"testing"
+	"fmt"
 	"os"
 	"os/exec"
+	"testing"
 )
 
 func helperCommand(command string, s ...string) (cmd *exec.Cmd) {
@@ -21,7 +21,6 @@ func TestHelperProcess(t *testing.T) {
 	}
 	defer os.Exit(0)
 
-
 	args := os.Args
 	for len(args) > 0 {
 		if args[0] == "--" {
@@ -35,18 +34,18 @@ func TestHelperProcess(t *testing.T) {
 	}
 
 	_, args = args[0], args[1:]
-        for _, a := range args {
-            if a == "user.name" {
-    		fmt.Fprintf(os.Stdout, "Jane Doe")
-            } else if a == "user.email" {
-    		fmt.Fprintf(os.Stdout, "jd@j.d")
-            }
-        }
+	for _, a := range args {
+		if a == "user.name" {
+			fmt.Fprintf(os.Stdout, "Jane Doe")
+		} else if a == "user.email" {
+			fmt.Fprintf(os.Stdout, "jd@j.d")
+		}
+	}
 }
 
 func checkAuthor(t *testing.T, input string, expected string) {
-    	execCommand = helperCommand
-    	defer func(){ execCommand = exec.Command }()
+	execCommand = helperCommand
+	defer func() { execCommand = exec.Command }()
 	author := getUserGitConfigValue(input)
 	if author != expected {
 		t.Fatalf("author %q does not match expected value %q", author, expected)
diff --git a/cmd/fluxctl/list_images_cmd.go b/cmd/fluxctl/list_images_cmd.go
index 5fbbba7d6..07b5ed9d2 100644
--- a/cmd/fluxctl/list_images_cmd.go
+++ b/cmd/fluxctl/list_images_cmd.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v6"
 	"github.com/weaveworks/flux/registry"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -64,7 +64,7 @@ func (opts *imageListOpts) RunE(cmd *cobra.Command, args []string) error {
 		opts.workload = opts.controller
 	}
 	if len(opts.workload) > 0 {
-		id, err := flux.ParseResourceIDOptionalNamespace(opts.namespace, opts.workload)
+		id, err := resource.ParseIDOptionalNamespace(opts.namespace, opts.workload)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/fluxctl/policy_cmd.go b/cmd/fluxctl/policy_cmd.go
index ba871186b..64d6f5f6f 100644
--- a/cmd/fluxctl/policy_cmd.go
+++ b/cmd/fluxctl/policy_cmd.go
@@ -6,8 +6,9 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/weaveworks/flux"
+
 	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -97,7 +98,7 @@ func (opts *workloadPolicyOpts) RunE(cmd *cobra.Command, args []string) error {
 		return newUsageError("lock and unlock both specified")
 	}
 
-	resourceID, err := flux.ParseResourceIDOptionalNamespace(opts.namespace, opts.workload)
+	resourceID, err := resource.ParseIDOptionalNamespace(opts.namespace, opts.workload)
 	if err != nil {
 		return err
 	}
@@ -108,7 +109,7 @@ func (opts *workloadPolicyOpts) RunE(cmd *cobra.Command, args []string) error {
 	}
 
 	ctx := context.Background()
-	updates := policy.Updates{
+	updates := resource.PolicyUpdates{
 		resourceID: changes,
 	}
 	jobID, err := opts.API.UpdateManifests(ctx, update.Spec{
@@ -122,7 +123,7 @@ func (opts *workloadPolicyOpts) RunE(cmd *cobra.Command, args []string) error {
 	return await(ctx, cmd.OutOrStdout(), cmd.OutOrStderr(), opts.API, jobID, false, opts.verbosity)
 }
 
-func calculatePolicyChanges(opts *workloadPolicyOpts) (policy.Update, error) {
+func calculatePolicyChanges(opts *workloadPolicyOpts) (resource.PolicyUpdate, error) {
 	add := policy.Set{}
 	if opts.automate {
 		add = add.Add(policy.Automated)
@@ -153,7 +154,7 @@ func calculatePolicyChanges(opts *workloadPolicyOpts) (policy.Update, error) {
 	for _, tagPair := range opts.tags {
 		parts := strings.Split(tagPair, "=")
 		if len(parts) != 2 {
-			return policy.Update{}, fmt.Errorf("invalid container/tag pair: %q. Expected format is 'container=filter'", tagPair)
+			return resource.PolicyUpdate{}, fmt.Errorf("invalid container/tag pair: %q. Expected format is 'container=filter'", tagPair)
 		}
 
 		container, tag := parts[0], parts[1]
@@ -164,7 +165,7 @@ func calculatePolicyChanges(opts *workloadPolicyOpts) (policy.Update, error) {
 		}
 	}
 
-	return policy.Update{
+	return resource.PolicyUpdate{
 		Add:    add,
 		Remove: remove,
 	}, nil
diff --git a/cmd/fluxctl/release_cmd.go b/cmd/fluxctl/release_cmd.go
index 4be590747..93d8f8916 100644
--- a/cmd/fluxctl/release_cmd.go
+++ b/cmd/fluxctl/release_cmd.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api/v11"
 	"github.com/weaveworks/flux/api/v6"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/job"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -103,7 +103,7 @@ func (opts *workloadReleaseOpts) RunE(cmd *cobra.Command, args []string) error {
 		workloads = []update.ResourceSpec{update.ResourceSpecAll}
 	} else {
 		for _, workload := range opts.workloads {
-			id, err := flux.ParseResourceIDOptionalNamespace(opts.namespace, workload)
+			id, err := resource.ParseIDOptionalNamespace(opts.namespace, workload)
 			if err != nil {
 				return err
 			}
@@ -130,9 +130,9 @@ func (opts *workloadReleaseOpts) RunE(cmd *cobra.Command, args []string) error {
 		kind = update.ReleaseKindPlan
 	}
 
-	var excludes []flux.ResourceID
+	var excludes []resource.ID
 	for _, exclude := range opts.exclude {
-		s, err := flux.ParseResourceIDOptionalNamespace(opts.namespace, exclude)
+		s, err := resource.ParseIDOptionalNamespace(opts.namespace, exclude)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/fluxctl/release_cmd_test.go b/cmd/fluxctl/release_cmd_test.go
index 472320488..3eb72ff26 100644
--- a/cmd/fluxctl/release_cmd_test.go
+++ b/cmd/fluxctl/release_cmd_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -38,9 +38,9 @@ func TestReleaseCommand_CLIConversion(t *testing.T) {
 			ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 			ImageSpec:    update.ImageSpecLatest,
 			Kind:         update.ReleaseKindExecute,
-			Excludes: []flux.ResourceID{
-				flux.MustParseResourceID("default:deployment/test"),
-				flux.MustParseResourceID("default:deployment/yeah"),
+			Excludes: []resource.ID{
+				resource.MustParseID("default:deployment/test"),
+				resource.MustParseID("default:deployment/yeah"),
 			},
 		}},
 	} {
diff --git a/daemon/daemon.go b/daemon/daemon.go
index eee5991b4..e7189ea2a 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -11,7 +11,6 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v11"
@@ -199,7 +198,7 @@ func (d *Daemon) ListImagesWithOptions(ctx context.Context, opts v10.ListImagesO
 		if err != nil {
 			return nil, errors.Wrap(err, "treating workload spec as ID")
 		}
-		workloads, err = d.Cluster.SomeWorkloads(ctx, []flux.ResourceID{id})
+		workloads, err = d.Cluster.SomeWorkloads(ctx, []resource.ID{id})
 		if err != nil {
 			return nil, errors.Wrap(err, "getting some workloads")
 		}
@@ -290,7 +289,7 @@ func (d *Daemon) makeLoggingJobFunc(f jobFunc) jobFunc {
 		}
 		logger.Log("revision", result.Revision)
 		if result.Revision != "" {
-			var workloadIDs []flux.ResourceID
+			var workloadIDs []resource.ID
 			for id, result := range result.Result {
 				if result.Status == update.ReleaseStatusSuccess {
 					workloadIDs = append(workloadIDs, id)
@@ -350,7 +349,7 @@ func (d *Daemon) UpdateManifests(ctx context.Context, spec update.Spec) (job.ID,
 			return id, err
 		}
 		return d.queueJob(d.makeLoggingJobFunc(d.makeJobFromUpdate(d.release(spec, s)))), nil
-	case policy.Updates:
+	case resource.PolicyUpdates:
 		return d.queueJob(d.makeLoggingJobFunc(d.makeJobFromUpdate(d.updatePolicies(spec, s)))), nil
 	case update.ManualSync:
 		return d.queueJob(d.sync()), nil
@@ -390,10 +389,10 @@ func (d *Daemon) sync() jobFunc {
 	}
 }
 
-func (d *Daemon) updatePolicies(spec update.Spec, updates policy.Updates) updateFunc {
+func (d *Daemon) updatePolicies(spec update.Spec, updates resource.PolicyUpdates) updateFunc {
 	return func(ctx context.Context, jobID job.ID, working *git.Checkout, logger log.Logger) (job.Result, error) {
 		// For each update
-		var workloadIDs []flux.ResourceID
+		var workloadIDs []resource.ID
 		result := job.Result{
 			Spec:   &spec,
 			Result: update.Result{},
@@ -704,7 +703,7 @@ func getWorkloadContainers(workload cluster.Workload, imageRepos update.ImageRep
 	return res, nil
 }
 
-func policyCommitMessage(us policy.Updates, cause update.Cause) string {
+func policyCommitMessage(us resource.PolicyUpdates, cause update.Cause) string {
 	// shortcut, since we want roughly the same information
 	events := policyEvents(us, time.Now())
 	commitMsg := &bytes.Buffer{}
@@ -727,14 +726,14 @@ func policyCommitMessage(us policy.Updates, cause update.Cause) string {
 // policyEvents builds a map of events (by type), for all the events in this set of
 // updates. There will be one event per type, containing all workload ids
 // affected by that event. e.g. all automated workload will share an event.
-func policyEvents(us policy.Updates, now time.Time) map[string]event.Event {
+func policyEvents(us resource.PolicyUpdates, now time.Time) map[string]event.Event {
 	eventsByType := map[string]event.Event{}
 	for workloadID, update := range us {
 		for _, eventType := range policyEventTypes(update) {
 			e, ok := eventsByType[eventType]
 			if !ok {
 				e = event.Event{
-					ServiceIDs: []flux.ResourceID{},
+					ServiceIDs: []resource.ID{},
 					Type:       eventType,
 					StartedAt:  now,
 					EndedAt:    now,
@@ -749,7 +748,7 @@ func policyEvents(us policy.Updates, now time.Time) map[string]event.Event {
 }
 
 // policyEventTypes is a deduped list of all event types this update contains
-func policyEventTypes(u policy.Update) []string {
+func policyEventTypes(u resource.PolicyUpdate) []string {
 	types := map[string]struct{}{}
 	for p := range u.Add {
 		switch {
diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go
index bf27c521d..3333b6938 100644
--- a/daemon/daemon_test.go
+++ b/daemon/daemon_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v11"
 	"github.com/weaveworks/flux/api/v6"
@@ -156,7 +155,7 @@ func TestDaemon_ListWorkloadsWithOptions(t *testing.T) {
 	t.Run("filter id", func(t *testing.T) {
 		s, err := d.ListServicesWithOptions(ctx, v11.ListServicesOptions{
 			Namespace: "",
-			Services:  []flux.ResourceID{flux.MustParseResourceID(wl)}})
+			Services:  []resource.ID{resource.MustParseID(wl)}})
 		if err != nil {
 			t.Fatalf("Error: %s", err.Error())
 		}
@@ -168,7 +167,7 @@ func TestDaemon_ListWorkloadsWithOptions(t *testing.T) {
 	t.Run("filter id and namespace", func(t *testing.T) {
 		_, err := d.ListServicesWithOptions(ctx, v11.ListServicesOptions{
 			Namespace: "foo",
-			Services:  []flux.ResourceID{flux.MustParseResourceID(wl)}})
+			Services:  []resource.ID{resource.MustParseID(wl)}})
 		if err == nil {
 			t.Fatal("Expected error but got nil")
 		}
@@ -177,7 +176,7 @@ func TestDaemon_ListWorkloadsWithOptions(t *testing.T) {
 	t.Run("filter unsupported id kind", func(t *testing.T) {
 		_, err := d.ListServicesWithOptions(ctx, v11.ListServicesOptions{
 			Namespace: "foo",
-			Services:  []flux.ResourceID{flux.MustParseResourceID("default:unsupportedkind/goodbyeworld")}})
+			Services:  []resource.ID{resource.MustParseID("default:unsupportedkind/goodbyeworld")}})
 		if err == nil {
 			t.Fatal("Expected error but got nil")
 		}
@@ -195,7 +194,7 @@ func TestDaemon_ListImagesWithOptions(t *testing.T) {
 	specAll := update.ResourceSpec(update.ResourceSpecAll)
 
 	// Service 1
-	svcID, err := flux.ParseResourceID(wl)
+	svcID, err := resource.ParseID(wl)
 	assert.NoError(t, err)
 	currentImageRef, err := image.ParseRef(currentHelloImage)
 	assert.NoError(t, err)
@@ -205,7 +204,7 @@ func TestDaemon_ListImagesWithOptions(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Service 2
-	anotherSvcID, err := flux.ParseResourceID(anotherWl)
+	anotherSvcID, err := resource.ParseID(anotherWl)
 	assert.NoError(t, err)
 	anotherImageRef, err := image.ParseRef(anotherImage)
 	assert.NoError(t, err)
@@ -577,7 +576,7 @@ func TestDaemon_Automated(t *testing.T) {
 	w := newWait(t)
 
 	workload := cluster.Workload{
-		ID: flux.MakeResourceID(ns, "deployment", "helloworld"),
+		ID: resource.MakeID(ns, "deployment", "helloworld"),
 		Containers: cluster.ContainersOrExcuse{
 			Containers: []resource.Container{
 				{
@@ -587,7 +586,7 @@ func TestDaemon_Automated(t *testing.T) {
 			},
 		},
 	}
-	k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error) {
+	k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error) {
 		return []cluster.Workload{workload}, nil
 	}
 	start()
@@ -601,7 +600,7 @@ func TestDaemon_Automated_semver(t *testing.T) {
 	defer clean()
 	w := newWait(t)
 
-	resid := flux.MustParseResourceID("default:deployment/semver")
+	resid := resource.MustParseID("default:deployment/semver")
 	workload := cluster.Workload{
 		ID: resid,
 		Containers: cluster.ContainersOrExcuse{
@@ -613,7 +612,7 @@ func TestDaemon_Automated_semver(t *testing.T) {
 			},
 		},
 	}
-	k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error) {
+	k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error) {
 		return []cluster.Workload{workload}, nil
 	}
 	start()
@@ -638,7 +637,7 @@ func mockDaemon(t *testing.T) (*Daemon, func(), func(), *mock.Mock, *mockEventWr
 	logger := log.NewNopLogger()
 
 	singleService := cluster.Workload{
-		ID: flux.MustParseResourceID(wl),
+		ID: resource.MustParseID(wl),
 		Containers: cluster.ContainersOrExcuse{
 			Containers: []resource.Container{
 				{
@@ -651,7 +650,7 @@ func mockDaemon(t *testing.T) (*Daemon, func(), func(), *mock.Mock, *mockEventWr
 	multiService := []cluster.Workload{
 		singleService,
 		{
-			ID: flux.MakeResourceID("another", "deployment", "service"),
+			ID: resource.MakeID("another", "deployment", "service"),
 			Containers: cluster.ContainersOrExcuse{
 				Containers: []resource.Container{
 					{
@@ -685,10 +684,10 @@ func mockDaemon(t *testing.T) (*Daemon, func(), func(), *mock.Mock, *mockEventWr
 			}
 			return []cluster.Workload{}, nil
 		}
-		k8s.IsAllowedResourceFunc = func(flux.ResourceID) bool { return true }
+		k8s.IsAllowedResourceFunc = func(resource.ID) bool { return true }
 		k8s.ExportFunc = func(ctx context.Context) ([]byte, error) { return testBytes, nil }
 		k8s.PingFunc = func() error { return nil }
-		k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error) {
+		k8s.SomeWorkloadsFunc = func(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error) {
 			return []cluster.Workload{
 				singleService,
 			}, nil
@@ -887,8 +886,8 @@ func updateImage(ctx context.Context, d *Daemon, t *testing.T) job.ID {
 func updatePolicy(ctx context.Context, t *testing.T, d *Daemon) job.ID {
 	return updateManifest(ctx, t, d, update.Spec{
 		Type: update.Policy,
-		Spec: policy.Updates{
-			flux.MustParseResourceID("default:deployment/helloworld"): {
+		Spec: resource.PolicyUpdates{
+			resource.MustParseID("default:deployment/helloworld"): {
 				Add: policy.Set{
 					policy.Locked: "true",
 				},
diff --git a/daemon/errors.go b/daemon/errors.go
index 32e095d0e..45a36f2bf 100644
--- a/daemon/errors.go
+++ b/daemon/errors.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/weaveworks/flux"
 	fluxerr "github.com/weaveworks/flux/errors"
 	"github.com/weaveworks/flux/job"
+	"github.com/weaveworks/flux/resource"
 )
 
 type SyncErrors struct {
-	errs map[flux.ResourceID]error
+	errs map[resource.ID]error
 	mu   sync.Mutex
 }
 
diff --git a/daemon/images.go b/daemon/images.go
index f32281b1e..b046703d2 100644
--- a/daemon/images.go
+++ b/daemon/images.go
@@ -7,7 +7,6 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
@@ -48,9 +47,9 @@ func (d *Daemon) pollForNewImages(logger log.Logger) {
 	}
 }
 
-type resources map[flux.ResourceID]resource.Resource
+type resources map[resource.ID]resource.Resource
 
-func (r resources) IDs() (ids []flux.ResourceID) {
+func (r resources) IDs() (ids []resource.ID) {
 	for k, _ := range r {
 		ids = append(ids, k)
 	}
@@ -66,7 +65,7 @@ func (d *Daemon) getAllowedAutomatedResources(ctx context.Context) (resources, e
 		return nil, err
 	}
 
-	result := map[flux.ResourceID]resource.Resource{}
+	result := map[resource.ID]resource.Resource{}
 	for _, resource := range resources {
 		policies := resource.Policies()
 		if policies.Has(policy.Automated) && !policies.Has(policy.Locked) && !policies.Has(policy.Ignore) {
diff --git a/daemon/images_test.go b/daemon/images_test.go
index 9fdcfcb5c..4cc89222a 100644
--- a/daemon/images_test.go
+++ b/daemon/images_test.go
@@ -1,14 +1,14 @@
 package daemon
 
 import (
-	"github.com/weaveworks/flux/policy"
 	"testing"
 	"time"
 
 	"github.com/go-kit/kit/log"
-	"github.com/weaveworks/flux"
+
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/image"
+	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/registry"
 	registryMock "github.com/weaveworks/flux/registry/mock"
 	"github.com/weaveworks/flux/resource"
@@ -32,11 +32,11 @@ const (
 )
 
 type candidate struct {
-	resourceID flux.ResourceID
+	resourceID resource.ID
 	policies   policy.Set
 }
 
-func (c candidate) ResourceID() flux.ResourceID {
+func (c candidate) ResourceID() resource.ID {
 	return c.resourceID
 }
 
@@ -54,7 +54,7 @@ func (candidate) Bytes() []byte {
 
 func TestCalculateChanges_Automated(t *testing.T) {
 	logger := log.NewNopLogger()
-	resourceID := flux.MakeResourceID(ns, "deployment", "application")
+	resourceID := resource.MakeID(ns, "deployment", "application")
 	candidateWorkloads := resources{
 		resourceID: candidate{
 			resourceID: resourceID,
@@ -102,7 +102,7 @@ func TestCalculateChanges_Automated(t *testing.T) {
 }
 func TestCalculateChanges_UntaggedImage(t *testing.T) {
 	logger := log.NewNopLogger()
-	resourceID := flux.MakeResourceID(ns, "deployment", "application")
+	resourceID := resource.MakeID(ns, "deployment", "application")
 	candidateWorkloads := resources{
 		resourceID: candidate{
 			resourceID: resourceID,
@@ -159,7 +159,7 @@ func TestCalculateChanges_UntaggedImage(t *testing.T) {
 
 func TestCalculateChanges_ZeroTimestamp(t *testing.T) {
 	logger := log.NewNopLogger()
-	resourceID := flux.MakeResourceID(ns, "deployment", "application")
+	resourceID := resource.MakeID(ns, "deployment", "application")
 	candidateWorkloads := resources{
 		resourceID: candidate{
 			resourceID: resourceID,
diff --git a/daemon/sync.go b/daemon/sync.go
index 64a92681d..a306146f5 100644
--- a/daemon/sync.go
+++ b/daemon/sync.go
@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/event"
 	"github.com/weaveworks/flux/git"
@@ -69,9 +68,9 @@ func (d *Daemon) Sync(ctx context.Context, started time.Time, revision string, s
 
 	// Determine what resources changed during the sync
 	changedResources, err := getChangedResources(ctx, c, d.GitTimeout, working, resourceStore, resources)
-	serviceIDs := flux.ResourceIDSet{}
+	serviceIDs := resource.IDSet{}
 	for _, r := range changedResources {
-		serviceIDs.Add([]flux.ResourceID{r.ResourceID()})
+		serviceIDs.Add([]resource.ID{r.ResourceID()})
 	}
 
 	// Retrieve git notes and collect events from them
@@ -347,7 +346,7 @@ func collectNoteEvents(ctx context.Context, c changeSet, notes map[string]struct
 }
 
 // logCommitEvent reports all synced commits to the upstream.
-func logCommitEvent(el eventLogger, c changeSet, serviceIDs flux.ResourceIDSet, started time.Time,
+func logCommitEvent(el eventLogger, c changeSet, serviceIDs resource.IDSet, started time.Time,
 	includesEvents map[string]bool, resourceErrors []event.ResourceError, logger log.Logger) error {
 	if len(c.commits) == 0 {
 		return nil
diff --git a/daemon/sync_test.go b/daemon/sync_test.go
index 2c0d19065..a069245e7 100644
--- a/daemon/sync_test.go
+++ b/daemon/sync_test.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/go-kit/kit/log"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/cluster/kubernetes"
 	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
@@ -25,6 +24,7 @@ import (
 	"github.com/weaveworks/flux/job"
 	"github.com/weaveworks/flux/manifests"
 	registryMock "github.com/weaveworks/flux/registry/mock"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -93,7 +93,7 @@ func TestPullAndSync_InitialSync(t *testing.T) {
 
 	syncCalled := 0
 	var syncDef *cluster.SyncSet
-	expectedResourceIDs := flux.ResourceIDs{}
+	expectedResourceIDs := resource.IDs{}
 	for id, _ := range testfiles.ResourceMap {
 		expectedResourceIDs = append(expectedResourceIDs, id)
 	}
@@ -132,8 +132,8 @@ func TestPullAndSync_InitialSync(t *testing.T) {
 		t.Errorf("Unexpected event type: %#v", es[0])
 	} else {
 		gotResourceIDs := es[0].ServiceIDs
-		flux.ResourceIDs(gotResourceIDs).Sort()
-		if !reflect.DeepEqual(gotResourceIDs, []flux.ResourceID(expectedResourceIDs)) {
+		resource.IDs(gotResourceIDs).Sort()
+		if !reflect.DeepEqual(gotResourceIDs, []resource.ID(expectedResourceIDs)) {
 			t.Errorf("Unexpected event workload ids: %#v, expected: %#v", gotResourceIDs, expectedResourceIDs)
 		}
 	}
@@ -174,7 +174,7 @@ func TestDoSync_NoNewCommits(t *testing.T) {
 
 	syncCalled := 0
 	var syncDef *cluster.SyncSet
-	expectedResourceIDs := flux.ResourceIDs{}
+	expectedResourceIDs := resource.IDs{}
 	for id, _ := range testfiles.ResourceMap {
 		expectedResourceIDs = append(expectedResourceIDs, id)
 	}
@@ -288,7 +288,7 @@ func TestDoSync_WithNewCommit(t *testing.T) {
 
 	syncCalled := 0
 	var syncDef *cluster.SyncSet
-	expectedResourceIDs := flux.ResourceIDs{}
+	expectedResourceIDs := resource.IDs{}
 	for id, _ := range testfiles.ResourceMap {
 		expectedResourceIDs = append(expectedResourceIDs, id)
 	}
@@ -326,10 +326,10 @@ func TestDoSync_WithNewCommit(t *testing.T) {
 		t.Errorf("Unexpected event type: %#v", es[0])
 	} else {
 		gotResourceIDs := es[0].ServiceIDs
-		flux.ResourceIDs(gotResourceIDs).Sort()
+		resource.IDs(gotResourceIDs).Sort()
 		// Event should only have changed workload ids
-		if !reflect.DeepEqual(gotResourceIDs, []flux.ResourceID{flux.MustParseResourceID("default:deployment/helloworld")}) {
-			t.Errorf("Unexpected event workload ids: %#v, expected: %#v", gotResourceIDs, []flux.ResourceID{flux.MustParseResourceID("default:deployment/helloworld")})
+		if !reflect.DeepEqual(gotResourceIDs, []resource.ID{resource.MustParseID("default:deployment/helloworld")}) {
+			t.Errorf("Unexpected event workload ids: %#v, expected: %#v", gotResourceIDs, []resource.ID{resource.MustParseID("default:deployment/helloworld")})
 		}
 	}
 	// It moves the tag
diff --git a/event/event.go b/event/event.go
index dd44d11f3..09f8f3792 100644
--- a/event/event.go
+++ b/event/event.go
@@ -1,15 +1,14 @@
 package event
 
 import (
+	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"
 	"time"
 
-	"encoding/json"
-
 	"github.com/pkg/errors"
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -42,7 +41,7 @@ type Event struct {
 
 	// Identifiers of workloads affected by this event.
 	// TODO: rename to WorkloadIDs after adding versioning.
-	ServiceIDs []flux.ResourceID `json:"serviceIDs"`
+	ServiceIDs []resource.ID `json:"serviceIDs"`
 
 	// Type is the type of event, usually "release" for now, but could be other
 	// things later
@@ -199,7 +198,7 @@ type Commit struct {
 }
 
 type ResourceError struct {
-	ID    flux.ResourceID
+	ID    resource.ID
 	Path  string
 	Error string
 }
diff --git a/flux.go b/flux.go
deleted file mode 100644
index e27c5999e..000000000
--- a/flux.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package flux
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/pkg/errors"
-)
-
-var (
-	ErrInvalidServiceID = errors.New("invalid service ID")
-
-	LegacyServiceIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)$")
-	// The namespace and name components are (apparently
-	// non-normatively) defined in
-	// https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/identifiers.md
-	// In practice, more punctuation is used than allowed there;
-	// specifically, people use underscores as well as dashes and dots, and in names, colons.
-	ResourceIDRegexp            = regexp.MustCompile("^(<cluster>|[a-zA-Z0-9_-]+):([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
-	UnqualifiedResourceIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
-)
-
-// ResourceID is an opaque type which uniquely identifies a resource in an
-// orchestrator.
-type ResourceID struct {
-	resourceIDImpl
-}
-
-type resourceIDImpl interface {
-	String() string
-}
-
-// Old-style <namespace>/<servicename> format
-type legacyServiceID struct {
-	namespace, service string
-}
-
-func (id legacyServiceID) String() string {
-	return fmt.Sprintf("%s/%s", id.namespace, id.service)
-}
-
-// New <namespace>:<kind>/<name> format
-type resourceID struct {
-	namespace, kind, name string
-}
-
-func (id resourceID) String() string {
-	return fmt.Sprintf("%s:%s/%s", id.namespace, id.kind, id.name)
-}
-
-// ParseResourceID constructs a ResourceID from a string representation
-// if possible, returning an error value otherwise.
-func ParseResourceID(s string) (ResourceID, error) {
-	if m := ResourceIDRegexp.FindStringSubmatch(s); m != nil {
-		return ResourceID{resourceID{m[1], strings.ToLower(m[2]), m[3]}}, nil
-	}
-	if m := LegacyServiceIDRegexp.FindStringSubmatch(s); m != nil {
-		return ResourceID{legacyServiceID{m[1], m[2]}}, nil
-	}
-	return ResourceID{}, errors.Wrap(ErrInvalidServiceID, "parsing "+s)
-}
-
-// MustParseResourceID constructs a ResourceID from a string representation,
-// panicing if the format is invalid.
-func MustParseResourceID(s string) ResourceID {
-	id, err := ParseResourceID(s)
-	if err != nil {
-		panic(err)
-	}
-	return id
-}
-
-// ParseResourceIDOptionalNamespace constructs a ResourceID from either a fully
-// qualified string representation, or an unqualified kind/name representation
-// and the supplied namespace.
-func ParseResourceIDOptionalNamespace(namespace, s string) (ResourceID, error) {
-	if m := ResourceIDRegexp.FindStringSubmatch(s); m != nil {
-		return ResourceID{resourceID{m[1], strings.ToLower(m[2]), m[3]}}, nil
-	}
-	if m := UnqualifiedResourceIDRegexp.FindStringSubmatch(s); m != nil {
-		return ResourceID{resourceID{namespace, strings.ToLower(m[1]), m[2]}}, nil
-	}
-	return ResourceID{}, errors.Wrap(ErrInvalidServiceID, "parsing "+s)
-}
-
-// MakeResourceID constructs a ResourceID from constituent components.
-func MakeResourceID(namespace, kind, name string) ResourceID {
-	return ResourceID{resourceID{namespace, strings.ToLower(kind), name}}
-}
-
-// Components returns the constituent components of a ResourceID
-func (id ResourceID) Components() (namespace, kind, name string) {
-	switch impl := id.resourceIDImpl.(type) {
-	case resourceID:
-		return impl.namespace, impl.kind, impl.name
-	case legacyServiceID:
-		return impl.namespace, "service", impl.service
-	default:
-		panic("wrong underlying type")
-	}
-}
-
-// MarshalJSON encodes a ResourceID as a JSON string. This is
-// done to maintain backwards compatibility with previous flux
-// versions where the ResourceID is a plain string.
-func (id ResourceID) MarshalJSON() ([]byte, error) {
-	if id.resourceIDImpl == nil {
-		// Sadly needed as it's possible to construct an empty ResourceID literal
-		return json.Marshal("")
-	}
-	return json.Marshal(id.String())
-}
-
-// UnmarshalJSON decodes a ResourceID from a JSON string. This is
-// done to maintain backwards compatibility with previous flux
-// versions where the ResourceID is a plain string.
-func (id *ResourceID) UnmarshalJSON(data []byte) (err error) {
-	var str string
-	if err := json.Unmarshal(data, &str); err != nil {
-		return err
-	}
-	if string(str) == "" {
-		// Sadly needed as it's possible to construct an empty ResourceID literal
-		*id = ResourceID{}
-		return nil
-	}
-	*id, err = ParseResourceID(string(str))
-	return err
-}
-
-// MarshalText encodes a ResourceID as a flat string; this is
-// required because ResourceIDs are sometimes used as map keys.
-func (id ResourceID) MarshalText() (text []byte, err error) {
-	return []byte(id.String()), nil
-}
-
-// MarshalText decodes a ResourceID from a flat string; this is
-// required because ResourceIDs are sometimes used as map keys.
-func (id *ResourceID) UnmarshalText(text []byte) error {
-	result, err := ParseResourceID(string(text))
-	if err != nil {
-		return err
-	}
-	*id = result
-	return nil
-}
-
-type ResourceIDSet map[ResourceID]struct{}
-
-func (s ResourceIDSet) String() string {
-	var ids []string
-	for id := range s {
-		ids = append(ids, id.String())
-	}
-	return "{" + strings.Join(ids, ", ") + "}"
-}
-
-func (s ResourceIDSet) Add(ids []ResourceID) {
-	for _, id := range ids {
-		s[id] = struct{}{}
-	}
-}
-
-func (s ResourceIDSet) Without(others ResourceIDSet) ResourceIDSet {
-	if s == nil || len(s) == 0 || others == nil || len(others) == 0 {
-		return s
-	}
-	res := ResourceIDSet{}
-	for id := range s {
-		if !others.Contains(id) {
-			res[id] = struct{}{}
-		}
-	}
-	return res
-}
-
-func (s ResourceIDSet) Contains(id ResourceID) bool {
-	if s == nil {
-		return false
-	}
-	_, ok := s[id]
-	return ok
-}
-
-func (s ResourceIDSet) Intersection(others ResourceIDSet) ResourceIDSet {
-	if s == nil {
-		return others
-	}
-	if others == nil {
-		return s
-	}
-	result := ResourceIDSet{}
-	for id := range s {
-		if _, ok := others[id]; ok {
-			result[id] = struct{}{}
-		}
-	}
-	return result
-}
-
-func (s ResourceIDSet) ToSlice() ResourceIDs {
-	i := 0
-	keys := make(ResourceIDs, len(s))
-	for k := range s {
-		keys[i] = k
-		i++
-	}
-	return keys
-}
-
-type ResourceIDs []ResourceID
-
-func (p ResourceIDs) Len() int           { return len(p) }
-func (p ResourceIDs) Less(i, j int) bool { return p[i].String() < p[j].String() }
-func (p ResourceIDs) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-func (p ResourceIDs) Sort()              { sort.Sort(p) }
-
-func (ids ResourceIDs) Without(others ResourceIDSet) (res ResourceIDs) {
-	for _, id := range ids {
-		if !others.Contains(id) {
-			res = append(res, id)
-		}
-	}
-	return res
-}
-
-func (ids ResourceIDs) Contains(id ResourceID) bool {
-	set := ResourceIDSet{}
-	set.Add(ids)
-	return set.Contains(id)
-}
-
-func (ids ResourceIDs) Intersection(others ResourceIDSet) ResourceIDSet {
-	set := ResourceIDSet{}
-	set.Add(ids)
-	return set.Intersection(others)
-}
diff --git a/git/gittest/repo.go b/git/gittest/repo.go
index 5c4dd6ffb..061ff1803 100644
--- a/git/gittest/repo.go
+++ b/git/gittest/repo.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
 	"github.com/weaveworks/flux/git"
+	"github.com/weaveworks/flux/resource"
 )
 
 // Repo creates a new clone-able git repo, pre-populated with some kubernetes
@@ -65,7 +65,7 @@ func Repo(t *testing.T) (*git.Repo, func()) {
 // Workloads is a shortcut to getting the names of the workloads (NB
 // not all resources, just the workloads) represented in the test
 // files.
-func Workloads() (res []flux.ResourceID) {
+func Workloads() (res []resource.ID) {
 	for k, _ := range testfiles.WorkloadMap("") {
 		res = append(res, k)
 	}
diff --git a/http/daemon/server.go b/http/daemon/server.go
index b27277342..a50933853 100644
--- a/http/daemon/server.go
+++ b/http/daemon/server.go
@@ -8,16 +8,15 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/flux"
 
+	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/flux/api"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v11"
 	transport "github.com/weaveworks/flux/http"
 	"github.com/weaveworks/flux/job"
 	fluxmetrics "github.com/weaveworks/flux/metrics"
-	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -152,7 +151,7 @@ func (s HTTPServer) ListServicesWithOptions(w http.ResponseWriter, r *http.Reque
 	services := r.URL.Query().Get("services")
 	if services != "" {
 		for _, svc := range strings.Split(services, ",") {
-			id, err := flux.ParseResourceID(svc)
+			id, err := resource.ParseID(svc)
 			if err != nil {
 				transport.WriteError(w, r, http.StatusBadRequest, errors.Wrapf(err, "parsing service spec %q", svc))
 				return
@@ -223,9 +222,9 @@ func (s HTTPServer) UpdateImages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var excludes []flux.ResourceID
+	var excludes []resource.ID
 	for _, ex := range r.URL.Query()["exclude"] {
-		s, err := flux.ParseResourceID(ex)
+		s, err := resource.ParseID(ex)
 		if err != nil {
 			transport.WriteError(w, r, http.StatusBadRequest, errors.Wrapf(err, "parsing excluded service %q", ex))
 			return
@@ -252,7 +251,7 @@ func (s HTTPServer) UpdateImages(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s HTTPServer) UpdatePolicies(w http.ResponseWriter, r *http.Request) {
-	var updates policy.Updates
+	var updates resource.PolicyUpdates
 	if err := json.NewDecoder(r.Body).Decode(&updates); err != nil {
 		transport.WriteError(w, r, http.StatusBadRequest, err)
 		return
diff --git a/image/image.go b/image/image.go
index d580c5ed5..e8e56b10e 100644
--- a/image/image.go
+++ b/image/image.go
@@ -242,7 +242,7 @@ type Labels struct {
 	BuildDate time.Time `json:"org.label-schema.build-date,omitempty"`
 	// Created holds the Open Container Image spec 'created' label
 	// Ref: https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys
-	Created   time.Time `json:"org.opencontainers.image.created,omitempty"`
+	Created time.Time `json:"org.opencontainers.image.created,omitempty"`
 }
 
 // MarshalJSON returns the Labels value in JSON (as bytes). It is
diff --git a/image/image_test.go b/image/image_test.go
index 818ed124a..09044bd39 100644
--- a/image/image_test.go
+++ b/image/image_test.go
@@ -238,9 +238,9 @@ func TestImage_OrderByCreationDate(t *testing.T) {
 	imA := mustMakeInfo("my/Image:2", testTime)
 	imB := mustMakeInfo("my/Image:0", time.Time{}).setLabels(Labels{Created: time0})
 	imC := mustMakeInfo("my/Image:3", time.Time{}).setLabels(Labels{BuildDate: time2})
-	imD := mustMakeInfo("my/Image:4", time.Time{}) // test nil
+	imD := mustMakeInfo("my/Image:4", time.Time{})                                      // test nil
 	imE := mustMakeInfo("my/Image:1", time.Time{}).setLabels(Labels{Created: testTime}) // test equal
-	imF := mustMakeInfo("my/Image:5", time.Time{}) // test nil equal
+	imF := mustMakeInfo("my/Image:5", time.Time{})                                      // test nil equal
 	imgs := []Info{imA, imB, imC, imD, imE, imF}
 	Sort(imgs, NewerByCreated)
 	checkSorted(t, imgs)
diff --git a/integrations/apis/flux.weave.works/v1beta1/types.go b/integrations/apis/flux.weave.works/v1beta1/types.go
index d38fbf899..d6e4bdfaf 100644
--- a/integrations/apis/flux.weave.works/v1beta1/types.go
+++ b/integrations/apis/flux.weave.works/v1beta1/types.go
@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/helm/pkg/chartutil"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 )
 
 // +genclient
@@ -26,8 +26,8 @@ type HelmRelease struct {
 // ResourceID returns an ID made from the identifying parts of the
 // resource, as a convenience for Flux, which uses them
 // everywhere.
-func (fhr HelmRelease) ResourceID() flux.ResourceID {
-	return flux.MakeResourceID(fhr.Namespace, "HelmRelease", fhr.Name)
+func (fhr HelmRelease) ResourceID() resource.ID {
+	return resource.MakeID(fhr.Namespace, "HelmRelease", fhr.Name)
 }
 
 // ValuesFromSource represents a source of values.
diff --git a/integrations/helm/release/release.go b/integrations/helm/release/release.go
index c32065c13..233f9b22e 100644
--- a/integrations/helm/release/release.go
+++ b/integrations/helm/release/release.go
@@ -25,11 +25,11 @@ import (
 	k8shelm "k8s.io/helm/pkg/helm"
 	helmenv "k8s.io/helm/pkg/helm/environment"
 	hapi_release "k8s.io/helm/pkg/proto/hapi/release"
+	helmutil "k8s.io/helm/pkg/releaseutil"
 
-	"github.com/weaveworks/flux"
 	fluxk8s "github.com/weaveworks/flux/cluster/kubernetes"
 	flux_v1beta1 "github.com/weaveworks/flux/integrations/apis/flux.weave.works/v1beta1"
-	helmutil "k8s.io/helm/pkg/releaseutil"
+	"github.com/weaveworks/flux/resource"
 )
 
 type Action string
@@ -104,8 +104,8 @@ func (r *Release) GetUpgradableRelease(name string) (*hapi_release.Release, erro
 	case hapi_release.Status_FAILED:
 		return nil, fmt.Errorf("release requires a rollback before it can be upgraded (%s)", status.GetCode().String())
 	case hapi_release.Status_PENDING_INSTALL,
-	     hapi_release.Status_PENDING_UPGRADE,
-	     hapi_release.Status_PENDING_ROLLBACK:
+		hapi_release.Status_PENDING_UPGRADE,
+		hapi_release.Status_PENDING_ROLLBACK:
 		return nil, fmt.Errorf("operation pending for release (%s)", status.GetCode().String())
 	default:
 		return nil, fmt.Errorf("current state prevents it from being upgraded (%s)", status.GetCode().String())
@@ -288,9 +288,9 @@ func (r *Release) annotateResources(release *hapi_release.Release, fhr flux_v1be
 	}
 }
 
-// fhrResourceID constructs a flux.ResourceID for a HelmRelease resource.
-func fhrResourceID(fhr flux_v1beta1.HelmRelease) flux.ResourceID {
-	return flux.MakeResourceID(fhr.Namespace, "HelmRelease", fhr.Name)
+// fhrResourceID constructs a resource.ID for a HelmRelease resource.
+func fhrResourceID(fhr flux_v1beta1.HelmRelease) resource.ID {
+	return resource.MakeID(fhr.Namespace, "HelmRelease", fhr.Name)
 }
 
 // values tries to resolve all given value file sources and merges
diff --git a/manifests/configaware.go b/manifests/configaware.go
index a740f3ccf..20429ef27 100644
--- a/manifests/configaware.go
+++ b/manifests/configaware.go
@@ -11,9 +11,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 )
 
@@ -131,7 +129,7 @@ func findConfigFilePaths(baseDir string, initialPath string) (string, string, er
 	return "", "", configFileNotFoundErr
 }
 
-func (ca *configAware) SetWorkloadContainerImage(ctx context.Context, resourceID flux.ResourceID, container string,
+func (ca *configAware) SetWorkloadContainerImage(ctx context.Context, resourceID resource.ID, container string,
 	newImageID image.Ref) error {
 	resourcesByID, err := ca.getResourcesByID(ctx)
 	if err != nil {
@@ -268,8 +266,8 @@ func (ca *configAware) getGeneratedManifests(ctx context.Context, cf *ConfigFile
 	return buf.Bytes(), nil
 }
 
-func (ca *configAware) UpdateWorkloadPolicies(ctx context.Context, resourceID flux.ResourceID,
-	update policy.Update) (bool, error) {
+func (ca *configAware) UpdateWorkloadPolicies(ctx context.Context, resourceID resource.ID,
+	update resource.PolicyUpdate) (bool, error) {
 	resourcesByID, err := ca.getResourcesByID(ctx)
 	if err != nil {
 		return false, err
@@ -293,7 +291,7 @@ func (ca *configAware) UpdateWorkloadPolicies(ctx context.Context, resourceID fl
 }
 
 func (ca *configAware) updateConfigFileWorkloadPolicies(ctx context.Context, cf *ConfigFile, r resource.Resource,
-	update policy.Update) (bool, error) {
+	update resource.PolicyUpdate) (bool, error) {
 	if cf.PatchUpdated != nil {
 		var changed bool
 		err := ca.updatePatchFile(ctx, cf, func(previousManifests []byte) ([]byte, error) {
diff --git a/manifests/configaware_test.go b/manifests/configaware_test.go
index 6e4ee5edb..0c789b44f 100644
--- a/manifests/configaware_test.go
+++ b/manifests/configaware_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster/kubernetes"
 	"github.com/weaveworks/flux/cluster/kubernetes/testfiles"
 	"github.com/weaveworks/flux/image"
@@ -143,13 +142,13 @@ func TestCommandUpdatedConfigFile(t *testing.T) {
 	resources, err := frs.GetAllResourcesByID(ctx)
 	assert.NoError(t, err)
 	assert.Equal(t, 1, len(resources))
-	deploymentID := flux.MustParseResourceID("default:deployment/helloworld")
+	deploymentID := resource.MustParseID("default:deployment/helloworld")
 	assert.Contains(t, resources, deploymentID.String())
 	ref, err := image.ParseRef("repo/image:tag")
 	assert.NoError(t, err)
 	err = frs.SetWorkloadContainerImage(ctx, deploymentID, "greeter", ref)
 	assert.NoError(t, err)
-	_, err = frs.UpdateWorkloadPolicies(ctx, deploymentID, policy.Update{
+	_, err = frs.UpdateWorkloadPolicies(ctx, deploymentID, resource.PolicyUpdate{
 		Add: policy.Set{policy.TagPrefix("greeter"): "glob:master-*"},
 	})
 	assert.NoError(t, err)
@@ -189,7 +188,7 @@ func TestPatchUpdatedConfigFile(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(resources))
 	var deployment resource.Resource
-	deploymentID := flux.MustParseResourceID("default:deployment/helloworld")
+	deploymentID := resource.MustParseID("default:deployment/helloworld")
 	for id, res := range resources {
 		if id == deploymentID.String() {
 			deployment = res
@@ -200,7 +199,7 @@ func TestPatchUpdatedConfigFile(t *testing.T) {
 	assert.NoError(t, err)
 	err = frs.SetWorkloadContainerImage(ctx, deploymentID, "greeter", ref)
 	assert.NoError(t, err)
-	_, err = frs.UpdateWorkloadPolicies(ctx, deploymentID, policy.Update{
+	_, err = frs.UpdateWorkloadPolicies(ctx, deploymentID, resource.PolicyUpdate{
 		Add: policy.Set{policy.TagPrefix("greeter"): "glob:master-*"},
 	})
 	expectedPatch := `---
diff --git a/manifests/configfile.go b/manifests/configfile.go
index 2fd896454..aa1a65b93 100644
--- a/manifests/configfile.go
+++ b/manifests/configfile.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -114,7 +114,7 @@ func (cf *ConfigFile) ExecGenerators(ctx context.Context, generators []Generator
 // ExecContainerImageUpdaters executes all the image updates in the configuration file.
 // It will stop at the first error, in which case the returned error will be non-nil
 func (cf *ConfigFile) ExecContainerImageUpdaters(ctx context.Context,
-	workload flux.ResourceID, container string, image, imageTag string) []ConfigFileCombinedExecResult {
+	workload resource.ID, container string, image, imageTag string) []ConfigFileCombinedExecResult {
 	env := makeEnvFromResourceID(workload)
 	env = append(env,
 		"FLUX_CONTAINER="+container,
@@ -137,7 +137,7 @@ func (cf *ConfigFile) ExecContainerImageUpdaters(ctx context.Context,
 // policy. It will stop at the first error, in which case the returned
 // error will be non-nil
 func (cf *ConfigFile) ExecPolicyUpdaters(ctx context.Context,
-	workload flux.ResourceID, policyName, policyValue string) []ConfigFileCombinedExecResult {
+	workload resource.ID, policyName, policyValue string) []ConfigFileCombinedExecResult {
 	env := makeEnvFromResourceID(workload)
 	env = append(env, "FLUX_POLICY="+policyName)
 	if policyValue != "" {
@@ -190,7 +190,7 @@ func (cf *ConfigFile) execCommand(ctx context.Context, env []string, stdOut, std
 	return err
 }
 
-func makeEnvFromResourceID(id flux.ResourceID) []string {
+func makeEnvFromResourceID(id resource.ID) []string {
 	ns, kind, name := id.Components()
 	return []string{
 		"FLUX_WORKLOAD=" + id.String(),
diff --git a/manifests/configfile_test.go b/manifests/configfile_test.go
index fcef9e121..c7d300a61 100644
--- a/manifests/configfile_test.go
+++ b/manifests/configfile_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 )
 
 const patchUpdatedConfigFile = `---
@@ -83,7 +83,7 @@ func TestExecContainerImageUpdaters(t *testing.T) {
 	var cf ConfigFile
 	err := yaml.Unmarshal([]byte(echoCmdUpdatedConfigFile), &cf)
 	assert.NoError(t, err)
-	resourceID := flux.MustParseResourceID("default:deployment/foo")
+	resourceID := resource.MustParseID("default:deployment/foo")
 	result := cf.ExecContainerImageUpdaters(context.Background(), resourceID, "bar", "repo/image", "latest")
 	assert.Equal(t, 2, len(result), "result: %s", result)
 	assert.Equal(t,
@@ -98,7 +98,7 @@ func TestExecAnnotationUpdaters(t *testing.T) {
 	var cf ConfigFile
 	err := yaml.Unmarshal([]byte(echoCmdUpdatedConfigFile), &cf)
 	assert.NoError(t, err)
-	resourceID := flux.MustParseResourceID("default:deployment/foo")
+	resourceID := resource.MustParseID("default:deployment/foo")
 
 	// Test the update/addition of annotations
 	annotationValue := "value"
diff --git a/manifests/manifests.go b/manifests/manifests.go
index 4c049e8fb..652e644e3 100644
--- a/manifests/manifests.go
+++ b/manifests/manifests.go
@@ -3,9 +3,7 @@ package manifests
 import (
 	"bytes"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 )
 
@@ -21,9 +19,9 @@ type Manifests interface {
 	// ParseManifest parses the content of a collection of manifests, into resources
 	ParseManifest(def []byte, source string) (map[string]resource.Resource, error)
 	// Set the image of a container in a manifest's bytes to that given
-	SetWorkloadContainerImage(def []byte, resourceID flux.ResourceID, container string, newImageID image.Ref) ([]byte, error)
+	SetWorkloadContainerImage(def []byte, resourceID resource.ID, container string, newImageID image.Ref) ([]byte, error)
 	// UpdateWorkloadPolicies modifies a manifest to apply the policy update specified
-	UpdateWorkloadPolicies(def []byte, id flux.ResourceID, update policy.Update) ([]byte, error)
+	UpdateWorkloadPolicies(def []byte, id resource.ID, update resource.PolicyUpdate) ([]byte, error)
 	// CreateManifestPatch obtains a patch between the original and modified manifests
 	CreateManifestPatch(originalManifests, modifiedManifests []byte, originalSource, modifiedSource string) ([]byte, error)
 	// ApplyManifestPatch applies a manifest patch (obtained with CreateManifestDiff) returned the patched manifests
diff --git a/manifests/rawfiles.go b/manifests/rawfiles.go
index ac202d19e..382bbd610 100644
--- a/manifests/rawfiles.go
+++ b/manifests/rawfiles.go
@@ -7,9 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 )
 
@@ -28,7 +26,7 @@ func NewRawFiles(baseDir string, paths []string, manifests Manifests) *rawFiles
 }
 
 // Set the container image of a resource in the store
-func (f *rawFiles) SetWorkloadContainerImage(ctx context.Context, id flux.ResourceID, container string, newImageID image.Ref) error {
+func (f *rawFiles) SetWorkloadContainerImage(ctx context.Context, id resource.ID, container string, newImageID image.Ref) error {
 	resourcesByID, err := f.GetAllResourcesByID(ctx)
 	if err != nil {
 		return err
@@ -59,7 +57,7 @@ func (f *rawFiles) setManifestWorkloadContainerImage(r resource.Resource, contai
 
 // UpdateWorkloadPolicies modifies a resource in the store to apply the policy-update specified.
 // It returns whether a change in the resource was actually made as a result of the change
-func (f *rawFiles) UpdateWorkloadPolicies(ctx context.Context, id flux.ResourceID, update policy.Update) (bool, error) {
+func (f *rawFiles) UpdateWorkloadPolicies(ctx context.Context, id resource.ID, update resource.PolicyUpdate) (bool, error) {
 	resourcesByID, err := f.GetAllResourcesByID(ctx)
 	if err != nil {
 		return false, err
@@ -71,7 +69,7 @@ func (f *rawFiles) UpdateWorkloadPolicies(ctx context.Context, id flux.ResourceI
 	return f.updateManifestWorkloadPolicies(r, update)
 }
 
-func (f *rawFiles) updateManifestWorkloadPolicies(r resource.Resource, update policy.Update) (bool, error) {
+func (f *rawFiles) updateManifestWorkloadPolicies(r resource.Resource, update resource.PolicyUpdate) (bool, error) {
 	fullFilePath := filepath.Join(f.baseDir, r.Source())
 	def, err := ioutil.ReadFile(fullFilePath)
 	if err != nil {
diff --git a/manifests/store.go b/manifests/store.go
index 3c26576af..322fff6fb 100644
--- a/manifests/store.go
+++ b/manifests/store.go
@@ -4,9 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
-	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/resource"
 )
 
@@ -22,10 +20,10 @@ func ErrResourceNotFound(name string) error {
 // in a file or not e.g., generated and updated by a .flux.yaml file, explicit Kubernetes .yaml manifests files ...
 type Store interface {
 	// Set the container image of a resource in the store
-	SetWorkloadContainerImage(ctx context.Context, resourceID flux.ResourceID, container string, newImageID image.Ref) error
+	SetWorkloadContainerImage(ctx context.Context, resourceID resource.ID, container string, newImageID image.Ref) error
 	// UpdateWorkloadPolicies modifies a resource in the store to apply the policy-update specified.
 	// It returns whether a change in the resource was actually made as a result of the change
-	UpdateWorkloadPolicies(ctx context.Context, resourceID flux.ResourceID, update policy.Update) (bool, error)
+	UpdateWorkloadPolicies(ctx context.Context, resourceID resource.ID, update resource.PolicyUpdate) (bool, error)
 	// Load all the resources in the store. The returned map is indexed by the resource IDs
 	GetAllResourcesByID(ctx context.Context) (map[string]resource.Resource, error)
 }
diff --git a/policy/policy.go b/policy/policy.go
index ef846858a..c9ec95f34 100644
--- a/policy/policy.go
+++ b/policy/policy.go
@@ -3,8 +3,6 @@ package policy
 import (
 	"encoding/json"
 	"strings"
-
-	"github.com/weaveworks/flux"
 )
 
 const (
@@ -47,13 +45,6 @@ func GetTagPattern(policies Set, container string) Pattern {
 	return NewPattern(pattern)
 }
 
-type Updates map[flux.ResourceID]Update
-
-type Update struct {
-	Add    Set `json:"add"`
-	Remove Set `json:"remove"`
-}
-
 type Set map[Policy]string
 
 // We used to specify a set of policies as []Policy, and in some places
diff --git a/registry/client.go b/registry/client.go
index 4434a4ef4..b34de4635 100644
--- a/registry/client.go
+++ b/registry/client.go
@@ -158,9 +158,9 @@ interpret:
 		}
 
 		var config struct {
-			Arch    string    `json:"architecture"`
-			Created time.Time `json:"created"`
-			OS      string    `json:"os"`
+			Arch            string    `json:"architecture"`
+			Created         time.Time `json:"created"`
+			OS              string    `json:"os"`
 			ContainerConfig struct {
 				Labels image.Labels `json:"labels"`
 			} `json:"container_config"`
diff --git a/registry/credentials.go b/registry/credentials.go
index b8c49616c..9962b8903 100644
--- a/registry/credentials.go
+++ b/registry/credentials.go
@@ -145,11 +145,11 @@ func (cs Credentials) credsFor(host string) creds {
 		}
 	}
 
-    if hostIsAzureContainerRegistry(host) {
-        if cred, err := getAzureCloudConfigAADToken(host); err == nil {
-            return cred
-        }
-    }
+	if hostIsAzureContainerRegistry(host) {
+		if cred, err := getAzureCloudConfigAADToken(host); err == nil {
+			return cred
+		}
+	}
 
 	return creds{}
 }
diff --git a/release/context.go b/release/context.go
index ac279ae4b..7008c6568 100644
--- a/release/context.go
+++ b/release/context.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/manifests"
 	"github.com/weaveworks/flux/registry"
@@ -68,7 +67,7 @@ func (rc *ReleaseContext) SelectWorkloads(ctx context.Context, results update.Re
 
 	// Apply prefilters to select the controllers that we'll ask the
 	// cluster about.
-	var toAskClusterAbout []flux.ResourceID
+	var toAskClusterAbout []resource.ID
 	for _, s := range allDefined {
 		res := s.Filter(prefilters...)
 		if res.Error == "" {
@@ -118,13 +117,13 @@ func (rc *ReleaseContext) SelectWorkloads(ctx context.Context, results update.Re
 
 // WorkloadsForUpdate collects all workloads defined in manifests and prepares a list of
 // workload updates for each of them.  It does not consider updatability.
-func (rc *ReleaseContext) WorkloadsForUpdate(ctx context.Context) (map[flux.ResourceID]*update.WorkloadUpdate, error) {
+func (rc *ReleaseContext) WorkloadsForUpdate(ctx context.Context) (map[resource.ID]*update.WorkloadUpdate, error) {
 	resources, err := rc.GetAllResources(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	var defined = map[flux.ResourceID]*update.WorkloadUpdate{}
+	var defined = map[resource.ID]*update.WorkloadUpdate{}
 	for _, res := range resources {
 		if wl, ok := res.(resource.Workload); ok {
 			defined[res.ResourceID()] = &update.WorkloadUpdate{
diff --git a/release/releaser_test.go b/release/releaser_test.go
index f4d733081..122619173 100644
--- a/release/releaser_test.go
+++ b/release/releaser_test.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/cluster/kubernetes"
 	"github.com/weaveworks/flux/cluster/mock"
@@ -37,7 +36,7 @@ var (
 	oldRef, _     = image.ParseRef(oldImage)
 	sidecarImage  = "weaveworks/sidecar:master-a000001"
 	sidecarRef, _ = image.ParseRef(sidecarImage)
-	hwSvcID, _    = flux.ParseResourceID("default:deployment/helloworld")
+	hwSvcID, _    = resource.ParseID("default:deployment/helloworld")
 	hwSvcSpec, _  = update.ParseResourceSpec(hwSvcID.String())
 	hwSvc         = cluster.Workload{
 		ID: hwSvcID,
@@ -62,7 +61,7 @@ var (
 
 	newLockedImg     = "quay.io/weaveworks/locked-service:2"
 	newLockedRef, _  = image.ParseRef(newLockedImg)
-	lockedSvcID, _   = flux.ParseResourceID("default:deployment/locked-service")
+	lockedSvcID, _   = resource.ParseID("default:deployment/locked-service")
 	lockedSvcSpec, _ = update.ParseResourceSpec(lockedSvcID.String())
 	lockedSvc        = cluster.Workload{
 		ID: lockedSvcID,
@@ -78,7 +77,7 @@ var (
 
 	semverHwImg    = "quay.io/weaveworks/helloworld:3.0.0"
 	semverHwRef, _ = image.ParseRef(semverHwImg)
-	semverSvcID    = flux.MustParseResourceID("default:deployment/semver")
+	semverSvcID    = resource.MustParseID("default:deployment/semver")
 	semverSvc      = cluster.Workload{
 		ID: semverSvcID,
 		Containers: cluster.ContainersOrExcuse{
@@ -92,7 +91,7 @@ var (
 	}
 	semverSvcSpec, _ = update.ParseResourceSpec(semverSvc.ID.String())
 
-	testSvcID = flux.MustParseResourceID("default:deployment/test-service")
+	testSvcID = resource.MustParseID("default:deployment/test-service")
 	testSvc   = cluster.Workload{
 		ID: testSvcID,
 		Containers: cluster.ContainersOrExcuse{
@@ -148,7 +147,7 @@ func mockCluster(running ...cluster.Workload) *mock.Mock {
 		AllWorkloadsFunc: func(ctx context.Context, maybeNamespace string) ([]cluster.Workload, error) {
 			return running, nil
 		},
-		SomeWorkloadsFunc: func(ctx context.Context, ids []flux.ResourceID) ([]cluster.Workload, error) {
+		SomeWorkloadsFunc: func(ctx context.Context, ids []resource.ID) ([]cluster.Workload, error) {
 			var res []cluster.Workload
 			for _, id := range ids {
 				for _, svc := range running {
@@ -221,7 +220,7 @@ func (x expected) Result() update.Result {
 }
 
 func Test_InitContainer(t *testing.T) {
-	initWorkloadID := flux.MustParseResourceID("default:daemonset/init")
+	initWorkloadID := resource.MustParseID("default:daemonset/init")
 	initSvc := cluster.Workload{
 		ID: initWorkloadID,
 		Containers: cluster.ContainersOrExcuse{
@@ -287,11 +286,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{hwSvcSpec},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSuccess,
 						PerContainer: []update.ContainerUpdate{
 							{
@@ -315,11 +314,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{lockedSvcID},
+				Excludes:     []resource.ID{lockedSvcID},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSuccess,
 						PerContainer: []update.ContainerUpdate{
 							{
@@ -334,7 +333,7 @@ func Test_FilterLogic(t *testing.T) {
 							},
 						},
 					},
-					flux.MustParseResourceID("default:deployment/locked-service"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/locked-service"): update.WorkloadResult{
 						Status: update.ReleaseStatusIgnored,
 						Error:  update.Excluded,
 					},
@@ -347,11 +346,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecFromRef(newHwRef),
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSuccess,
 						PerContainer: []update.ContainerUpdate{
 							{
@@ -361,7 +360,7 @@ func Test_FilterLogic(t *testing.T) {
 							},
 						},
 					},
-					flux.MustParseResourceID("default:deployment/locked-service"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/locked-service"): update.WorkloadResult{
 						Status: update.ReleaseStatusIgnored,
 						Error:  update.DifferentImage,
 					},
@@ -376,11 +375,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSuccess,
 						PerContainer: []update.ContainerUpdate{
 							{
@@ -395,7 +394,7 @@ func Test_FilterLogic(t *testing.T) {
 							},
 						},
 					},
-					flux.MustParseResourceID("default:deployment/locked-service"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/locked-service"): update.WorkloadResult{
 						Status: update.ReleaseStatusSkipped,
 						Error:  update.Locked,
 					},
@@ -408,11 +407,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{hwSvcSpec, update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSuccess,
 						PerContainer: []update.ContainerUpdate{
 							{
@@ -427,7 +426,7 @@ func Test_FilterLogic(t *testing.T) {
 							},
 						},
 					},
-					flux.MustParseResourceID("default:deployment/locked-service"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/locked-service"): update.WorkloadResult{
 						Status: update.ReleaseStatusSkipped,
 						Error:  update.Locked,
 					},
@@ -440,11 +439,11 @@ func Test_FilterLogic(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{notInRepoSpec},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID(notInRepoService): skippedNotInRepo,
+					resource.MustParseID(notInRepoService): skippedNotInRepo,
 				},
 				Else: ignoredNotIncluded,
 			},
@@ -485,12 +484,12 @@ func Test_Force_lockedWorkload(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{lockedSvcSpec},
 				ImageSpec:    update.ImageSpecFromRef(newLockedRef),
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/locked-service"): success,
+					resource.MustParseID("default:deployment/locked-service"): success,
 				},
 				Else: ignoredNotIncluded,
 			},
@@ -500,12 +499,12 @@ func Test_Force_lockedWorkload(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecFromRef(newLockedRef),
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/locked-service"): skippedLocked,
+					resource.MustParseID("default:deployment/locked-service"): skippedLocked,
 				},
 				Else: skippedNotInCluster,
 			},
@@ -516,12 +515,12 @@ func Test_Force_lockedWorkload(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{lockedSvcSpec},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/locked-service"): success,
+					resource.MustParseID("default:deployment/locked-service"): success,
 				},
 				Else: ignoredNotIncluded,
 			},
@@ -531,12 +530,12 @@ func Test_Force_lockedWorkload(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/locked-service"): skippedLocked,
+					resource.MustParseID("default:deployment/locked-service"): skippedLocked,
 				},
 				Else: skippedNotInCluster,
 			},
@@ -587,12 +586,12 @@ func Test_Force_filteredContainer(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{semverSvcSpec},
 				ImageSpec:    update.ImageSpecFromRef(newHwRef), // does not match filter
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/semver"): successNew,
+					resource.MustParseID("default:deployment/semver"): successNew,
 				},
 				Else: ignoredNotIncluded,
 			},
@@ -603,12 +602,12 @@ func Test_Force_filteredContainer(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecFromRef(newHwRef), // does not match filter
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/semver"): successNew,
+					resource.MustParseID("default:deployment/semver"): successNew,
 				},
 				Else: skippedNotInCluster,
 			},
@@ -619,12 +618,12 @@ func Test_Force_filteredContainer(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{semverSvcSpec},
 				ImageSpec:    update.ImageSpecLatest, // will filter images by semver and pick newest version
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/semver"): successSemver,
+					resource.MustParseID("default:deployment/semver"): successSemver,
 				},
 				Else: ignoredNotIncluded,
 			},
@@ -635,12 +634,12 @@ func Test_Force_filteredContainer(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 				Force:        true,
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/semver"): successSemver,
+					resource.MustParseID("default:deployment/semver"): successSemver,
 				},
 				Else: skippedNotInCluster,
 			},
@@ -685,11 +684,11 @@ func Test_ImageStatus(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{testSvcSpec},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/test-service"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/test-service"): update.WorkloadResult{
 						Status: update.ReleaseStatusIgnored,
 						Error:  update.DoesNotUseImage,
 					},
@@ -702,11 +701,11 @@ func Test_ImageStatus(t *testing.T) {
 				ServiceSpecs: []update.ResourceSpec{hwSvcSpec},
 				ImageSpec:    update.ImageSpecLatest,
 				Kind:         update.ReleaseKindExecute,
-				Excludes:     []flux.ResourceID{},
+				Excludes:     []resource.ID{},
 			},
 			Expected: expected{
 				Specific: update.Result{
-					flux.MustParseResourceID("default:deployment/helloworld"): update.WorkloadResult{
+					resource.MustParseID("default:deployment/helloworld"): update.WorkloadResult{
 						Status: update.ReleaseStatusSkipped,
 						Error:  update.ImageUpToDate,
 					},
@@ -729,7 +728,7 @@ func Test_ImageStatus(t *testing.T) {
 }
 
 func Test_UpdateMultidoc(t *testing.T) {
-	egID := flux.MustParseResourceID("default:deployment/multi-deploy")
+	egID := resource.MustParseID("default:deployment/multi-deploy")
 	egSvc := cluster.Workload{
 		ID: egID,
 		Containers: cluster.ContainersOrExcuse{
@@ -776,7 +775,7 @@ func Test_UpdateMultidoc(t *testing.T) {
 }
 
 func Test_UpdateList(t *testing.T) {
-	egID := flux.MustParseResourceID("default:deployment/list-deploy")
+	egID := resource.MustParseID("default:deployment/list-deploy")
 	egSvc := cluster.Workload{
 		ID: egID,
 		Containers: cluster.ContainersOrExcuse{
@@ -839,7 +838,7 @@ func Test_UpdateContainers(t *testing.T) {
 	}
 	for _, tst := range []struct {
 		Name       string
-		WorkloadID flux.ResourceID
+		WorkloadID resource.ID
 		Spec       []update.ContainerUpdate
 		Force      bool
 
@@ -1018,7 +1017,7 @@ func Test_UpdateContainers(t *testing.T) {
 		},
 	} {
 		specs := update.ReleaseContainersSpec{
-			ContainerSpecs: map[flux.ResourceID][]update.ContainerUpdate{tst.WorkloadID: tst.Spec},
+			ContainerSpecs: map[resource.ID][]update.ContainerUpdate{tst.WorkloadID: tst.Spec},
 			Kind:           update.ReleaseKindExecute,
 		}
 
@@ -1056,7 +1055,7 @@ type badManifests struct {
 	manifests.Manifests
 }
 
-func (m *badManifests) SetWorkloadContainerImage(def []byte, id flux.ResourceID, container string, image image.Ref) ([]byte, error) {
+func (m *badManifests) SetWorkloadContainerImage(def []byte, id resource.ID, container string, image image.Ref) ([]byte, error) {
 	return def, nil
 }
 
@@ -1066,7 +1065,7 @@ func Test_BadRelease(t *testing.T) {
 		ServiceSpecs: []update.ResourceSpec{update.ResourceSpecAll},
 		ImageSpec:    update.ImageSpecFromRef(newHwRef),
 		Kind:         update.ReleaseKindExecute,
-		Excludes:     []flux.ResourceID{},
+		Excludes:     []resource.ID{},
 	}
 	checkout1, cleanup1 := setup(t)
 	defer cleanup1()
diff --git a/remote/mock.go b/remote/mock.go
index 8f4e5a9bd..1d8891727 100644
--- a/remote/mock.go
+++ b/remote/mock.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v11"
@@ -17,6 +16,7 @@ import (
 	"github.com/weaveworks/flux/guid"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/job"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -113,9 +113,9 @@ var _ api.UpstreamServer = &MockServer{}
 func ServerTestBattery(t *testing.T, wrap func(mock api.UpstreamServer) api.UpstreamServer) {
 	// set up
 	namespace := "the-space-of-names"
-	serviceID := flux.MustParseResourceID(namespace + "/service")
-	serviceList := []flux.ResourceID{serviceID}
-	services := flux.ResourceIDSet{}
+	serviceID := resource.MustParseID(namespace + "/service")
+	serviceList := []resource.ID{serviceID}
+	services := resource.IDSet{}
 	services.Add(serviceList)
 
 	now := time.Now().UTC()
@@ -123,7 +123,7 @@ func ServerTestBattery(t *testing.T, wrap func(mock api.UpstreamServer) api.Upst
 	imageID, _ := image.ParseRef("quay.io/example.com/frob:v0.4.5")
 	serviceAnswer := []v6.ControllerStatus{
 		v6.ControllerStatus{
-			ID:     flux.MustParseResourceID("foobar/hello"),
+			ID:     resource.MustParseID("foobar/hello"),
 			Status: "ok",
 			Containers: []v6.Container{
 				v6.Container{
@@ -140,7 +140,7 @@ func ServerTestBattery(t *testing.T, wrap func(mock api.UpstreamServer) api.Upst
 
 	imagesAnswer := []v6.ImageStatus{
 		v6.ImageStatus{
-			ID: flux.MustParseResourceID("barfoo/yello"),
+			ID: resource.MustParseID("barfoo/yello"),
 			Containers: []v6.Container{
 				{
 					Name: "flubnicator",
diff --git a/remote/rpc/clientV11.go b/remote/rpc/clientV11.go
index 5a38a7312..2f4d063c8 100644
--- a/remote/rpc/clientV11.go
+++ b/remote/rpc/clientV11.go
@@ -8,7 +8,7 @@ import (
 	"github.com/weaveworks/flux/api/v11"
 	"github.com/weaveworks/flux/api/v6"
 	"github.com/weaveworks/flux/remote"
-	)
+)
 
 // RPCClientV11 is the rpc-backed implementation of a server, for
 // talking to remote daemons. This version introduces methods which accept an
diff --git a/remote/rpc/compat.go b/remote/rpc/compat.go
index 5f8b9561d..35282bb27 100644
--- a/remote/rpc/compat.go
+++ b/remote/rpc/compat.go
@@ -5,13 +5,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/api/v10"
 	"github.com/weaveworks/flux/api/v11"
 	"github.com/weaveworks/flux/api/v6"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/remote"
+	"github.com/weaveworks/flux/resource"
 	"github.com/weaveworks/flux/update"
 )
 
@@ -29,7 +29,7 @@ func requireServiceSpecKinds(ss update.ResourceSpec, kinds []string) error {
 	return nil
 }
 
-func requireServiceIDKinds(id flux.ResourceID, kinds []string) error {
+func requireServiceIDKinds(id resource.ID, kinds []string) error {
 	_, kind, _ := id.Components()
 	if !contains(kinds, kind) {
 		return fmt.Errorf("Unsupported resource kind: %s", kind)
@@ -40,7 +40,7 @@ func requireServiceIDKinds(id flux.ResourceID, kinds []string) error {
 
 func requireSpecKinds(s update.Spec, kinds []string) error {
 	switch s := s.Spec.(type) {
-	case policy.Updates:
+	case resource.PolicyUpdates:
 		for id, _ := range s {
 			_, kind, _ := id.Components()
 			if !contains(kinds, kind) {
@@ -120,7 +120,7 @@ func listServicesWithOptions(ctx context.Context, p listServicesWithoutOptionsCl
 	}
 
 	// Polyfill the service IDs filter
-	want := map[flux.ResourceID]struct{}{}
+	want := map[resource.ID]struct{}{}
 	for _, svc := range opts.Services {
 		want[svc] = struct{}{}
 	}
@@ -160,7 +160,7 @@ func listImagesWithOptions(ctx context.Context, client listImagesWithoutOptionsC
 		return statuses, err
 	}
 
-	policyMap := map[flux.ResourceID]map[string]string{}
+	policyMap := map[resource.ID]map[string]string{}
 	for _, service := range services {
 		policyMap[service.ID] = service.Policies
 	}
diff --git a/remote/rpc/server.go b/remote/rpc/server.go
index 256c8c7ba..2d9f850bf 100644
--- a/remote/rpc/server.go
+++ b/remote/rpc/server.go
@@ -21,7 +21,7 @@ import (
 
 // Server takes an api.Server and makes it available over RPC.
 type Server struct {
-	server  *rpc.Server
+	server *rpc.Server
 }
 
 // NewServer instantiates a new RPC server, handling requests on the
diff --git a/resource/id.go b/resource/id.go
new file mode 100644
index 000000000..280557f2e
--- /dev/null
+++ b/resource/id.go
@@ -0,0 +1,240 @@
+package resource
+
+import (
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"sort"
+	"strings"
+
+	"github.com/pkg/errors"
+)
+
+var (
+	ErrInvalidServiceID = errors.New("invalid service ID")
+
+	LegacyServiceIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_-]+)$")
+	// The namespace and name components are (apparently
+	// non-normatively) defined in
+	// https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/identifiers.md
+	// In practice, more punctuation is used than allowed there;
+	// specifically, people use underscores as well as dashes and dots, and in names, colons.
+	IDRegexp            = regexp.MustCompile("^(<cluster>|[a-zA-Z0-9_-]+):([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
+	UnqualifiedIDRegexp = regexp.MustCompile("^([a-zA-Z0-9_-]+)/([a-zA-Z0-9_.:-]+)$")
+)
+
+// ID is an opaque type which uniquely identifies a resource in an
+// orchestrator.
+type ID struct {
+	resourceIDImpl
+}
+
+type resourceIDImpl interface {
+	String() string
+}
+
+// Old-style <namespace>/<servicename> format
+type legacyServiceID struct {
+	namespace, service string
+}
+
+func (id legacyServiceID) String() string {
+	return fmt.Sprintf("%s/%s", id.namespace, id.service)
+}
+
+// New <namespace>:<kind>/<name> format
+type resourceID struct {
+	namespace, kind, name string
+}
+
+func (id resourceID) String() string {
+	return fmt.Sprintf("%s:%s/%s", id.namespace, id.kind, id.name)
+}
+
+// ParseID constructs a ID from a string representation
+// if possible, returning an error value otherwise.
+func ParseID(s string) (ID, error) {
+	if m := IDRegexp.FindStringSubmatch(s); m != nil {
+		return ID{resourceID{m[1], strings.ToLower(m[2]), m[3]}}, nil
+	}
+	if m := LegacyServiceIDRegexp.FindStringSubmatch(s); m != nil {
+		return ID{legacyServiceID{m[1], m[2]}}, nil
+	}
+	return ID{}, errors.Wrap(ErrInvalidServiceID, "parsing "+s)
+}
+
+// MustParseID constructs a ID from a string representation,
+// panicing if the format is invalid.
+func MustParseID(s string) ID {
+	id, err := ParseID(s)
+	if err != nil {
+		panic(err)
+	}
+	return id
+}
+
+// ParseIDOptionalNamespace constructs a ID from either a fully
+// qualified string representation, or an unqualified kind/name representation
+// and the supplied namespace.
+func ParseIDOptionalNamespace(namespace, s string) (ID, error) {
+	if m := IDRegexp.FindStringSubmatch(s); m != nil {
+		return ID{resourceID{m[1], strings.ToLower(m[2]), m[3]}}, nil
+	}
+	if m := UnqualifiedIDRegexp.FindStringSubmatch(s); m != nil {
+		return ID{resourceID{namespace, strings.ToLower(m[1]), m[2]}}, nil
+	}
+	return ID{}, errors.Wrap(ErrInvalidServiceID, "parsing "+s)
+}
+
+// MakeID constructs a ID from constituent components.
+func MakeID(namespace, kind, name string) ID {
+	return ID{resourceID{namespace, strings.ToLower(kind), name}}
+}
+
+// Components returns the constituent components of a ID
+func (id ID) Components() (namespace, kind, name string) {
+	switch impl := id.resourceIDImpl.(type) {
+	case resourceID:
+		return impl.namespace, impl.kind, impl.name
+	case legacyServiceID:
+		return impl.namespace, "service", impl.service
+	default:
+		panic("wrong underlying type")
+	}
+}
+
+// MarshalJSON encodes a ID as a JSON string. This is
+// done to maintain backwards compatibility with previous flux
+// versions where the ID is a plain string.
+func (id ID) MarshalJSON() ([]byte, error) {
+	if id.resourceIDImpl == nil {
+		// Sadly needed as it's possible to construct an empty ID literal
+		return json.Marshal("")
+	}
+	return json.Marshal(id.String())
+}
+
+// UnmarshalJSON decodes a ID from a JSON string. This is
+// done to maintain backwards compatibility with previous flux
+// versions where the ID is a plain string.
+func (id *ID) UnmarshalJSON(data []byte) (err error) {
+	var str string
+	if err := json.Unmarshal(data, &str); err != nil {
+		return err
+	}
+	if string(str) == "" {
+		// Sadly needed as it's possible to construct an empty ID literal
+		*id = ID{}
+		return nil
+	}
+	*id, err = ParseID(string(str))
+	return err
+}
+
+// MarshalText encodes a ID as a flat string; this is
+// required because ResourceIDs are sometimes used as map keys.
+func (id ID) MarshalText() (text []byte, err error) {
+	return []byte(id.String()), nil
+}
+
+// MarshalText decodes a ID from a flat string; this is
+// required because ResourceIDs are sometimes used as map keys.
+func (id *ID) UnmarshalText(text []byte) error {
+	result, err := ParseID(string(text))
+	if err != nil {
+		return err
+	}
+	*id = result
+	return nil
+}
+
+type IDSet map[ID]struct{}
+
+func (s IDSet) String() string {
+	var ids []string
+	for id := range s {
+		ids = append(ids, id.String())
+	}
+	return "{" + strings.Join(ids, ", ") + "}"
+}
+
+func (s IDSet) Add(ids []ID) {
+	for _, id := range ids {
+		s[id] = struct{}{}
+	}
+}
+
+func (s IDSet) Without(others IDSet) IDSet {
+	if s == nil || len(s) == 0 || others == nil || len(others) == 0 {
+		return s
+	}
+	res := IDSet{}
+	for id := range s {
+		if !others.Contains(id) {
+			res[id] = struct{}{}
+		}
+	}
+	return res
+}
+
+func (s IDSet) Contains(id ID) bool {
+	if s == nil {
+		return false
+	}
+	_, ok := s[id]
+	return ok
+}
+
+func (s IDSet) Intersection(others IDSet) IDSet {
+	if s == nil {
+		return others
+	}
+	if others == nil {
+		return s
+	}
+	result := IDSet{}
+	for id := range s {
+		if _, ok := others[id]; ok {
+			result[id] = struct{}{}
+		}
+	}
+	return result
+}
+
+func (s IDSet) ToSlice() IDs {
+	i := 0
+	keys := make(IDs, len(s))
+	for k := range s {
+		keys[i] = k
+		i++
+	}
+	return keys
+}
+
+type IDs []ID
+
+func (p IDs) Len() int           { return len(p) }
+func (p IDs) Less(i, j int) bool { return p[i].String() < p[j].String() }
+func (p IDs) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+func (p IDs) Sort()              { sort.Sort(p) }
+
+func (ids IDs) Without(others IDSet) (res IDs) {
+	for _, id := range ids {
+		if !others.Contains(id) {
+			res = append(res, id)
+		}
+	}
+	return res
+}
+
+func (ids IDs) Contains(id ID) bool {
+	set := IDSet{}
+	set.Add(ids)
+	return set.Contains(id)
+}
+
+func (ids IDs) Intersection(others IDSet) IDSet {
+	set := IDSet{}
+	set.Add(ids)
+	return set.Intersection(others)
+}
diff --git a/resourceid_test.go b/resource/id_test.go
similarity index 87%
rename from resourceid_test.go
rename to resource/id_test.go
index 786792cc3..32befd6fb 100644
--- a/resourceid_test.go
+++ b/resource/id_test.go
@@ -1,4 +1,4 @@
-package flux
+package resource
 
 import (
 	"testing"
@@ -24,14 +24,14 @@ func TestResourceIDParsing(t *testing.T) {
 
 	for _, tc := range valid {
 		t.Run(tc.name, func(t *testing.T) {
-			if _, err := ParseResourceID(tc.id); err != nil {
+			if _, err := ParseID(tc.id); err != nil {
 				t.Error(err)
 			}
 		})
 	}
 	for _, tc := range invalid {
 		t.Run(tc.name, func(t *testing.T) {
-			if _, err := ParseResourceID(tc.id); err == nil {
+			if _, err := ParseID(tc.id); err == nil {
 				t.Errorf("expected %q to be considered invalid", tc.id)
 			}
 		})
diff --git a/resource/policy.go b/resource/policy.go
index b3910c337..fb3dbea52 100644
--- a/resource/policy.go
+++ b/resource/policy.go
@@ -17,7 +17,7 @@ import (
 // variables. When represented in manifests, policies are expected to
 // have a non-empty value when present, even if it's `"true"`; so an
 // empty value can safely denote deletion.
-func ChangesForPolicyUpdate(workload Workload, update policy.Update) (map[string]string, error) {
+func ChangesForPolicyUpdate(workload Workload, update PolicyUpdate) (map[string]string, error) {
 	add, del := update.Add, update.Remove
 	// We may be sent the pseudo-policy `policy.TagAll`, which means
 	// apply this filter to all containers. To do so, we need to know
@@ -45,3 +45,11 @@ func ChangesForPolicyUpdate(workload Workload, update policy.Update) (map[string
 	}
 	return result, nil
 }
+
+type PolicyUpdates map[ID]PolicyUpdate
+
+type PolicyUpdate struct {
+	Add    policy.Set `json:"add"`
+	Remove policy.Set `json:"remove"`
+}
+
diff --git a/resource/resource.go b/resource/resource.go
index a09a21bbf..8f0bf55db 100644
--- a/resource/resource.go
+++ b/resource/resource.go
@@ -1,17 +1,16 @@
 package resource
 
 import (
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/policy"
 )
 
 // For the minute we just care about
 type Resource interface {
-	ResourceID() flux.ResourceID // name, to correlate with what's in the cluster
-	Policies() policy.Set        // policy for this resource; e.g., whether it is locked, automated, ignored
-	Source() string              // where did this come from (informational)
-	Bytes() []byte               // the definition, for sending to cluster.Sync
+	ResourceID() ID       // name, to correlate with what's in the cluster
+	Policies() policy.Set // policy for this resource; e.g., whether it is locked, automated, ignored
+	Source() string       // where did this come from (informational)
+	Bytes() []byte        // the definition, for sending to cluster.Sync
 }
 
 type Container struct {
diff --git a/sync/mock.go b/sync/mock.go
index cd9d5b466..814ef9604 100644
--- a/sync/mock.go
+++ b/sync/mock.go
@@ -1,8 +1,8 @@
 package sync
 
 import (
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 )
 
 type rsc struct {
@@ -26,8 +26,8 @@ func (rs rsc) Bytes() []byte {
 	return []byte{}
 }
 
-func (rs rsc) ResourceID() flux.ResourceID {
-	return flux.MakeResourceID(rs.Meta.Namespace, rs.Kind, rs.Meta.Name)
+func (rs rsc) ResourceID() resource.ID {
+	return resource.MakeID(rs.Meta.Namespace, rs.Kind, rs.Meta.Name)
 }
 
 func (rs rsc) Policy() policy.Set {
diff --git a/update/automated.go b/update/automated.go
index 0c32575ac..e2328c21d 100644
--- a/update/automated.go
+++ b/update/automated.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/go-kit/kit/log"
-	"github.com/weaveworks/flux"
+
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/resource"
 )
@@ -16,12 +16,12 @@ type Automated struct {
 }
 
 type Change struct {
-	WorkloadID flux.ResourceID
+	WorkloadID resource.ID
 	Container  resource.Container
 	ImageID    image.Ref
 }
 
-func (a *Automated) Add(service flux.ResourceID, container resource.Container, image image.Ref) {
+func (a *Automated) Add(service resource.ID, container resource.Container, image image.Ref) {
 	a.Changes = append(a.Changes, Change{service, container, image})
 }
 
@@ -139,18 +139,18 @@ func (a *Automated) calculateImageUpdates(rc ReleaseContext, candidates []*Workl
 }
 
 // workloadMap transposes the changes so they can be looked up by ID
-func (a *Automated) workloadMap() map[flux.ResourceID][]Change {
-	set := map[flux.ResourceID][]Change{}
+func (a *Automated) workloadMap() map[resource.ID][]Change {
+	set := map[resource.ID][]Change{}
 	for _, change := range a.Changes {
 		set[change.WorkloadID] = append(set[change.WorkloadID], change)
 	}
 	return set
 }
 
-func (a *Automated) workloadIDs() []flux.ResourceID {
-	slice := []flux.ResourceID{}
+func (a *Automated) workloadIDs() []resource.ID {
+	slice := []resource.ID{}
 	for workload, _ := range a.workloadMap() {
-		slice = append(slice, flux.MustParseResourceID(workload.String()))
+		slice = append(slice, resource.MustParseID(workload.String()))
 	}
 	return slice
 }
diff --git a/update/filter.go b/update/filter.go
index 0482f90fe..0c6a2ba16 100644
--- a/update/filter.go
+++ b/update/filter.go
@@ -1,9 +1,9 @@
 package update
 
 import (
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -47,7 +47,7 @@ func (f *SpecificImageFilter) Filter(u WorkloadUpdate) WorkloadResult {
 }
 
 type ExcludeFilter struct {
-	IDs []flux.ResourceID
+	IDs []resource.ID
 }
 
 func (f *ExcludeFilter) Filter(u WorkloadUpdate) WorkloadResult {
@@ -63,7 +63,7 @@ func (f *ExcludeFilter) Filter(u WorkloadUpdate) WorkloadResult {
 }
 
 type IncludeFilter struct {
-	IDs []flux.ResourceID
+	IDs []resource.ID
 }
 
 func (f *IncludeFilter) Filter(u WorkloadUpdate) WorkloadResult {
diff --git a/update/menu.go b/update/menu.go
index 2605b1530..129e3dbf7 100644
--- a/update/menu.go
+++ b/update/menu.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"text/tabwriter"
 
-	"github.com/weaveworks/flux"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -69,7 +69,7 @@ func (c *writer) flush() error {
 }
 
 type menuItem struct {
-	id     flux.ResourceID
+	id     resource.ID
 	status WorkloadUpdateStatus
 	error  string
 	update ContainerUpdate
@@ -101,7 +101,7 @@ func NewMenu(out io.Writer, results Result, verbosity int) *Menu {
 
 func (m *Menu) fromResults(results Result, verbosity int) {
 	for _, workloadID := range results.WorkloadIDs() {
-		resourceID := flux.MustParseResourceID(workloadID)
+		resourceID := resource.MustParseID(workloadID)
 		result := results[resourceID]
 		switch result.Status {
 		case ReleaseStatusIgnored:
@@ -147,8 +147,8 @@ func (m *Menu) AddItem(mi menuItem) {
 }
 
 // Run starts the interactive menu mode.
-func (m *Menu) Run() (map[flux.ResourceID][]ContainerUpdate, error) {
-	specs := make(map[flux.ResourceID][]ContainerUpdate)
+func (m *Menu) Run() (map[resource.ID][]ContainerUpdate, error) {
+	specs := make(map[resource.ID][]ContainerUpdate)
 	if m.selectable == 0 {
 		return specs, errors.New("No changes found.")
 	}
@@ -194,7 +194,7 @@ func (m *Menu) Run() (map[flux.ResourceID][]ContainerUpdate, error) {
 
 func (m *Menu) Print() {
 	m.wr.writeln(tableHeading)
-	var previd flux.ResourceID
+	var previd resource.ID
 	for _, item := range m.items {
 		inline := previd == item.id
 		m.wr.writeln(m.renderItem(item, inline))
@@ -207,7 +207,7 @@ func (m *Menu) printInteractive() {
 	m.wr.clear()
 	m.wr.writeln("    " + tableHeading)
 	i := 0
-	var previd flux.ResourceID
+	var previd resource.ID
 	for _, item := range m.items {
 		inline := previd == item.id
 		m.wr.writeln(m.renderInteractiveItem(item, inline, i))
diff --git a/update/print_test.go b/update/print_test.go
index ec76dd015..d56eb16f0 100644
--- a/update/print_test.go
+++ b/update/print_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
+	"github.com/weaveworks/flux/resource"
 )
 
 func mustParseRef(s string) image.Ref {
@@ -26,7 +26,7 @@ func TestPrintResults(t *testing.T) {
 		{
 			name: "basic, just results",
 			result: Result{
-				flux.MustParseResourceID("default/helloworld"): WorkloadResult{
+				resource.MustParseID("default/helloworld"): WorkloadResult{
 					Status: ReleaseStatusSuccess,
 					Error:  "",
 					PerContainer: []ContainerUpdate{
@@ -47,7 +47,7 @@ default/helloworld  success  helloworld: quay.io/weaveworks/helloworld:master-a0
 		{
 			name: "With an error, *and* results",
 			result: Result{
-				flux.MustParseResourceID("default/helloworld"): WorkloadResult{
+				resource.MustParseID("default/helloworld"): WorkloadResult{
 					Status: ReleaseStatusSuccess,
 					Error:  "test error",
 					PerContainer: []ContainerUpdate{
@@ -69,10 +69,10 @@ default/helloworld  success  test error
 		{
 			name: "Service results should be sorted",
 			result: Result{
-				flux.MustParseResourceID("default/d"): WorkloadResult{Status: ReleaseStatusSuccess},
-				flux.MustParseResourceID("default/c"): WorkloadResult{Status: ReleaseStatusSuccess},
-				flux.MustParseResourceID("default/b"): WorkloadResult{Status: ReleaseStatusSuccess},
-				flux.MustParseResourceID("default/a"): WorkloadResult{Status: ReleaseStatusSuccess},
+				resource.MustParseID("default/d"): WorkloadResult{Status: ReleaseStatusSuccess},
+				resource.MustParseID("default/c"): WorkloadResult{Status: ReleaseStatusSuccess},
+				resource.MustParseID("default/b"): WorkloadResult{Status: ReleaseStatusSuccess},
+				resource.MustParseID("default/a"): WorkloadResult{Status: ReleaseStatusSuccess},
 			},
 			expected: `
 WORKLOAD   STATUS   UPDATES
diff --git a/update/release_containers.go b/update/release_containers.go
index 7231ab5db..e225f9205 100644
--- a/update/release_containers.go
+++ b/update/release_containers.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/go-kit/kit/log"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/resource"
 )
@@ -19,7 +18,7 @@ var zeroImageRef = image.Ref{}
 // ReleaseContainersSpec defines the spec for a `containers` manifest update.
 type ReleaseContainersSpec struct {
 	Kind           ReleaseKind
-	ContainerSpecs map[flux.ResourceID][]ContainerUpdate
+	ContainerSpecs map[resource.ID][]ContainerUpdate
 	SkipMismatches bool
 	Force          bool
 }
@@ -59,7 +58,7 @@ func (s ReleaseContainersSpec) resultsError(results Result) error {
 }
 
 func (s ReleaseContainersSpec) filters() ([]WorkloadFilter, []WorkloadFilter) {
-	var rids []flux.ResourceID
+	var rids []resource.ID
 	for rid := range s.ContainerSpecs {
 		rids = append(rids, rid)
 	}
diff --git a/update/release_image.go b/update/release_image.go
index 5a0add724..795a61769 100644
--- a/update/release_image.go
+++ b/update/release_image.go
@@ -8,10 +8,10 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/go-kit/kit/log"
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
 	"github.com/weaveworks/flux/policy"
 	"github.com/weaveworks/flux/registry"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -56,7 +56,7 @@ type ReleaseImageSpec struct {
 	ServiceSpecs []ResourceSpec // TODO: rename to WorkloadSpecs after adding versioning
 	ImageSpec    ImageSpec
 	Kind         ReleaseKind
-	Excludes     []flux.ResourceID
+	Excludes     []resource.ID
 	Force        bool
 }
 
@@ -119,14 +119,14 @@ func (s ReleaseImageSpec) selectWorkloads(ctx context.Context, rc ReleaseContext
 func (s ReleaseImageSpec) filters(rc ReleaseContext) ([]WorkloadFilter, []WorkloadFilter, error) {
 	var prefilters, postfilters []WorkloadFilter
 
-	ids := []flux.ResourceID{}
+	ids := []resource.ID{}
 	for _, ss := range s.ServiceSpecs {
 		if ss == ResourceSpecAll {
 			// "<all>" Overrides any other filters
-			ids = []flux.ResourceID{}
+			ids = []resource.ID{}
 			break
 		}
-		id, err := flux.ParseResourceID(string(ss))
+		id, err := resource.ParseID(string(ss))
 		if err != nil {
 			return nil, nil, err
 		}
@@ -297,25 +297,25 @@ func (s ReleaseImageSpec) calculateImageUpdates(rc ReleaseContext, candidates []
 	return updates, nil
 }
 
-type ResourceSpec string // ResourceID or "<all>"
+type ResourceSpec string // ID or "<all>"
 
 func ParseResourceSpec(s string) (ResourceSpec, error) {
 	if s == string(ResourceSpecAll) {
 		return ResourceSpecAll, nil
 	}
-	id, err := flux.ParseResourceID(s)
+	id, err := resource.ParseID(s)
 	if err != nil {
 		return "", errors.Wrap(err, "invalid workload spec")
 	}
 	return ResourceSpec(id.String()), nil
 }
 
-func MakeResourceSpec(id flux.ResourceID) ResourceSpec {
+func MakeResourceSpec(id resource.ID) ResourceSpec {
 	return ResourceSpec(id.String())
 }
 
-func (s ResourceSpec) AsID() (flux.ResourceID, error) {
-	return flux.ParseResourceID(string(s))
+func (s ResourceSpec) AsID() (resource.ID, error) {
+	return resource.ParseID(string(s))
 }
 
 func (s ResourceSpec) String() string {
diff --git a/update/result.go b/update/result.go
index 9f4c7c16e..ff057f048 100644
--- a/update/result.go
+++ b/update/result.go
@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/image"
+	"github.com/weaveworks/flux/resource"
 )
 
 type WorkloadUpdateStatus string
@@ -19,7 +19,7 @@ const (
 	ReleaseStatusUnknown WorkloadUpdateStatus = "unknown"
 )
 
-type Result map[flux.ResourceID]WorkloadResult
+type Result map[resource.ID]WorkloadResult
 
 func (r Result) WorkloadIDs() []string {
 	var result []string
@@ -30,8 +30,8 @@ func (r Result) WorkloadIDs() []string {
 	return result
 }
 
-func (r Result) AffectedResources() flux.ResourceIDs {
-	ids := flux.ResourceIDs{}
+func (r Result) AffectedResources() resource.IDs {
+	ids := resource.IDs{}
 	for id, result := range r {
 		if result.Status == ReleaseStatusSuccess {
 			ids = append(ids, id)
diff --git a/update/spec.go b/update/spec.go
index a84ef5f20..e285e72e0 100644
--- a/update/spec.go
+++ b/update/spec.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/weaveworks/flux/policy"
+	"github.com/weaveworks/flux/resource"
 )
 
 const (
@@ -43,7 +43,7 @@ func (spec *Spec) UnmarshalJSON(in []byte) error {
 	spec.Cause = wire.Cause
 	switch wire.Type {
 	case Policy:
-		var update policy.Updates
+		var update resource.PolicyUpdates
 		if err := json.Unmarshal(wire.SpecBytes, &update); err != nil {
 			return err
 		}
diff --git a/update/workload.go b/update/workload.go
index 7eeacbc49..bb14fc044 100644
--- a/update/workload.go
+++ b/update/workload.go
@@ -1,13 +1,12 @@
 package update
 
 import (
-	"github.com/weaveworks/flux"
 	"github.com/weaveworks/flux/cluster"
 	"github.com/weaveworks/flux/resource"
 )
 
 type WorkloadUpdate struct {
-	ResourceID flux.ResourceID
+	ResourceID resource.ID
 	Workload   cluster.Workload
 	Resource   resource.Workload
 	Updates    []ContainerUpdate

From f16a99583cbcdac31e8022cacd6d22d2e69d7238 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 10 Jul 2019 12:46:35 +0200
Subject: [PATCH 013/158] Chart: support Helm operator `--workers` flag

---
 chart/flux/README.md                               | 1 +
 chart/flux/templates/helm-operator-deployment.yaml | 3 +++
 chart/flux/values.yaml                             | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/chart/flux/README.md b/chart/flux/README.md
index 94d3fa78d..86e680381 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -263,6 +263,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `helmOperator.git.timeout`                        | `git.timeout`                                        | Duration after which git operations time out
 | `helmOperator.git.secretName`                     | `None`                                               | The name of the kubernetes secret with the SSH private key, supercedes `git.secretName`
 | `helmOperator.chartsSyncInterval`                 | `3m`                                                 | Interval at which to check for changed charts
+| `helmOperator.workers`                            | `None`                                               | (Experimental) amount of workers processing releases
 | `helmOperator.extraEnvs`                          | `[]`                                                 | Extra environment variables for the Helm operator pod
 | `helmOperator.logReleaseDiffs`                    | `false`                                              | Helm operator should log the diff when a chart release diverges (possibly insecure)
 | `helmOperator.allowNamespace`                     | `None`                                               | If set, this limits the scope to a single namespace. If not specified, all namespaces will be watched
diff --git a/chart/flux/templates/helm-operator-deployment.yaml b/chart/flux/templates/helm-operator-deployment.yaml
index 228856205..cf949360b 100644
--- a/chart/flux/templates/helm-operator-deployment.yaml
+++ b/chart/flux/templates/helm-operator-deployment.yaml
@@ -126,6 +126,9 @@ spec:
         - --charts-sync-interval={{ .Values.helmOperator.chartsSyncInterval }}
         - --update-chart-deps={{ .Values.helmOperator.updateChartDeps }}
         - --log-release-diffs={{ .Values.helmOperator.logReleaseDiffs }}
+        {{- if .Values.helmOperator.workers }}
+        - --workers={{ .Values.helmOperator.workers }}
+        {{- end }}
         {{- if not .Values.clusterRole.create }}
         - --allow-namespace={{ .Release.Namespace }}
         {{- else if .Values.helmOperator.allowNamespace }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 285c669ab..9fc39452d 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -33,6 +33,8 @@ helmOperator:
   logReleaseDiffs: false
   # Interval at which to check for changed charts
   chartsSyncInterval: "3m"
+  # (Experimental) amount of workers processing releases
+  workers:
   # Tiller settings
   tillerNamespace: kube-system
   tls:

From 835993334b404b58527512f5cc9c7c70a9630758 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 10 Jul 2019 12:25:08 +0100
Subject: [PATCH 014/158] Update changelog for v1.13.2

---
 CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551f5bdc0..167b0da62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,53 @@
 This is the changelog for the Flux daemon; the changelog for the Helm
 operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
+## 1.13.2 (2019-07-10)
+
+This is a patch release, including a fix for [problems with using image
+labels as timestamps][weaveworks/flux#2176].
+
+### Fixes
+
+- Because image labels are inherited from base images, fluxd cannot
+  indiscriminately use labels to determine the image created date. You
+  must now explicitly allow that behaviour with the argument
+  `--registry-use-labels` [weaveworks/flux#2176][]
+- Image timestamps can be missing (or zero) if ordering them by semver
+  version rather than timestamp [weaveworks/flux#2175][]
+- Environment variables needed by the Google Cloud SDK helper are now
+  propagated to git [weaveworks/flux#2222][]
+
+### Maintenance and documentation
+
+- Image builds are pushed to both weaveworks/ and fluxcd/ orgs on
+  DockerHub, in preparation for the project moving organisations
+  [weaveworks/flux#2213][]
+- Calculate Go dependencies more efficiently during the build
+  [weaveworks/flux#2207][]
+- Refactor to remove a spurious top-level package
+  [weaveworks/flux#2201][]
+- Update the version of Kubernetes-in-Docker used in end-to-end test,
+  to v0.4.0 [weaveworks/flux#2202][]
+- Bump the Ubuntu version used in CI [weaveworks/flux#2195][]
+
+### Thanks
+
+Thanks go to the following for contributions: @2opremio, @4c74356b41,
+@ArchiFleKs, @adrian, @alanjcastonguay, @alexanderbuhler,
+@alexhumphreys, @bobbytables, @derrickburns, @dholbach, @dlespiau,
+@gaffneyd4, @hiddeco, @hkalsi, @hlascelles, @jaksonwkr, @jblunck,
+@jwenz723, @linuxbsdfreak, @luxas, @mpashka, @nlamot, @semyonslepov,
+@squaremo, @stefanprodan, @tegamckinney, @ysaakpr.
+
+[weaveworks/flux#2175]: https://github.com/weaveworks/flux/pull/2175
+[weaveworks/flux#2176]: https://github.com/weaveworks/flux/pull/2171
+[weaveworks/flux#2195]: https://github.com/weaveworks/flux/pull/2195
+[weaveworks/flux#2201]: https://github.com/weaveworks/flux/pull/2201
+[weaveworks/flux#2202]: https://github.com/weaveworks/flux/pull/2202
+[weaveworks/flux#2207]: https://github.com/weaveworks/flux/pull/2207
+[weaveworks/flux#2213]: https://github.com/weaveworks/flux/pull/2213
+[weaveworks/flux#2222]: https://github.com/weaveworks/flux/pull/2222
+
 ## 1.13.1 (2019-06-27)
 
 This is a patch release.

From 8ff9385e0e30cca98496c2bf611f4772bf8b5701 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 10 Jul 2019 12:26:36 +0100
Subject: [PATCH 015/158] Bump fluxd version in example and chart

---
 CHANGELOG.md                | 2 +-
 chart/flux/values.yaml      | 2 +-
 deploy/flux-deployment.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167b0da62..bcac59854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,7 @@ Thanks go to the following for contributions: @2opremio, @4c74356b41,
 @squaremo, @stefanprodan, @tegamckinney, @ysaakpr.
 
 [weaveworks/flux#2175]: https://github.com/weaveworks/flux/pull/2175
-[weaveworks/flux#2176]: https://github.com/weaveworks/flux/pull/2171
+[weaveworks/flux#2176]: https://github.com/weaveworks/flux/pull/2176
 [weaveworks/flux#2195]: https://github.com/weaveworks/flux/pull/2195
 [weaveworks/flux#2201]: https://github.com/weaveworks/flux/pull/2201
 [weaveworks/flux#2202]: https://github.com/weaveworks/flux/pull/2202
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 63fbd6668..a87313cd8 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -9,7 +9,7 @@ logFormat: fmt
 
 image:
   repository: docker.io/weaveworks/flux
-  tag: 1.13.1
+  tag: 1.13.2
   pullPolicy: IfNotPresent
   pullSecret:
 
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 86d235576..adbd6b2fe 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/flux:1.13.1
+        image: docker.io/weaveworks/flux:1.13.2
         imagePullPolicy: IfNotPresent
         resources:
           requests:

From bfc77d92b6e0fe1f5c9a55ea2917fe83c6481ff8 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Wed, 10 Jul 2019 15:00:41 +0100
Subject: [PATCH 016/158] Change badges to fluxcd

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f70447194..12dff374b 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,8 @@ new infrastructure.
 
 ![Deployment Pipeline](site/images/flux-cd-diagram.png)
 
-[![CircleCI](https://circleci.com/gh/weaveworks/flux.svg?style=svg)](https://circleci.com/gh/weaveworks/flux)
-[![GoDoc](https://godoc.org/github.com/weaveworks/flux?status.svg)](https://godoc.org/github.com/weaveworks/flux)
+[![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
+[![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
 
 ## What Flux does
 

From cf2cde9d8fac7417753268a11b6b30dea2468836 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 5 Jul 2019 11:48:34 +0200
Subject: [PATCH 017/158] Change org in image definitions to 'fluxcd'

---
 chart/flux/README.md                                  | 4 ++--
 chart/flux/values.yaml                                | 4 ++--
 deploy-helm/helm-operator-deployment.yaml             | 2 +-
 deploy-helm/weave-cloud-helm-operator-deployment.yaml | 2 +-
 deploy/flux-deployment.yaml                           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chart/flux/README.md b/chart/flux/README.md
index 86e680381..98ccbc87f 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -183,7 +183,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 
 | Parameter                                         | Default                                              | Description
 | -----------------------------------------------   | ---------------------------------------------------- | ---
-| `image.repository`                                | `docker.io/weaveworks/flux`                          | Image repository
+| `image.repository`                                | `docker.io/fluxcd/flux`                              | Image repository
 | `image.tag`                                       | `<VERSION>`                                          | Image tag
 | `replicaCount`                                    | `1`                                                  | Number of Flux pods to deploy, more than one is not desirable.
 | `image.pullPolicy`                                | `IfNotPresent`                                       | Image pull policy
@@ -253,7 +253,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `memcached.securityContext`                       | [See values.yaml](/chart/flux/values.yaml#L192-L195) | Container security context for memcached
 | `helmOperator.create`                             | `false`                                              | If `true`, install the Helm operator
 | `helmOperator.createCRD`                          | `true`                                               | Create the `v1beta1` and `v1alpha2` Flux CRDs. Dependent on `helmOperator.create=true`
-| `helmOperator.repository`                         | `docker.io/weaveworks/helm-operator`                 | Helm operator image repository
+| `helmOperator.repository`                         | `docker.io/fluxcd/helm-operator`                     | Helm operator image repository
 | `helmOperator.tag`                                | `<VERSION>`                                          | Helm operator image tag
 | `helmOperator.replicaCount`                       | `1`                                                  | Number of helm operator pods to deploy, more than one is not desirable.
 | `helmOperator.pullPolicy`                         | `IfNotPresent`                                       | Helm operator image pull policy
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index c9086aea2..c4d72566d 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -8,7 +8,7 @@ replicaCount: 1
 logFormat: fmt
 
 image:
-  repository: docker.io/weaveworks/flux
+  repository: docker.io/fluxcd/flux
   tag: 1.13.2
   pullPolicy: IfNotPresent
   pullSecret:
@@ -21,7 +21,7 @@ helmOperator:
   replicaCount: 1
   create: false
   createCRD: false
-  repository: docker.io/weaveworks/helm-operator
+  repository: docker.io/fluxcd/helm-operator
   tag: 0.10.0
   pullPolicy: IfNotPresent
   pullSecret:
diff --git a/deploy-helm/helm-operator-deployment.yaml b/deploy-helm/helm-operator-deployment.yaml
index 0db1ed8af..3f3afa1f9 100644
--- a/deploy-helm/helm-operator-deployment.yaml
+++ b/deploy-helm/helm-operator-deployment.yaml
@@ -62,7 +62,7 @@ spec:
         # There are no ":latest" images for helm-operator. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/helm-operator:0.10.0
+        image: docker.io/fluxcd/helm-operator:0.10.0
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index 8080094e3..920f6c6a6 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -27,7 +27,7 @@ spec:
             secretName: flux-git-deploy
       containers:
         - name: flux-helm-operator
-          image: docker.io/weaveworks/helm-operator:0.10.0
+          image: docker.io/fluxcd/helm-operator:0.10.0
           imagePullPolicy: IfNotPresent
           args:
             - --git-timeout=20s
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 5f493da1c..6af51af25 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/flux:1.13.2
+        image: docker.io/fluxcd/flux:1.13.2
         imagePullPolicy: IfNotPresent
         resources:
           requests:

From 992582c0d6997560cc1af961612106178dbf0d68 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 5 Jul 2019 11:54:41 +0200
Subject: [PATCH 018/158] Change org in image definition docs to 'fluxcd'

---
 site/get-started-developing.md | 18 +++++++++---------
 site/troubleshooting.md        |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/site/get-started-developing.md b/site/get-started-developing.md
index 93d7a7648..2e3f9606e 100644
--- a/site/get-started-developing.md
+++ b/site/get-started-developing.md
@@ -7,7 +7,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
 > From a very high level, there are at least 3 ways you can develop on Flux once you have your environment set up:
 > 1. The "minimalist" approach (only requires and `kubectl`):
 >    1. `make`
->    1. copy the specific image tag (e.g. `docker.io/weaveworks/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
+>    1. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
 >    1. deploy the resources in `/develop/*.yaml` manually with `kubectl apply`
 >    1. make a change to the code
 >    1. see your code changes have been deployed
@@ -98,19 +98,19 @@ Now that we know everything is working with `flux-getting-started`, we're going
     In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo.  You'll see docker's usual output as it builds the image layers.  Once it's done, you should see something like this in the middle of the output:
     ```
     Successfully built 606610e0f4ef
-    Successfully tagged docker.io/weaveworks/flux:latest
-    Successfully tagged docker.io/weaveworks/flux:master-a86167e4
+    Successfully tagged docker.io/fluxcd/flux:latest
+    Successfully tagged docker.io/fluxcd/flux:master-a86167e4
     ```
     This confirms that a new docker image was tagged for your image.
 
-1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
+1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/fluxcd/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
     ```yaml
     spec:
       template:
         spec:
           containers:
           - name: flux
-            image: docker.io/weaveworks/flux
+            image: docker.io/fluxcd/flux
             imagePullPolicy: IfNotPresent
             args:
               - --git-url=git@github.com:<YOUR-GITHUB-USERNAME>/flux-getting-started
@@ -157,8 +157,8 @@ Now that we know everything is working with `flux-getting-started`, we're going
 
     You should see an output that looks something like this:
     ```
-    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
-    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux    successful=60 attempted=60
+    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
+    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux    successful=60 attempted=60
     ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
     ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
     ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
@@ -186,9 +186,9 @@ Now that we know everything is working with `flux-getting-started`, we're going
     flux-6f7fd5bbc-6j9d5   1/1     Running   0          10s
     ```
 
-    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/weaveworks/flux:latest` and it went ahead and redeployed that pod for us.
+    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/fluxcd/flux:latest` and it went ahead and redeployed that pod for us.
 
-    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/weaveworks/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
+    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
 
     There is another way to do this, of course.  Remember that before when we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>` syntax (in our specific example above it was `:master-a86167e4`).  We could, in theory, grab that tag every time we `make`, and then paste it into `spec.template.spec.containers[0].image` of our deployment.  That's tedious and error prone.  Instead, `freshpod` cuts this step out for us and accomplishes the same end goal.
 
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 159001685..55703833c 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -97,7 +97,7 @@ reasons this can happen:
    ```yaml
     spec:
       containers:
-        image: docker.io/weaveworks/flux
+        image: docker.io/fluxcd/flux
         ...
         volumeMounts:
         - name: acr-credentials

From b74cb7b9558c07c7985eee1af6e7942a8e486d03 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 5 Jul 2019 11:56:59 +0200
Subject: [PATCH 019/158] Change org in image definition tests to 'fluxcd'

---
 api/v9/change_test.go       | 2 +-
 image/image.go              | 4 ++--
 registry/cache/registry.go  | 2 +-
 registry/client.go          | 2 +-
 registry/imageentry_test.go | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/api/v9/change_test.go b/api/v9/change_test.go
index cdc2c4432..136ff3db3 100644
--- a/api/v9/change_test.go
+++ b/api/v9/change_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestChangeEncoding(t *testing.T) {
-	ref, _ := image.ParseRef("docker.io/weaveworks/flux")
+	ref, _ := image.ParseRef("docker.io/fluxcd/flux")
 	name := ref.Name
 
 	for _, update := range []Change{
diff --git a/image/image.go b/image/image.go
index e8e56b10e..5f9a49afb 100644
--- a/image/image.go
+++ b/image/image.go
@@ -33,7 +33,7 @@ var (
 // Examples (stringified):
 //   * alpine
 //   * library/alpine
-//   * docker.io/weaveworks/flux
+//   * docker.io/fluxcd/flux
 //   * localhost:5000/arbitrary/path/to/repo
 type Name struct {
 	Domain, Image string
@@ -107,7 +107,7 @@ func (i Name) ToRef(tag string) Ref {
 // Examples (stringified):
 //  * alpine:3.5
 //  * library/alpine:3.5
-//  * docker.io/weaveworks/flux:1.1.0
+//  * docker.io/fluxcd/flux:1.1.0
 //  * localhost:5000/arbitrary/path/to/repo:revision-sha1
 type Ref struct {
 	Name
diff --git a/registry/cache/registry.go b/registry/cache/registry.go
index d238dc5e9..89df2edc7 100644
--- a/registry/cache/registry.go
+++ b/registry/cache/registry.go
@@ -74,7 +74,7 @@ func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
 }
 
 // GetImageRepositoryMetadata returns the metadata from an image
-// repository (e.g,. at "docker.io/weaveworks/flux")
+// repository (e.g,. at "docker.io/fluxcd/flux")
 func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetadata, error) {
 	repoKey := NewRepositoryKey(id.CanonicalName())
 	bytes, _, err := c.Reader.GetKey(repoKey)
diff --git a/registry/client.go b/registry/client.go
index b34de4635..2afe6dc02 100644
--- a/registry/client.go
+++ b/registry/client.go
@@ -56,7 +56,7 @@ func (entry *ImageEntry) UnmarshalJSON(bytes []byte) error {
 }
 
 // Client is a remote registry client for a particular image
-// repository (e.g., for docker.io/weaveworks/flux). It is an interface
+// repository (e.g., for docker.io/fluxcd/flux). It is an interface
 // so we can wrap it in instrumentation, write fake implementations,
 // and so on.
 type Client interface {
diff --git a/registry/imageentry_test.go b/registry/imageentry_test.go
index 6263f1234..0789745f8 100644
--- a/registry/imageentry_test.go
+++ b/registry/imageentry_test.go
@@ -22,7 +22,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 		assert.Equal(t, entry, entry2)
 	}
 
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 
 	info := image.Info{
@@ -44,7 +44,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 // Check that existing entries, which are image.Info, will parse into
 // the ImageEntry struct.
 func TestImageInfoParsesAsEntry(t *testing.T) {
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 	info := image.Info{
 		ID:        ref,

From 7d48f03a2d16016b59a0e93b8b83935cebd4d962 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 10 Jul 2019 18:00:44 +0200
Subject: [PATCH 020/158] Update labels in Dockerfiles to match `fluxcd` org

---
 docker/Dockerfile.flux          | 18 +++++++++---------
 docker/Dockerfile.helm-operator | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
index dd629fd40..bef07cfe5 100644
--- a/docker/Dockerfile.flux
+++ b/docker/Dockerfile.flux
@@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./kustomize /usr/local/bin
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux" \
-      org.opencontainers.image.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The GitOps operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux" \
-      org.label-schema.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The GitOps operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "fluxd" ]
 
diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator
index 9b70a9e62..dcaa7ef7e 100644
--- a/docker/Dockerfile.helm-operator
+++ b/docker/Dockerfile.helm-operator
@@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./helm /usr/local/bin/
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux-helm-operator" \
-      org.opencontainers.image.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The Helm operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux-helm-operator" \
-      org.label-schema.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The Helm operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "helm-operator" ]
 

From 76a2fa4814da1ab300fbbd7b4dfa2fbf3ddbcecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Mei=C3=9Fner?=
 <22190992+fnmeissner@users.noreply.github.com>
Date: Wed, 10 Jul 2019 17:05:34 +0200
Subject: [PATCH 021/158] helm repository is now fluxcd instead weaveworks

The helm repository has moved to fluxcd and the documentation should be updated accordingly.
See #2241
---
 site/helm-get-started.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/helm-get-started.md b/site/helm-get-started.md
index dc5dac3d3..a31d647ab 100644
--- a/site/helm-get-started.md
+++ b/site/helm-get-started.md
@@ -62,16 +62,16 @@ helm init --skip-refresh --upgrade --service-account tiller --history-max 10
 
 ## Install Flux
 
-Add the Flux repository of Weaveworks:
+Add the Flux repository:
 
 ```sh
-helm repo add weaveworks https://weaveworks.github.io/flux
+helm repo add fluxcd https://fluxcd.github.io/flux
 ```
 
 Apply the Helm Release CRD:
 
 ```sh
-kubectl apply -f https://raw.githubusercontent.com/weaveworks/flux/master/deploy-helm/flux-helm-release-crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/fluxcd/flux/master/deploy-helm/flux-helm-release-crd.yaml
 ```
 
 In this next step you install Flux using `helm`. Simply
@@ -92,7 +92,7 @@ In this next step you install Flux using `helm`. Simply
       --set helmOperator.createCRD=false \
       --set git.url=git@github.com:YOURUSER/flux-get-started \
       --namespace flux \
-      weaveworks/flux
+      fluxcd/flux
       ```
 
     - Using a private git server:

From afff06d0a03b29ddc9ced118ed1e3a2eedabd3ed Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 10 Jul 2019 18:37:00 +0200
Subject: [PATCH 022/158] Release chart v0.11.0

---
 chart/flux/CHANGELOG.md | 27 ++++++++++++++++++++++++++-
 chart/flux/Chart.yaml   | 10 +++++-----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/chart/flux/CHANGELOG.md b/chart/flux/CHANGELOG.md
index 1528f3f62..c27c7f34a 100644
--- a/chart/flux/CHANGELOG.md
+++ b/chart/flux/CHANGELOG.md
@@ -1,4 +1,29 @@
-## 0.11.0 (2019-06-27)
+## 0.11.0 (2019-07-10)
+
+### Improvements
+
+ - Updated Flux to `1.13.2` and the Helm operator to `0.10.0`
+   [fluxcd/flux#2235](https://github.com/fluxcd/flux/pull/2235)
+   [fluxcd/flux#2237](https://github.com/fluxcd/flux/pull/2237)
+ - Changed from DockerHub organization `weaveworks` -> `fluxcd`
+   [fluxcd/flux#2224](https://github.com/fluxcd/flux/pull/2224)
+ - Updated `HelmRelease` CRD to support rollbacks
+   [fluxcd/flux#2006](https://github.com/fluxcd/flux/pull/2006)
+ - Allow namespace scoping for both Flux and the Helm operator
+   [fluxcd/flux#2206](https://github.com/fluxcd/flux/pull/2206)
+   [fluxcd/flux#2209](https://github.com/fluxcd/flux/pull/2209)
+ - Removed long deprecated `FluxHelmRelease` CRD and disabled CRD
+   creation as the default to follow our own best practices
+   [fluxcd/flux#2190](https://github.com/fluxcd/flux/pull/2190)
+ - Enable `PodSecurityPolicy`
+   [fluxcd/flux#2223](https://github.com/fluxcd/flux/pull/2223)
+   [fluxcd/flux#2225](https://github.com/fluxcd/flux/pull/2225)
+ - Support new Flux `--registry-use-labels` flag (`registry.useTimestampLabels`)
+   [fluxcd/flux#2176](https://github.com/fluxcd/flux/pull/2176)
+ - Support new Helm operator `--workers` flag (`helmOperator.workers`)
+   [fluxcd/flux#2236](https://github.com/fluxcd/flux/pull/2236)
+
+## 0.10.2 (2019-06-27)
 
 ### Improvements
 
diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
index befb491af..124406bd8 100644
--- a/chart/flux/Chart.yaml
+++ b/chart/flux/Chart.yaml
@@ -1,16 +1,16 @@
 apiVersion: v1
-appVersion: "1.13.1"
-version: 0.10.2
+appVersion: "1.13.2"
+version: 0.11.0
 kubeVersion: ">=1.9.0-0"
 name: flux
 description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control
-home: https://weave.works
+home: https://fluxcd.io
 sources:
-- https://github.com/weaveworks/flux
+- https://github.com/fluxcd/flux
 maintainers:
   - name: stefanprodan
     email: stefan@weave.works
 engine: gotpl
-icon: https://raw.githubusercontent.com/weaveworks/flux/master/site/images/weave-flux.png
+icon: https://raw.githubusercontent.com/fluxcd/flux/master/site/images/weave-flux.png
 keywords:
   - gitops

From efccecbd35bf8788c3c1ed22bf4c677bf97649cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Mei=C3=9Fner?= <felix.meissner@hanko.io>
Date: Thu, 11 Jul 2019 14:08:23 +0200
Subject: [PATCH 023/158] parse credentials without scheme

When the host within the docker config has format IP:PORT
url.Parse(host) fails. This commit will first try reparsing
with prepended scheme before returning any error.
---
 registry/credentials.go      | 23 ++++++++++++-----------
 registry/credentials_test.go |  4 ++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/registry/credentials.go b/registry/credentials.go
index 9962b8903..ed9e53419 100644
--- a/registry/credentials.go
+++ b/registry/credentials.go
@@ -74,28 +74,29 @@ func ParseCredentials(from string, b []byte) (Credentials, error) {
 			return Credentials{}, err
 		}
 
+		if host == "http://" || host == "https://" {
+			return Credentials{}, errors.New("Empty registry auth url")
+		}
+
 		// Some users were passing in credentials in the form of
 		// http://docker.io and http://docker.io/v1/, etc.
 		// So strip everything down to the host.
 		// Also, the registry might be local and on a different port.
 		// So we need to check for that because url.Parse won't parse the ip:port format very well.
 		u, err := url.Parse(host)
-		if err != nil {
-			return Credentials{}, err
-		}
-		if u.Host == "" && u.Path == "" && !strings.Contains(host, ":") || host == "http://" || host == "https://" {
-			return Credentials{}, errors.New("Empty registry auth url")
-		}
-		if u.Host == "" { // If there's no https:// prefix, it won't parse the host.
+
+		// if anything went wrong try to prepend https://
+		if err != nil || u.Host == "" {
 			u, err = url.Parse(fmt.Sprintf("https://%s/", host))
 			if err != nil {
 				return Credentials{}, err
 			}
-			// If the host is still empty, then there's probably a rogue /
-			if u.Host == "" {
-				return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
-			}
 		}
+
+		if u.Host == "" { // If host is still empty the url must be broken.
+			return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
+		}
+
 		host = u.Host
 
 		creds.registry = host
diff --git a/registry/credentials_test.go b/registry/credentials_test.go
index b93c8f282..44c013ebc 100644
--- a/registry/credentials_test.go
+++ b/registry/credentials_test.go
@@ -39,6 +39,10 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			host:        "localhost:5000/v2/",
 			imagePrefix: "localhost:5000",
 		},
+		{
+			host:        "192.168.99.100:5000",
+			imagePrefix: "192.168.99.100:5000",
+		},
 		{
 			host:        "https://192.168.99.100:5000/v2",
 			imagePrefix: "192.168.99.100:5000",

From 2363a65a8bc3bd58e6b3ed831856df319a1f8754 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 12 Jul 2019 14:28:03 +0200
Subject: [PATCH 024/158] Fixed rollback.timeout type definition in CRD

Trying to a apply a `HelmRelease` with a set `rollback.timeout` would
result in a validation error: `spec.rollback.timeout in body must be of
type int64: "integer"`.

This was due to the fact that the validation scheme definition contained
a mistake, the `type` should be `integer` and the format is `int64`.
---
 chart/flux/templates/helm-operator-crd.yaml | 3 ++-
 deploy-helm/flux-helm-release-crd.yaml      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/chart/flux/templates/helm-operator-crd.yaml b/chart/flux/templates/helm-operator-crd.yaml
index 626cc0ecd..dfadfbb2a 100644
--- a/chart/flux/templates/helm-operator-crd.yaml
+++ b/chart/flux/templates/helm-operator-crd.yaml
@@ -55,7 +55,8 @@ spec:
                 disableHooks:
                   type: boolean
                 timeout:
-                  type: int64
+                  type: integer
+                  format: int64
                 wait:
                   type: boolean
             valueFileSecrets:
diff --git a/deploy-helm/flux-helm-release-crd.yaml b/deploy-helm/flux-helm-release-crd.yaml
index 11dae71dd..307efdf0e 100644
--- a/deploy-helm/flux-helm-release-crd.yaml
+++ b/deploy-helm/flux-helm-release-crd.yaml
@@ -47,7 +47,8 @@ spec:
                 disableHooks:
                   type: boolean
                 timeout:
-                  type: int64
+                  type: integer
+                  format: int64
                 wait:
                   type: boolean
             valueFileSecrets:

From 371807a8a26b18781c8516ae03f4654030e8e4fe Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Fri, 12 Jul 2019 14:50:12 +0200
Subject: [PATCH 025/158] Use correct Helm repository domain in docs

As it has changed after our move to the `fluxcd` organization, and
the old URL no longer works.
---
 chart/flux/README.md         | 8 ++++----
 site/annotations-tutorial.md | 6 +++---
 site/helm-operator.md        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/chart/flux/README.md b/chart/flux/README.md
index 98ccbc87f..d2994253b 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -47,7 +47,7 @@ You will have a fully working Flux installation deploying workloads to your clus
 Add the weaveworks repo:
 
 ```sh
-helm repo add weaveworks https://weaveworks.github.io/flux
+helm repo add fluxcd https://fluxcd.github.io/flux
 ```
 
 #### To install the chart with the release name `flux`
@@ -58,7 +58,7 @@ Replace `weaveworks/flux-get-started` with your own git repository and run helm
 $ helm install --name flux \
 --set git.url=git@github.com:weaveworks/flux-get-started \
 --namespace flux \
-weaveworks/flux
+fluxcd/flux
 ```
 
 #### To connect Flux to a Weave Cloud instance:
@@ -68,7 +68,7 @@ helm install --name flux \
 --set git.url=git@github.com:weaveworks/flux-get-started \
 --set token=YOUR_WEAVE_CLOUD_SERVICE_TOKEN \
 --namespace flux \
-weaveworks/flux
+fluxcd/flux
 ```
 
 #### To install Flux with the Helm operator:
@@ -87,7 +87,7 @@ $ helm install --name flux \
 --set helmOperator.create=true \
 --set helmOperator.createCRD=false \
 --namespace flux \
-weaveworks/flux
+fluxcd/flux
 ```
 
 #### To install Flux with a private git host:
diff --git a/site/annotations-tutorial.md b/site/annotations-tutorial.md
index d0ab3f73b..bc7459d08 100644
--- a/site/annotations-tutorial.md
+++ b/site/annotations-tutorial.md
@@ -74,13 +74,13 @@ Now you can take care of the actual installation. First add the Flux
 repository of Weaveworks:
 
 ```sh
-helm repo add weaveworks https://weaveworks.github.io/flux
+helm repo add fluxcd https://fluxcd.github.io/flux
 ```
 
 Apply the Helm Release CRD:
 
 ```sh
-kubectl apply -f https://raw.githubusercontent.com/weaveworks/flux/master/deploy-helm/flux-helm-release-crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/fluxcd/flux/master/deploy-helm/flux-helm-release-crd.yaml
 ```
 
 Install Flux and its Helm Operator by specifying your fork URL. Just
@@ -93,7 +93,7 @@ helm upgrade -i Flux \
 --set helmOperator.createCRD=false \
 --set git.url=git@github.com:YOURUSER/flux-get-started \
 --namespace default \
-weaveworks/flux
+fluxcd/flux
 ```
 
 > **Note:** In this tutorial we keep things simple, so we deploy Flux into
diff --git a/site/helm-operator.md b/site/helm-operator.md
index d3d3f59c2..c8d75dc48 100644
--- a/site/helm-operator.md
+++ b/site/helm-operator.md
@@ -184,7 +184,7 @@ kubectl create secret tls helm-client --cert=tls/flux-helm-operator.pem --key=./
 Deploy Flux with Helm;
 
 ```bash
-helm repo add weaveworks https://weaveworks.github.io/flux
+helm repo add fluxcd https://fluxcd.github.io/flux
 
 helm upgrade --install \
     --set helmOperator.create=true \
@@ -194,7 +194,7 @@ helm upgrade --install \
     --set helmOperator.tls.secretName=helm-client \
     --set helmOperator.tls.caContent="$(cat ./tls/ca.pem)" \
     flux \
-    weaveworks/flux
+    fluxcd/flux
 ```
 > **Note:**
 > - include --tls flags for `helm` as in the `helm ls` example, if talking to a tiller with TLS

From def50b6286aff08ce2816317706e12dae2e41ad2 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Mon, 15 Jul 2019 10:26:26 +0100
Subject: [PATCH 026/158] Run credentials tests in parallel

A small change to use testing.T.Run for the credentials parsing test;
also removes a time.Sleep that according to git blame, I left in there
long ago.
---
 registry/credentials_test.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/registry/credentials_test.go b/registry/credentials_test.go
index 44c013ebc..d8473f607 100644
--- a/registry/credentials_test.go
+++ b/registry/credentials_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -88,19 +87,20 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			error: true,
 		},
 	} {
-		stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
-		creds, err := ParseCredentials("test", []byte(stringCreds))
-		time.Sleep(100 * time.Millisecond)
-		if (err != nil) != v.error {
-			t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
-		}
-		if v.error {
-			continue
-		}
-		actualUser := creds.credsFor(v.imagePrefix).username
-		assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
-		actualPass := creds.credsFor(v.imagePrefix).password
-		assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		t.Run(v.host, func(t *testing.T) {
+			stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
+			creds, err := ParseCredentials("test", []byte(stringCreds))
+			if (err != nil) != v.error {
+				t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
+			}
+			if v.error {
+				return
+			}
+			actualUser := creds.credsFor(v.imagePrefix).username
+			assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
+			actualPass := creds.credsFor(v.imagePrefix).password
+			assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		})
 	}
 }
 

From 68f932fee69306a92e622b0609151a967a335fe1 Mon Sep 17 00:00:00 2001
From: Jiri Pinkava <jiri.pinkava@rossum.ai>
Date: Tue, 9 Jul 2019 20:35:32 +0200
Subject: [PATCH 027/158] Re-implement registry.ecr.require

As it got removed by accident (probably during a rebase) in #1918.
---
 chart/flux/templates/deployment.yaml | 3 +++
 chart/flux/values.yaml               | 1 +
 2 files changed, 4 insertions(+)

diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index 5b44f4778..59f82efee 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -190,6 +190,9 @@ spec:
           - --registry-rps={{ .Values.registry.rps }}
           - --registry-burst={{ .Values.registry.burst }}
           - --registry-trace={{ .Values.registry.trace }}
+          {{- if .Values.registry.ecr.require }}
+          - --registry-require=ecr
+          {{- end }}
           {{- if .Values.registry.insecureHosts }}
           - --registry-insecure-host={{ .Values.registry.insecureHosts }}
           {{- end }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index c4d72566d..9813663f3 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -193,6 +193,7 @@ registry:
     region:
     includeId:
     excludeId:
+    require: false
   # Azure ACR settings
   acr:
     enabled: false

From 5644b6ea402e73f25eeb18a31a3dcdafdeb104b6 Mon Sep 17 00:00:00 2001
From: Jiri Pinkava <jiri.pinkava@rossum.ai>
Date: Mon, 15 Jul 2019 16:32:52 +0200
Subject: [PATCH 028/158] Log correct `--registry-require` flag (remove D from
 end)

---
 cmd/fluxd/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 81a29befc..25e07c2b0 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -288,7 +288,7 @@ func main() {
 	possiblyRequired := stringset(RequireValues)
 	for _, r := range *registryRequire {
 		if !possiblyRequired.has(r) {
-			logger.Log("err", fmt.Sprintf("--registry-required value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
+			logger.Log("err", fmt.Sprintf("--registry-require value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
 			os.Exit(1)
 		}
 	}
@@ -454,7 +454,7 @@ func main() {
 		awsPreflight, credsWithAWSAuth := registry.ImageCredsWithAWSAuth(imageCreds, log.With(logger, "component", "aws"), awsConf)
 		if mandatoryRegistry.has(RequireECR) {
 			if err := awsPreflight(); err != nil {
-				logger.Log("error", "AWS API required (due to --registry-required=ecr), but not available", "err", err)
+				logger.Log("error", "AWS API required (due to --registry-require=ecr), but not available", "err", err)
 				os.Exit(1)
 			}
 		}

From 4377e8583ce733ef18eba5dceb06c5393bd8de24 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 15 Jul 2019 13:48:35 +0200
Subject: [PATCH 029/158] Make `fluxctl` respect the kube config context NS

By looking at the configured namespace in the active context of the
resolved config, if none is found we return the given `defaultNamespace`.
---
 cmd/fluxctl/args.go               | 19 +++++++++++++++++++
 cmd/fluxctl/automate_cmd.go       |  2 +-
 cmd/fluxctl/deautomate_cmd.go     |  2 +-
 cmd/fluxctl/list_images_cmd.go    |  2 +-
 cmd/fluxctl/list_workloads_cmd.go |  2 +-
 cmd/fluxctl/lock_cmd.go           |  2 +-
 cmd/fluxctl/policy_cmd.go         |  2 +-
 cmd/fluxctl/release_cmd.go        |  2 +-
 cmd/fluxctl/unlock_cmd.go         |  2 +-
 9 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/cmd/fluxctl/args.go b/cmd/fluxctl/args.go
index b1fc7916b..0ba0b1374 100644
--- a/cmd/fluxctl/args.go
+++ b/cmd/fluxctl/args.go
@@ -7,6 +7,8 @@ import (
 	"os/exec"
 	"strings"
 
+	"k8s.io/client-go/tools/clientcmd"
+
 	"github.com/spf13/cobra"
 
 	"github.com/weaveworks/flux/update"
@@ -49,3 +51,20 @@ func getUserGitConfigValue(arg string) string {
 	res := out.String()
 	return strings.Trim(res, "\x00")
 }
+
+var getKubeConfigContextNamespace = func(defaultNamespace string) string {
+	config, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+		clientcmd.NewDefaultClientConfigLoadingRules(),
+		&clientcmd.ConfigOverrides{},
+	).RawConfig()
+	if err != nil {
+		return defaultNamespace
+	}
+
+	cc := config.CurrentContext
+	if c, ok := config.Contexts[cc]; ok && c.Namespace != "" {
+		return c.Namespace
+	}
+
+	return defaultNamespace
+}
diff --git a/cmd/fluxctl/automate_cmd.go b/cmd/fluxctl/automate_cmd.go
index c53b28592..03a8843da 100644
--- a/cmd/fluxctl/automate_cmd.go
+++ b/cmd/fluxctl/automate_cmd.go
@@ -32,7 +32,7 @@ func (opts *workloadAutomateOpts) Command() *cobra.Command {
 	}
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Workload namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Workload namespace")
 	cmd.Flags().StringVarP(&opts.workload, "workload", "w", "", "Workload to automate")
 
 	// Deprecated
diff --git a/cmd/fluxctl/deautomate_cmd.go b/cmd/fluxctl/deautomate_cmd.go
index c006ffdbd..8c5a3a242 100644
--- a/cmd/fluxctl/deautomate_cmd.go
+++ b/cmd/fluxctl/deautomate_cmd.go
@@ -32,7 +32,7 @@ func (opts *workloadDeautomateOpts) Command() *cobra.Command {
 	}
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Workload namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Workload namespace")
 	cmd.Flags().StringVarP(&opts.workload, "workload", "w", "", "Workload to deautomate")
 
 	// Deprecated
diff --git a/cmd/fluxctl/list_images_cmd.go b/cmd/fluxctl/list_images_cmd.go
index 07b5ed9d2..148f3d2a2 100644
--- a/cmd/fluxctl/list_images_cmd.go
+++ b/cmd/fluxctl/list_images_cmd.go
@@ -36,7 +36,7 @@ func (opts *imageListOpts) Command() *cobra.Command {
 		Example: makeExample("fluxctl list-images --namespace default --workload=deployment/foo"),
 		RunE:    opts.RunE,
 	}
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "", "Namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace(""), "Namespace")
 	cmd.Flags().StringVarP(&opts.workload, "workload", "w", "", "Show images for this workload")
 	cmd.Flags().IntVarP(&opts.limit, "limit", "l", 10, "Number of images to show (0 for all)")
 
diff --git a/cmd/fluxctl/list_workloads_cmd.go b/cmd/fluxctl/list_workloads_cmd.go
index 715439531..3516ceaf0 100644
--- a/cmd/fluxctl/list_workloads_cmd.go
+++ b/cmd/fluxctl/list_workloads_cmd.go
@@ -30,7 +30,7 @@ func (opts *workloadListOpts) Command() *cobra.Command {
 		Example: makeExample("fluxctl list-workloads"),
 		RunE:    opts.RunE,
 	}
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Confine query to namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Confine query to namespace")
 	cmd.Flags().BoolVarP(&opts.allNamespaces, "all-namespaces", "a", false, "Query across all namespaces")
 	return cmd
 }
diff --git a/cmd/fluxctl/lock_cmd.go b/cmd/fluxctl/lock_cmd.go
index d968e4026..e7015269c 100644
--- a/cmd/fluxctl/lock_cmd.go
+++ b/cmd/fluxctl/lock_cmd.go
@@ -32,7 +32,7 @@ func (opts *workloadLockOpts) Command() *cobra.Command {
 	}
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Controller namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Controller namespace")
 	cmd.Flags().StringVarP(&opts.workload, "workload", "w", "", "Workload to lock")
 
 	// Deprecated
diff --git a/cmd/fluxctl/policy_cmd.go b/cmd/fluxctl/policy_cmd.go
index 64d6f5f6f..7d15a5292 100644
--- a/cmd/fluxctl/policy_cmd.go
+++ b/cmd/fluxctl/policy_cmd.go
@@ -60,7 +60,7 @@ containers which aren't explicitly named.
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
 	flags := cmd.Flags()
-	flags.StringVarP(&opts.namespace, "namespace", "n", "default", "Workload namespace")
+	flags.StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Workload namespace")
 	flags.StringVarP(&opts.workload, "workload", "w", "", "Workload to modify")
 	flags.StringVar(&opts.tagAll, "tag-all", "", "Tag filter pattern to apply to all containers")
 	flags.StringSliceVar(&opts.tags, "tag", nil, "Tag filter container/pattern pairs")
diff --git a/cmd/fluxctl/release_cmd.go b/cmd/fluxctl/release_cmd.go
index 93d8f8916..80e0576a1 100644
--- a/cmd/fluxctl/release_cmd.go
+++ b/cmd/fluxctl/release_cmd.go
@@ -53,7 +53,7 @@ func (opts *workloadReleaseOpts) Command() *cobra.Command {
 
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Workload namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Workload namespace")
 	// Note: we cannot define a shorthand for --workload since it clashes with the shorthand of --watch
 	cmd.Flags().StringSliceVarP(&opts.workloads, "workload", "", []string{}, "List of workloads to release <namespace>:<kind>/<name>")
 	cmd.Flags().BoolVar(&opts.allWorkloads, "all", false, "Release all workloads")
diff --git a/cmd/fluxctl/unlock_cmd.go b/cmd/fluxctl/unlock_cmd.go
index add44c2d7..1932b919c 100644
--- a/cmd/fluxctl/unlock_cmd.go
+++ b/cmd/fluxctl/unlock_cmd.go
@@ -32,7 +32,7 @@ func (opts *workloadUnlockOpts) Command() *cobra.Command {
 	}
 	AddOutputFlags(cmd, &opts.outputOpts)
 	AddCauseFlags(cmd, &opts.cause)
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "default", "Controller namespace")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", getKubeConfigContextNamespace("default"), "Controller namespace")
 	cmd.Flags().StringVarP(&opts.workload, "workload", "w", "", "Controller to unlock")
 
 	// Deprecated

From f49cde3274314a992f1047b8ca6d9bbdfb9f48b6 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Mon, 15 Jul 2019 16:30:06 +0100
Subject: [PATCH 030/158] Update contact info in README

This updates _most_ contact info and other links to point to the new repo or new Slack channel.
---
 README.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 12dff374b..fea50d583 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Flux
 
-> **Notice** Flux is moving house! Please see https://github.com/weaveworks/flux/wiki/MoveToFluxCD
+> **Notice** Flux has moved house! Please see https://github.com/weaveworks/flux/wiki/MoveToFluxCD
 
 We believe in GitOps:
 
@@ -99,7 +99,7 @@ Get started by browsing through the documentation below:
 
 - Background about Flux
   - [Introduction to Flux](/site/introduction.md)
-  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/site/how-it-works.md)
   - [Considerations regarding installing Flux](/site/installing.md)
   - [Flux <-> Helm integration](/site/helm-integration.md)
@@ -111,7 +111,7 @@ Get started by browsing through the documentation below:
   - [Using fluxctl to control Flux](/site/fluxctl.md)
   - [Helm Operator](/site/helm-operator.md)
   - [Troubleshooting](/site/troubleshooting.md)
-  - [Frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [Upgrading to Flux v1](/site/upgrading-to-1.0.md)
 
 ### Integrations
@@ -145,14 +145,12 @@ be interested in the following:
 
 If you have any questions about Flux and continuous delivery:
 
-- Read [the Flux docs](https://github.com/weaveworks/flux/tree/master/site).
-- Invite yourself to the <a href="https://slack.weave.works/" target="_blank">Weave community</a>
-  slack and ask a question on the [#flux](https://weave-community.slack.com/messages/flux/)
+- Read [the Flux docs](https://github.com/fluxcd/flux/tree/master/site).
+- Invite yourself to the <a href="https://slack.cncf.io" target="_blank">CNCF community</a>
+  slack and ask a question on the [#flux](https://cloud-native.slack.com/messages/flux/)
   channel.
 - To be part of the conversation about Flux's development, join the
   [flux-dev mailing list](https://groups.google.com/forum/#!forum/flux-dev).
-- Join the [Weave User Group](https://www.meetup.com/pro/Weave/) and get
-  invited to online talks, hands-on training and meetups in your area.
-- [File an issue.](https://github.com/weaveworks/flux/issues/new)
+- [File an issue.](https://github.com/fluxcd/flux/issues/new)
 
 Your feedback is always welcome!

From ed6b8ee3e2192298c8d848e2d287d766ba47c6e5 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 16 Jul 2019 09:39:57 +0200
Subject: [PATCH 031/158] Update Slack address

---
 CONTRIBUTING.md          | 4 ++--
 site/upgrading-to-1.0.md | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9b02fb39..9137af8b7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,8 +35,8 @@ contribution. No action from you is required, but it's a good idea to see the
 ## Communications
 
 The project uses Slack: To join the conversation, simply join the
-[Weave community](https://slack.weave.works/) Slack workspace and use the
-[#flux](https://weave-community.slack.com/messages/flux/) channel.
+[CNCF](https://slack.cncf.io/) Slack workspace and use the
+[#flux](https://cloud-native.slack.com/messages/flux/) channel.
 
 The Flux developers use a mailing list to discuss development as well.
 Simply subscribe to [flux-dev on Google
diff --git a/site/upgrading-to-1.0.md b/site/upgrading-to-1.0.md
index bd23949e0..f01f2ba97 100644
--- a/site/upgrading-to-1.0.md
+++ b/site/upgrading-to-1.0.md
@@ -193,9 +193,3 @@ create those as resources.
 
 If that’s the case, you will need to remove the manifests from git
 before running Flux v1.
-
-### Something else went wrong
-
-You can reach Weaveworks developers in our community Slack --
-https://weaveworks.github.io/community-slack/ -- where we will be able
-to help.

From 781b60555d63e2962dd2c900297b2006951dea6c Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 16 Jul 2019 10:50:08 +0200
Subject: [PATCH 032/158] update meeting doc URL

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9137af8b7..ab45719fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ The Flux developers use a mailing list to discuss development as well.
 Simply subscribe to [flux-dev on Google
 Groups](https://groups.google.com/forum/#!forum/flux-dev) to join the
 conversation (this will also add an invitation to your Google calendar
-for our [Flux meeting](https://github.com/weaveworks/flux/wiki/Meeting)).
+for our [Flux meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#)).
 
 ## Getting Started
 

From 1e8daf5c7f7b28d3378798b31241f15730a6cb91 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Tue, 16 Jul 2019 12:46:50 +0100
Subject: [PATCH 033/158] Change CoC contact

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fea50d583..641368249 100644
--- a/README.md
+++ b/README.md
@@ -129,10 +129,12 @@ a few popular ones you might want to check out:
 We welcome all kinds of contributions to Flux, be it code, issues you found,
 documentation, external tools, help and support or anything else really.
 
+The Flux project adheres to the [CNCF Code of
+Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
 Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by contacting a *Flux* project maintainer, or Alexis
-Richardson `<alexis@weave.works>`. Please refer to our [code of
-conduct](CODE_OF_CONDUCT.md) as well.
+may be reported by contacting a *Flux* project maintainer, or the CNCF
+mediator, Mishi Choudhary <mishi@linux.com>.
 
 To familiarise yourself with the project and how things work, you might
 be interested in the following:

From 0d89de5a80b5d25d630926e01eeeebe2e6a35ec6 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 17 Jul 2019 14:25:17 +0100
Subject: [PATCH 034/158] Let people supply Tiller hostname/IP to chart

It's possible to tell the Helm operator to use a hostname or IP
address and port, but this isn't exposed in the chart.

This commit adds chart parameters for the Tiller host and IP. In
theory this would let you point at a Tiller listening on localhost --
but since the chart doesn't also include Tiller in the pod, it's not
quite enough.
---
 chart/flux/templates/helm-operator-deployment.yaml | 5 +++++
 chart/flux/values.yaml                             | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/chart/flux/templates/helm-operator-deployment.yaml b/chart/flux/templates/helm-operator-deployment.yaml
index cf949360b..37282e8b1 100644
--- a/chart/flux/templates/helm-operator-deployment.yaml
+++ b/chart/flux/templates/helm-operator-deployment.yaml
@@ -134,7 +134,12 @@ spec:
         {{- else if .Values.helmOperator.allowNamespace }}
         - --allow-namespace={{ .Values.helmOperator.allowNamespace }}
         {{- end }}
+        {{- if .Values.helmOperator.tillerHost }}
+        - --tiller-ip={{ .Values.helmOperator.tillerHost }}
+        - --tiller-port={{ .Values.helmOperator.tillerPort }}
+        {{- else }}
         - --tiller-namespace={{ .Values.helmOperator.tillerNamespace }}
+        {{- end }}
         {{- if .Values.helmOperator.tls.enable }}
         - --tiller-tls-enable={{ .Values.helmOperator.tls.enable }}
         - --tiller-tls-key-path=/etc/fluxd/helm/{{ .Values.helmOperator.tls.keyFile }}
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 9813663f3..3e1e5744c 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -35,7 +35,15 @@ helmOperator:
   chartsSyncInterval: "3m"
   # (Experimental) amount of workers processing releases
   workers:
+
   # Tiller settings
+
+  # If a hostname or IP is given here, that will be combined with the
+  # tillerPort and used for connecting to Tiller. Otherwise, the
+  # cluster-ip of the `tiller-deploy` service in .tillerNamespace is
+  # looked up.
+  tillerHost:
+  tillerPort: 44134
   tillerNamespace: kube-system
   tls:
     secretName: "helm-client-certs"

From b84b34548327f895ecd6f0abb6752f072b07d013 Mon Sep 17 00:00:00 2001
From: Jose Bovet Derpich <Jose.Bovet@walmart.com>
Date: Wed, 17 Jul 2019 14:51:05 -0400
Subject: [PATCH 035/158] Added Walmart to production users

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 641368249..3c2c3662f 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,7 @@ Its major features are:
 - [Troii](https://troii.com/)
 - [Under Armour](https://www.underarmour.com)
 - [VSHN](https://vshn.ch)
+- [Walmart Chile](https://www.walmartchile.cl)
 - [Weave Cloud](https://cloud.weave.works)
 
 If you too are using Flux in production; please submit a PR to add your organization to the list!

From f6d7eeac2dc2f226e04eb81932ca50937f3095e2 Mon Sep 17 00:00:00 2001
From: Calle Pettersson <carlpett@users.noreply.github.com>
Date: Thu, 18 Jul 2019 12:15:17 +0200
Subject: [PATCH 036/158] Fix file names

---
 site/fluxyaml-config-files.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/fluxyaml-config-files.md b/site/fluxyaml-config-files.md
index c836730d4..0587f87d2 100644
--- a/site/fluxyaml-config-files.md
+++ b/site/fluxyaml-config-files.md
@@ -144,8 +144,8 @@ in your own Flux-based image or, if the tools are popular enough, Flux maintaine
 (please create an issue). In the future (once [Ephemeral containers](https://github.com/kubernetes/kubernetes/pull/59416)
 are available), you will be able to specify an container image for each command.
 
-The working directory (also known as CWD) of the `command`s executed from a `.fluxctl.yaml` file will be set to the
-target path (`--git-path` entry) used when finding that `.fluxctl.yaml` file.
+The working directory (also known as CWD) of the `command`s executed from a `.flux.yaml` file will be set to the
+target path (`--git-path` entry) used when finding that `.flux.yaml` file.
 
 For example, when using flux with `--git-path=staging` on a git repository with this structure:
 

From 9b9484b65e385bf0ccb06536671f5a42c5c993ce Mon Sep 17 00:00:00 2001
From: Calle Pettersson <carlpett@users.noreply.github.com>
Date: Thu, 18 Jul 2019 12:18:43 +0200
Subject: [PATCH 037/158] weaveworks -> fluxcd

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 09823d67f..42c913644 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 # General contribution criteria
 
-Please have a look at our contribution guidelines: https://github.com/weaveworks/flux/blob/master/CONTRIBUTING.md
+Please have a look at our contribution guidelines: https://github.com/fluxcd/flux/blob/master/CONTRIBUTING.md
 Particularly the sections about the:
 
  - DCO;

From 8ecae68be8037c5b666fdbd099468346b29dee99 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 18 Jul 2019 22:13:43 +0200
Subject: [PATCH 038/158] Mock `getKubeConfigContextNamespace` in tests

To prevent an active kube config context on e.g. a local development
machine from interfering with the test results. #2255 follow up.
---
 cmd/fluxctl/main_test.go        | 1 +
 cmd/fluxctl/release_cmd_test.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/fluxctl/main_test.go b/cmd/fluxctl/main_test.go
index 2d631e997..a6c484a03 100644
--- a/cmd/fluxctl/main_test.go
+++ b/cmd/fluxctl/main_test.go
@@ -65,6 +65,7 @@ func (t *genericMockRoundTripper) calledURL(method string) (u *url.URL) {
 func testArgs(t *testing.T, args []string, shouldErr bool, errMsg string) *genericMockRoundTripper {
 	svc := newMockService()
 	releaseClient := newWorkloadRelease(mockServiceOpts(svc))
+	getKubeConfigContextNamespace = func(s string) string { return s }
 
 	// Run fluxctl release
 	cmd := releaseClient.Command()
diff --git a/cmd/fluxctl/release_cmd_test.go b/cmd/fluxctl/release_cmd_test.go
index 3eb72ff26..2c9290544 100644
--- a/cmd/fluxctl/release_cmd_test.go
+++ b/cmd/fluxctl/release_cmd_test.go
@@ -57,7 +57,7 @@ func TestReleaseCommand_CLIConversion(t *testing.T) {
 			t.Fatal("Failed to decode spec")
 		}
 		if !reflect.DeepEqual(v.expectedSpec, actualSpec.Spec) {
-			t.Fatalf("Expected %#v but got %#v", v.expectedSpec, actualSpec)
+			t.Fatalf("Expected %#v but got %#v", v.expectedSpec, actualSpec.Spec)
 		}
 
 		// Check that GetRelease was polled for status

From 7fb8d9843390cbfda0cc0e83371ccc4916a45e91 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 22 Jul 2019 14:36:27 +0200
Subject: [PATCH 039/158] Enhance Git proxy support

By adding `socat` to the Flux and Helm operator image and whitelisting
`GIT_PROXY_COMMAND` inheritance.

Ref: https://gitolite.com/git-over-proxy.html
---
 docker/Dockerfile.flux          | 2 +-
 docker/Dockerfile.helm-operator | 2 +-
 git/operations.go               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
index bef07cfe5..72e0667d0 100644
--- a/docker/Dockerfile.flux
+++ b/docker/Dockerfile.flux
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 WORKDIR /home/flux
 
-RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0' 'gnutls>=3.6.7' gnupg gawk
+RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0' 'gnutls>=3.6.7' gnupg gawk socat
 RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing git-secret
 
 # Add git hosts to known hosts file so we can use
diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator
index dcaa7ef7e..d8b7f27dd 100644
--- a/docker/Dockerfile.helm-operator
+++ b/docker/Dockerfile.helm-operator
@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 WORKDIR /home/flux
 
-RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0'
+RUN apk add --no-cache openssh-client ca-certificates tini 'git>=2.12.0' socat
 
 # Add git hosts to known hosts file so we can use
 # StrickHostKeyChecking with git+ssh
diff --git a/git/operations.go b/git/operations.go
index 8f2e11412..258df087f 100644
--- a/git/operations.go
+++ b/git/operations.go
@@ -27,7 +27,7 @@ var exemptedTraceCommands = []string{
 // Env vars that are allowed to be inherited from the OS
 var allowedEnvVars = []string{
 	// these are for people using (no) proxies
-	"http_proxy", "https_proxy", "no_proxy",
+	"http_proxy", "https_proxy", "no_proxy", "GIT_PROXY_COMMAND",
 	// these are needed for GPG to find its files
 	"HOME", "GNUPGHOME",
 	// these for the git-secrets helper

From a6abafcfa239f37d216a464d2d7ed7e7f23d6131 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 23 Jul 2019 18:57:43 +0300
Subject: [PATCH 040/158] Add the multi-tenancy repo to readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c2c3662f..d6b3d4c8d 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,8 @@ Get started by browsing through the documentation below:
 As Flux is Open Source, integrations are very straight-forward. Here are
 a few popular ones you might want to check out:
 
-- [Managing Helm releases the GitOps way](https://github.com/stefanprodan/gitops-helm)
+- [Manage a multi-tenant cluster with Flux and Kustomize](https://github.com/fluxcd/multi-tenancy)
+- [Managing Helm releases the GitOps way](https://github.com/fluxcd/helm-operator-get-started)
 - [OpenFaaS GitOps workflow with Flux](https://github.com/stefanprodan/openfaas-flux)
 - [GitOps for Istio Canary deployments](https://github.com/stefanprodan/gitops-istio)
 - [Fluxcloud to receive events from Flux](https://github.com/justinbarrick/fluxcloud)

From 0cbcbe52dc3f83fe527015df921257bf40fbc30a Mon Sep 17 00:00:00 2001
From: Praveen Adusumilli <praveen.adusumilli@hmcts.net>
Date: Mon, 22 Jul 2019 10:26:50 +0100
Subject: [PATCH 041/158] fixing prometheus scrape annotation

---
 chart/flux/templates/deployment.yaml          |  2 +-
 .../templates/helm-operator-deployment.yaml   |  2 +-
 cluster/kubernetes/policies_test.go           | 20 +++++++++----------
 .../weave-cloud-helm-operator-deployment.yaml |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index 59f82efee..8b08ad301 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.annotations }}
       {{- .Values.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/chart/flux/templates/helm-operator-deployment.yaml b/chart/flux/templates/helm-operator-deployment.yaml
index 37282e8b1..e297759fd 100644
--- a/chart/flux/templates/helm-operator-deployment.yaml
+++ b/chart/flux/templates/helm-operator-deployment.yaml
@@ -20,7 +20,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.helmOperator.annotations }}
       {{- .Values.helmOperator.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
index edc33ebee..8d6f509ae 100644
--- a/cluster/kubernetes/policies_test.go
+++ b/cluster/kubernetes/policies_test.go
@@ -22,8 +22,8 @@ func TestUpdatePolicies(t *testing.T) {
 	}{
 		{
 			name: "adding annotation with others existing",
-			in:   []string{"prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/automated", "'true'"},
+			in:   []string{"prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/automated", "'true'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -38,8 +38,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "adding annotation when already has annotation and others",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -54,8 +54,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "add and remove different annotations at the same time",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/locked", "'true'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/locked", "'true'"},
 			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Automated: "true"},
@@ -72,8 +72,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with others existing",
-			in:   []string{"flux.weave.works/automated", "true", "prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"flux.weave.works/automated", "true", "prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
@@ -96,8 +96,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with only others",
-			in:   []string{"prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index 920f6c6a6..e67c064a4 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.scrape: "false"
+        prometheus.io/scrape: "false"
       labels:
         app: flux-helm-operator
     spec:

From 90bc383e51bbf1e0e0c90683a7affcc73299d60b Mon Sep 17 00:00:00 2001
From: Praveen Adusumilli <praveen.adusumilli@hmcts.net>
Date: Mon, 22 Jul 2019 10:34:49 +0100
Subject: [PATCH 042/158] Fixing prometheus.io port annotations.

---
 cluster/kubernetes/update_test.go | 4 ++--
 deploy/flux-deployment.yaml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/kubernetes/update_test.go b/cluster/kubernetes/update_test.go
index ea2ed46e8..f5ae8c8c9 100644
--- a/cluster/kubernetes/update_test.go
+++ b/cluster/kubernetes/update_test.go
@@ -471,7 +471,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
@@ -522,7 +522,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 6af51af25..3f6a77990 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.port: "3031" # tell prometheus to scrape /metrics endpoint's port.
+        prometheus.io/port: "3031" # tell prometheus to scrape /metrics endpoint's port.
       labels:
         name: flux
     spec:

From 9d0cce350cffc1b1f825fabcb1dcb5fc54daa5e7 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Wed, 10 Jul 2019 15:48:12 +0100
Subject: [PATCH 043/158] Merge pull request #2240 from
 fluxcd/update-badge-orgs

Change badges to fluxcd
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9d9d70c4d..b7cf3b965 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ new infrastructure.
 
 ![Deployment Pipeline](site/images/deployment-pipeline.png)
 
-[![CircleCI](https://circleci.com/gh/weaveworks/flux.svg?style=svg)](https://circleci.com/gh/weaveworks/flux)
-[![GoDoc](https://godoc.org/github.com/weaveworks/flux?status.svg)](https://godoc.org/github.com/weaveworks/flux)
+[![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
+[![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
 
 ## What Flux does
 

From d9c9b03fd058b622a9accd4e7e700aa783b338a7 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Wed, 10 Jul 2019 17:55:49 +0200
Subject: [PATCH 044/158] Change all image definitions to `fluxcd` org (#2224)

Change all image definitions to `fluxcd` org
---
 api/v9/change_test.go                          |  2 +-
 chart/flux/README.md                           |  4 ++--
 chart/flux/values.yaml                         |  6 +++---
 deploy-helm/helm-operator-deployment.yaml      |  2 +-
 .../weave-cloud-helm-operator-deployment.yaml  |  2 +-
 deploy/flux-deployment.yaml                    |  2 +-
 image/image.go                                 |  4 ++--
 registry/cache/registry.go                     |  2 +-
 registry/client.go                             |  2 +-
 registry/imageentry_test.go                    |  4 ++--
 site/get-started-developing.md                 | 18 +++++++++---------
 site/troubleshooting.md                        |  2 +-
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/api/v9/change_test.go b/api/v9/change_test.go
index cdc2c4432..136ff3db3 100644
--- a/api/v9/change_test.go
+++ b/api/v9/change_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestChangeEncoding(t *testing.T) {
-	ref, _ := image.ParseRef("docker.io/weaveworks/flux")
+	ref, _ := image.ParseRef("docker.io/fluxcd/flux")
 	name := ref.Name
 
 	for _, update := range []Change{
diff --git a/chart/flux/README.md b/chart/flux/README.md
index 1353abe89..de0fb67e2 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -183,7 +183,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 
 | Parameter                                         | Default                                              | Description
 | -----------------------------------------------   | ---------------------------------------------------- | ---
-| `image.repository`                                | `docker.io/weaveworks/flux`                          | Image repository
+| `image.repository`                                | `docker.io/fluxcd/flux`                              | Image repository
 | `image.tag`                                       | `<VERSION>`                                          | Image tag
 | `replicaCount`                                    | `1`                                                  | Number of Flux pods to deploy, more than one is not desirable.
 | `image.pullPolicy`                                | `IfNotPresent`                                       | Image pull policy
@@ -251,7 +251,7 @@ The following tables lists the configurable parameters of the Weave Flux chart a
 | `memcached.securityContext`                       | [See values.yaml](/chart/flux/values.yaml#L192-L195) | Container security context for memcached
 | `helmOperator.create`                             | `false`                                              | If `true`, install the Helm operator
 | `helmOperator.createCRD`                          | `true`                                               | Create the `v1beta1` and `v1alpha2` Flux CRDs. Dependent on `helmOperator.create=true`
-| `helmOperator.repository`                         | `docker.io/weaveworks/helm-operator`                 | Helm operator image repository
+| `helmOperator.repository`                         | `docker.io/fluxcd/helm-operator`                     | Helm operator image repository
 | `helmOperator.tag`                                | `<VERSION>`                                          | Helm operator image tag
 | `helmOperator.replicaCount`                       | `1`                                                  | Number of helm operator pods to deploy, more than one is not desirable.
 | `helmOperator.pullPolicy`                         | `IfNotPresent`                                       | Helm operator image pull policy
diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index a87313cd8..287a7fc18 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -8,7 +8,7 @@ replicaCount: 1
 logFormat: fmt
 
 image:
-  repository: docker.io/weaveworks/flux
+  repository: docker.io/fluxcd/flux
   tag: 1.13.2
   pullPolicy: IfNotPresent
   pullSecret:
@@ -21,8 +21,8 @@ helmOperator:
   replicaCount: 1
   create: false
   createCRD: true
-  repository: docker.io/weaveworks/helm-operator
-  tag: 0.9.1
+  repository: docker.io/fluxcd/helm-operator
+  tag: 0.10.0
   pullPolicy: IfNotPresent
   pullSecret:
   # Limit the operator scope to a single namespace
diff --git a/deploy-helm/helm-operator-deployment.yaml b/deploy-helm/helm-operator-deployment.yaml
index 317e55f10..e41941153 100644
--- a/deploy-helm/helm-operator-deployment.yaml
+++ b/deploy-helm/helm-operator-deployment.yaml
@@ -62,7 +62,7 @@ spec:
         # There are no ":latest" images for helm-operator. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/helm-operator:0.9.1
+        image: docker.io/fluxcd/helm-operator:0.9.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index cb62131e7..a16ae5522 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -27,7 +27,7 @@ spec:
             secretName: flux-git-deploy
       containers:
         - name: flux-helm-operator
-          image: docker.io/weaveworks/helm-operator:0.9.1
+          image: docker.io/fluxcd/helm-operator:0.9.1
           imagePullPolicy: IfNotPresent
           args:
             - --git-timeout=20s
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index adbd6b2fe..80de4ff21 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/weaveworks/flux:1.13.2
+        image: docker.io/fluxcd/flux:1.13.2
         imagePullPolicy: IfNotPresent
         resources:
           requests:
diff --git a/image/image.go b/image/image.go
index e8e56b10e..5f9a49afb 100644
--- a/image/image.go
+++ b/image/image.go
@@ -33,7 +33,7 @@ var (
 // Examples (stringified):
 //   * alpine
 //   * library/alpine
-//   * docker.io/weaveworks/flux
+//   * docker.io/fluxcd/flux
 //   * localhost:5000/arbitrary/path/to/repo
 type Name struct {
 	Domain, Image string
@@ -107,7 +107,7 @@ func (i Name) ToRef(tag string) Ref {
 // Examples (stringified):
 //  * alpine:3.5
 //  * library/alpine:3.5
-//  * docker.io/weaveworks/flux:1.1.0
+//  * docker.io/fluxcd/flux:1.1.0
 //  * localhost:5000/arbitrary/path/to/repo:revision-sha1
 type Ref struct {
 	Name
diff --git a/registry/cache/registry.go b/registry/cache/registry.go
index d238dc5e9..89df2edc7 100644
--- a/registry/cache/registry.go
+++ b/registry/cache/registry.go
@@ -74,7 +74,7 @@ func (l TimestampLabelWhitelist) apply(r *ImageRepository) {
 }
 
 // GetImageRepositoryMetadata returns the metadata from an image
-// repository (e.g,. at "docker.io/weaveworks/flux")
+// repository (e.g,. at "docker.io/fluxcd/flux")
 func (c *Cache) GetImageRepositoryMetadata(id image.Name) (image.RepositoryMetadata, error) {
 	repoKey := NewRepositoryKey(id.CanonicalName())
 	bytes, _, err := c.Reader.GetKey(repoKey)
diff --git a/registry/client.go b/registry/client.go
index b34de4635..2afe6dc02 100644
--- a/registry/client.go
+++ b/registry/client.go
@@ -56,7 +56,7 @@ func (entry *ImageEntry) UnmarshalJSON(bytes []byte) error {
 }
 
 // Client is a remote registry client for a particular image
-// repository (e.g., for docker.io/weaveworks/flux). It is an interface
+// repository (e.g., for docker.io/fluxcd/flux). It is an interface
 // so we can wrap it in instrumentation, write fake implementations,
 // and so on.
 type Client interface {
diff --git a/registry/imageentry_test.go b/registry/imageentry_test.go
index 6263f1234..0789745f8 100644
--- a/registry/imageentry_test.go
+++ b/registry/imageentry_test.go
@@ -22,7 +22,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 		assert.Equal(t, entry, entry2)
 	}
 
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 
 	info := image.Info{
@@ -44,7 +44,7 @@ func TestImageEntryRoundtrip(t *testing.T) {
 // Check that existing entries, which are image.Info, will parse into
 // the ImageEntry struct.
 func TestImageInfoParsesAsEntry(t *testing.T) {
-	ref, err := image.ParseRef("docker.io/weaveworks/flux:1.0.0")
+	ref, err := image.ParseRef("docker.io/fluxcd/flux:1.0.0")
 	assert.NoError(t, err)
 	info := image.Info{
 		ID:        ref,
diff --git a/site/get-started-developing.md b/site/get-started-developing.md
index 93d7a7648..2e3f9606e 100644
--- a/site/get-started-developing.md
+++ b/site/get-started-developing.md
@@ -7,7 +7,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
 > From a very high level, there are at least 3 ways you can develop on Flux once you have your environment set up:
 > 1. The "minimalist" approach (only requires and `kubectl`):
 >    1. `make`
->    1. copy the specific image tag (e.g. `docker.io/weaveworks/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
+>    1. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
 >    1. deploy the resources in `/develop/*.yaml` manually with `kubectl apply`
 >    1. make a change to the code
 >    1. see your code changes have been deployed
@@ -98,19 +98,19 @@ Now that we know everything is working with `flux-getting-started`, we're going
     In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo.  You'll see docker's usual output as it builds the image layers.  Once it's done, you should see something like this in the middle of the output:
     ```
     Successfully built 606610e0f4ef
-    Successfully tagged docker.io/weaveworks/flux:latest
-    Successfully tagged docker.io/weaveworks/flux:master-a86167e4
+    Successfully tagged docker.io/fluxcd/flux:latest
+    Successfully tagged docker.io/fluxcd/flux:master-a86167e4
     ```
     This confirms that a new docker image was tagged for your image.
 
-1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
+1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/fluxcd/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
     ```yaml
     spec:
       template:
         spec:
           containers:
           - name: flux
-            image: docker.io/weaveworks/flux
+            image: docker.io/fluxcd/flux
             imagePullPolicy: IfNotPresent
             args:
               - --git-url=git@github.com:<YOUR-GITHUB-USERNAME>/flux-getting-started
@@ -157,8 +157,8 @@ Now that we know everything is working with `flux-getting-started`, we're going
 
     You should see an output that looks something like this:
     ```
-    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
-    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux    successful=60 attempted=60
+    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
+    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux    successful=60 attempted=60
     ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
     ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
     ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
@@ -186,9 +186,9 @@ Now that we know everything is working with `flux-getting-started`, we're going
     flux-6f7fd5bbc-6j9d5   1/1     Running   0          10s
     ```
 
-    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/weaveworks/flux:latest` and it went ahead and redeployed that pod for us.
+    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/fluxcd/flux:latest` and it went ahead and redeployed that pod for us.
 
-    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/weaveworks/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
+    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
 
     There is another way to do this, of course.  Remember that before when we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>` syntax (in our specific example above it was `:master-a86167e4`).  We could, in theory, grab that tag every time we `make`, and then paste it into `spec.template.spec.containers[0].image` of our deployment.  That's tedious and error prone.  Instead, `freshpod` cuts this step out for us and accomplishes the same end goal.
 
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 12b38daf0..ac6057dec 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -111,7 +111,7 @@ happen:
    ```yaml
     spec:
       containers:
-        image: docker.io/weaveworks/flux
+        image: docker.io/fluxcd/flux
         ...
         volumeMounts:
         - name: acr-credentials

From 659eaeb9d8c804d697adc4fa7ec12bb6dd388064 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Thu, 11 Jul 2019 17:13:32 +0100
Subject: [PATCH 045/158] Merge pull request #2248 from
 fnmeissner/parse-credentials-without-scheme

parse credentials without scheme
---
 registry/credentials.go      | 23 ++++++++++++-----------
 registry/credentials_test.go |  4 ++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/registry/credentials.go b/registry/credentials.go
index 9962b8903..ed9e53419 100644
--- a/registry/credentials.go
+++ b/registry/credentials.go
@@ -74,28 +74,29 @@ func ParseCredentials(from string, b []byte) (Credentials, error) {
 			return Credentials{}, err
 		}
 
+		if host == "http://" || host == "https://" {
+			return Credentials{}, errors.New("Empty registry auth url")
+		}
+
 		// Some users were passing in credentials in the form of
 		// http://docker.io and http://docker.io/v1/, etc.
 		// So strip everything down to the host.
 		// Also, the registry might be local and on a different port.
 		// So we need to check for that because url.Parse won't parse the ip:port format very well.
 		u, err := url.Parse(host)
-		if err != nil {
-			return Credentials{}, err
-		}
-		if u.Host == "" && u.Path == "" && !strings.Contains(host, ":") || host == "http://" || host == "https://" {
-			return Credentials{}, errors.New("Empty registry auth url")
-		}
-		if u.Host == "" { // If there's no https:// prefix, it won't parse the host.
+
+		// if anything went wrong try to prepend https://
+		if err != nil || u.Host == "" {
 			u, err = url.Parse(fmt.Sprintf("https://%s/", host))
 			if err != nil {
 				return Credentials{}, err
 			}
-			// If the host is still empty, then there's probably a rogue /
-			if u.Host == "" {
-				return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
-			}
 		}
+
+		if u.Host == "" { // If host is still empty the url must be broken.
+			return Credentials{}, errors.New("Invalid registry auth url. Must be a valid http address (e.g. https://gcr.io/v1/)")
+		}
+
 		host = u.Host
 
 		creds.registry = host
diff --git a/registry/credentials_test.go b/registry/credentials_test.go
index b93c8f282..44c013ebc 100644
--- a/registry/credentials_test.go
+++ b/registry/credentials_test.go
@@ -39,6 +39,10 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			host:        "localhost:5000/v2/",
 			imagePrefix: "localhost:5000",
 		},
+		{
+			host:        "192.168.99.100:5000",
+			imagePrefix: "192.168.99.100:5000",
+		},
 		{
 			host:        "https://192.168.99.100:5000/v2",
 			imagePrefix: "192.168.99.100:5000",

From 77250ef1d97c8759de9b5152a414d9a3ac8c6721 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Mon, 15 Jul 2019 13:32:56 +0100
Subject: [PATCH 046/158] Merge pull request #2254 from
 fluxcd/tests/tidy-creds-parse

Run credentials tests in parallel
---
 registry/credentials_test.go | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/registry/credentials_test.go b/registry/credentials_test.go
index 44c013ebc..d8473f607 100644
--- a/registry/credentials_test.go
+++ b/registry/credentials_test.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -88,19 +87,20 @@ func TestRemoteFactory_ParseHost(t *testing.T) {
 			error: true,
 		},
 	} {
-		stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
-		creds, err := ParseCredentials("test", []byte(stringCreds))
-		time.Sleep(100 * time.Millisecond)
-		if (err != nil) != v.error {
-			t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
-		}
-		if v.error {
-			continue
-		}
-		actualUser := creds.credsFor(v.imagePrefix).username
-		assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
-		actualPass := creds.credsFor(v.imagePrefix).password
-		assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		t.Run(v.host, func(t *testing.T) {
+			stringCreds := fmt.Sprintf(tmpl, v.host, okCreds)
+			creds, err := ParseCredentials("test", []byte(stringCreds))
+			if (err != nil) != v.error {
+				t.Fatalf("For test %q, expected error = %v but got %v", v.host, v.error, err != nil)
+			}
+			if v.error {
+				return
+			}
+			actualUser := creds.credsFor(v.imagePrefix).username
+			assert.Equal(t, user, actualUser, "For test %q, expected %q but got %v", v.host, user, actualUser)
+			actualPass := creds.credsFor(v.imagePrefix).password
+			assert.Equal(t, pass, actualPass, "For test %q, expected %q but got %v", v.host, user, actualPass)
+		})
 	}
 }
 

From ed85eca5673bc425e08dd3001282504f4def3a41 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Mon, 15 Jul 2019 17:23:06 +0200
Subject: [PATCH 047/158] Log correct `--registry-require` flag (remove D from
 end) (#2256)

Log correct `--registry-require` flag (remove D from end)
---
 cmd/fluxd/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 481886993..25f3a509f 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -287,7 +287,7 @@ func main() {
 	possiblyRequired := stringset(RequireValues)
 	for _, r := range *registryRequire {
 		if !possiblyRequired.has(r) {
-			logger.Log("err", fmt.Sprintf("--registry-required value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
+			logger.Log("err", fmt.Sprintf("--registry-require value %q is not in possible values {%s}", r, strings.Join(RequireValues, ",")))
 			os.Exit(1)
 		}
 	}
@@ -449,7 +449,7 @@ func main() {
 		awsPreflight, credsWithAWSAuth := registry.ImageCredsWithAWSAuth(imageCreds, log.With(logger, "component", "aws"), awsConf)
 		if mandatoryRegistry.has(RequireECR) {
 			if err := awsPreflight(); err != nil {
-				logger.Log("error", "AWS API required (due to --registry-required=ecr), but not available", "err", err)
+				logger.Log("error", "AWS API required (due to --registry-require=ecr), but not available", "err", err)
 				os.Exit(1)
 			}
 		}

From 7d79ee21c85ea8cb92e27d9658f5233ee5cdff61 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Wed, 17 Jul 2019 13:22:57 +0100
Subject: [PATCH 048/158] Merge pull request #2257 from fluxcd/fluxcd-readme

Update contact info in README
---
 CONTRIBUTING.md          |  6 +++---
 README.md                | 24 +++++++++++++-----------
 site/upgrading-to-1.0.md |  9 +--------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9b02fb39..ab45719fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,14 +35,14 @@ contribution. No action from you is required, but it's a good idea to see the
 ## Communications
 
 The project uses Slack: To join the conversation, simply join the
-[Weave community](https://slack.weave.works/) Slack workspace and use the
-[#flux](https://weave-community.slack.com/messages/flux/) channel.
+[CNCF](https://slack.cncf.io/) Slack workspace and use the
+[#flux](https://cloud-native.slack.com/messages/flux/) channel.
 
 The Flux developers use a mailing list to discuss development as well.
 Simply subscribe to [flux-dev on Google
 Groups](https://groups.google.com/forum/#!forum/flux-dev) to join the
 conversation (this will also add an invitation to your Google calendar
-for our [Flux meeting](https://github.com/weaveworks/flux/wiki/Meeting)).
+for our [Flux meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#)).
 
 ## Getting Started
 
diff --git a/README.md b/README.md
index b7cf3b965..a729b6267 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Flux
 
+> **Notice** Flux has moved house! Please see https://github.com/weaveworks/flux/wiki/MoveToFluxCD
+
 We believe in GitOps:
 
 - **You declaratively describe the entire desired state of your
@@ -100,7 +102,7 @@ Get started by browsing through the documentation below:
 
 - Background about Flux
   - [Introduction to Flux](/site/introduction.md)
-  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/site/how-it-works.md)
   - [Considerations regarding installing Flux](/site/installing.md)
   - [Flux <-> Helm integration](/site/helm-integration.md)
@@ -112,7 +114,7 @@ Get started by browsing through the documentation below:
   - [Using fluxctl to control Flux](/site/fluxctl.md)
   - [Helm Operator](/site/helm-operator.md)
   - [Troubleshooting](/site/troubleshooting.md)
-  - [Frequently encountered issues](https://github.com/weaveworks/flux/labels/FAQ)
+  - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [Upgrading to Flux v1](/site/upgrading-to-1.0.md)
 
 ### Integrations
@@ -130,10 +132,12 @@ a few popular ones you might want to check out:
 We welcome all kinds of contributions to Flux, be it code, issues you found,
 documentation, external tools, help and support or anything else really.
 
+The Flux project adheres to the [CNCF Code of
+Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
 Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by contacting a *Flux* project maintainer, or Alexis
-Richardson `<alexis@weave.works>`. Please refer to our [code of
-conduct](CODE_OF_CONDUCT.md) as well.
+may be reported by contacting a *Flux* project maintainer, or the CNCF
+mediator, Mishi Choudhary <mishi@linux.com>.
 
 To familiarise yourself with the project and how things work, you might
 be interested in the following:
@@ -146,14 +150,12 @@ be interested in the following:
 
 If you have any questions about Flux and continuous delivery:
 
-- Read [the Weave Flux docs](https://github.com/weaveworks/flux/tree/master/site).
-- Invite yourself to the <a href="https://slack.weave.works/" target="_blank">Weave community</a>
-  slack and ask a question on the [#flux](https://weave-community.slack.com/messages/flux/)
+- Read [the Flux docs](https://github.com/fluxcd/flux/tree/master/site).
+- Invite yourself to the <a href="https://slack.cncf.io" target="_blank">CNCF community</a>
+  slack and ask a question on the [#flux](https://cloud-native.slack.com/messages/flux/)
   channel.
 - To be part of the conversation about Flux's development, join the
   [flux-dev mailing list](https://groups.google.com/forum/#!forum/flux-dev).
-- Join the [Weave User Group](https://www.meetup.com/pro/Weave/) and get
-  invited to online talks, hands-on training and meetups in your area.
-- [File an issue.](https://github.com/weaveworks/flux/issues/new)
+- [File an issue.](https://github.com/fluxcd/flux/issues/new)
 
 Your feedback is always welcome!
diff --git a/site/upgrading-to-1.0.md b/site/upgrading-to-1.0.md
index 20f8d34dd..4f3c0198f 100644
--- a/site/upgrading-to-1.0.md
+++ b/site/upgrading-to-1.0.md
@@ -266,11 +266,4 @@ and if there are manifests for the old Flux still in git, it will
 create those as resources.
 
 If that’s the case, you will need to remove the manifests from git
-before running Flux v1. You can download manifests from Weave Cloud,
-or adapt those given in the repo, if you want to check them back in.
-
-### Something else went wrong
-
-You can reach Weaveworks developers in our community Slack --
-https://weaveworks.github.io/community-slack/ -- where we will be able
-to help.
+before running Flux v1.

From a2a3f56c646b34cae43ab35fce7fe28079c77587 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Thu, 18 Jul 2019 10:59:41 +0200
Subject: [PATCH 049/158] Merge pull request #2268 from jbovet/master

Added Walmart to production users
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a729b6267..abf4aa6a0 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ Its major features are:
 - [Troii](https://troii.com/)
 - [Under Armour](https://www.underarmour.com)
 - [VSHN](https://vshn.ch)
+- [Walmart Chile](https://www.walmartchile.cl)
 - [Weave Cloud](https://cloud.weave.works)
 
 If you too are using Flux in production; please submit a PR to add your organization to the list!

From 410c1645e77a436a120b96e68c21b8f81c98005e Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Thu, 18 Jul 2019 12:44:40 +0200
Subject: [PATCH 050/158] PR template: weaveworks -> fluxcd (#2271)

PR template: weaveworks -> fluxcd
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 09823d67f..42c913644 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 <!--
 # General contribution criteria
 
-Please have a look at our contribution guidelines: https://github.com/weaveworks/flux/blob/master/CONTRIBUTING.md
+Please have a look at our contribution guidelines: https://github.com/fluxcd/flux/blob/master/CONTRIBUTING.md
 Particularly the sections about the:
 
  - DCO;

From 5a9af611c626653bf4dd1c54d3baf5333c83069d Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Thu, 18 Jul 2019 12:58:25 +0200
Subject: [PATCH 051/158] Merge pull request #2270 from carlpett/patch-1

Fix file name in .flux.yaml docs
---
 site/fluxyaml-config-files.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site/fluxyaml-config-files.md b/site/fluxyaml-config-files.md
index c836730d4..0587f87d2 100644
--- a/site/fluxyaml-config-files.md
+++ b/site/fluxyaml-config-files.md
@@ -144,8 +144,8 @@ in your own Flux-based image or, if the tools are popular enough, Flux maintaine
 (please create an issue). In the future (once [Ephemeral containers](https://github.com/kubernetes/kubernetes/pull/59416)
 are available), you will be able to specify an container image for each command.
 
-The working directory (also known as CWD) of the `command`s executed from a `.fluxctl.yaml` file will be set to the
-target path (`--git-path` entry) used when finding that `.fluxctl.yaml` file.
+The working directory (also known as CWD) of the `command`s executed from a `.flux.yaml` file will be set to the
+target path (`--git-path` entry) used when finding that `.flux.yaml` file.
 
 For example, when using flux with `--git-path=staging` on a git repository with this structure:
 

From 6879a1e497a6d181d78f92802bc2780dc8a0629a Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 23 Jul 2019 19:08:11 +0300
Subject: [PATCH 052/158] Merge pull request #2286 from fluxcd/multi-tenancy

Add the multi-tenancy repo to readme
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index abf4aa6a0..950bafa4a 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,8 @@ Get started by browsing through the documentation below:
 As Flux is Open Source, integrations are very straight-forward. Here are
 a few popular ones you might want to check out:
 
-- [Managing Helm releases the GitOps way](https://github.com/stefanprodan/gitops-helm)
+- [Manage a multi-tenant cluster with Flux and Kustomize](https://github.com/fluxcd/multi-tenancy)
+- [Managing Helm releases the GitOps way](https://github.com/fluxcd/helm-operator-get-started)
 - [OpenFaaS GitOps workflow with Flux](https://github.com/stefanprodan/openfaas-flux)
 - [GitOps for Istio Canary deployments](https://github.com/stefanprodan/gitops-istio)
 - [Fluxcloud to receive events from Flux](https://github.com/justinbarrick/fluxcloud)

From 182cbefa0a6c373ca0eda24ad38e529852fdcf0b Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Thu, 25 Jul 2019 14:33:54 +0100
Subject: [PATCH 053/158] Merge pull request #2278 from
 hmcts/fixprometheusannotation

fixing prometheus scrape annotation
---
 chart/flux/templates/deployment.yaml          |  2 +-
 .../templates/helm-operator-deployment.yaml   |  2 +-
 cluster/kubernetes/policies_test.go           | 20 +++++++++----------
 cluster/kubernetes/update_test.go             |  4 ++--
 .../weave-cloud-helm-operator-deployment.yaml |  2 +-
 deploy/flux-deployment.yaml                   |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/chart/flux/templates/deployment.yaml b/chart/flux/templates/deployment.yaml
index 737c2d2d2..03ec725dc 100644
--- a/chart/flux/templates/deployment.yaml
+++ b/chart/flux/templates/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.annotations }}
       {{- .Values.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/chart/flux/templates/helm-operator-deployment.yaml b/chart/flux/templates/helm-operator-deployment.yaml
index 8308635eb..fc036ecf2 100644
--- a/chart/flux/templates/helm-operator-deployment.yaml
+++ b/chart/flux/templates/helm-operator-deployment.yaml
@@ -20,7 +20,7 @@ spec:
     metadata:
       annotations:
       {{- if .Values.prometheus.enabled }}
-        prometheus.io.scrape: "true"
+        prometheus.io/scrape: "true"
       {{- end }}
       {{- if .Values.helmOperator.annotations }}
       {{- .Values.helmOperator.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
index edc33ebee..8d6f509ae 100644
--- a/cluster/kubernetes/policies_test.go
+++ b/cluster/kubernetes/policies_test.go
@@ -22,8 +22,8 @@ func TestUpdatePolicies(t *testing.T) {
 	}{
 		{
 			name: "adding annotation with others existing",
-			in:   []string{"prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/automated", "'true'"},
+			in:   []string{"prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/automated", "'true'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -38,8 +38,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "adding annotation when already has annotation and others",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -54,8 +54,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "add and remove different annotations at the same time",
-			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io.scrape", "'false'"},
-			out:  []string{"prometheus.io.scrape", "'false'", "flux.weave.works/locked", "'true'"},
+			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/locked", "'true'"},
 			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Automated: "true"},
@@ -72,8 +72,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with others existing",
-			in:   []string{"flux.weave.works/automated", "true", "prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"flux.weave.works/automated", "true", "prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
@@ -96,8 +96,8 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with only others",
-			in:   []string{"prometheus.io.scrape", "false"},
-			out:  []string{"prometheus.io.scrape", "false"},
+			in:   []string{"prometheus.io/scrape", "false"},
+			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
 			},
diff --git a/cluster/kubernetes/update_test.go b/cluster/kubernetes/update_test.go
index ea2ed46e8..f5ae8c8c9 100644
--- a/cluster/kubernetes/update_test.go
+++ b/cluster/kubernetes/update_test.go
@@ -471,7 +471,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
@@ -522,7 +522,7 @@ spec:
       labels:
         name: authfe
       annotations:
-        prometheus.io.port: "8080"
+        prometheus.io/port: "8080"
     spec:
       # blank comment spacers in the following
       containers:
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index a16ae5522..d4a779c55 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.scrape: "false"
+        prometheus.io/scrape: "false"
       labels:
         app: flux-helm-operator
     spec:
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 80de4ff21..c1e563c78 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.port: "3031" # tell prometheus to scrape /metrics endpoint's port.
+        prometheus.io/port: "3031" # tell prometheus to scrape /metrics endpoint's port.
       labels:
         name: flux
     spec:

From dcefb47fcf255a8abc16447678fa89c7e3072954 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hiddeco@users.noreply.github.com>
Date: Wed, 10 Jul 2019 18:12:09 +0200
Subject: [PATCH 054/158] Update labels in Dockerfiles to match `fluxcd` org
 (#2244)

Update labels in Dockerfiles to match `fluxcd` org
---
 docker/Dockerfile.flux          | 18 +++++++++---------
 docker/Dockerfile.helm-operator | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docker/Dockerfile.flux b/docker/Dockerfile.flux
index 0fe3d29d2..33a29a47d 100644
--- a/docker/Dockerfile.flux
+++ b/docker/Dockerfile.flux
@@ -17,18 +17,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./kustomize /usr/local/bin
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux" \
-      org.opencontainers.image.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The GitOps operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux" \
-      org.label-schema.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The GitOps operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "fluxd" ]
 
diff --git a/docker/Dockerfile.helm-operator b/docker/Dockerfile.helm-operator
index 9b70a9e62..dcaa7ef7e 100644
--- a/docker/Dockerfile.helm-operator
+++ b/docker/Dockerfile.helm-operator
@@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
 COPY ./helm /usr/local/bin/
 
 # These are pretty static
-LABEL maintainer="Weaveworks <help@weave.works>" \
+LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
       org.opencontainers.image.title="flux-helm-operator" \
-      org.opencontainers.image.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.opencontainers.image.url="https://github.com/weaveworks/flux" \
-      org.opencontainers.image.source="git@github.com:weaveworks/flux" \
-      org.opencontainers.image.vendor="Weaveworks" \
+      org.opencontainers.image.description="The Helm operator for Kubernetes" \
+      org.opencontainers.image.url="https://github.com/fluxcd/flux" \
+      org.opencontainers.image.source="git@github.com:fluxcd/flux" \
+      org.opencontainers.image.vendor="Flux CD" \
       org.label-schema.schema-version="1.0" \
       org.label-schema.name="flux-helm-operator" \
-      org.label-schema.description="The Flux Helm operator, for releasing Helm charts according to git" \
-      org.label-schema.url="https://github.com/weaveworks/flux" \
-      org.label-schema.vcs-url="git@github.com:weaveworks/flux" \
-      org.label-schema.vendor="Weaveworks"
+      org.label-schema.description="The Helm operator for Kubernetes" \
+      org.label-schema.url="https://github.com/fluxcd/flux" \
+      org.label-schema.vcs-url="git@github.com:fluxcd/flux" \
+      org.label-schema.vendor="Flux CD"
 
 ENTRYPOINT [ "/sbin/tini", "--", "helm-operator" ]
 

From 8c23c9cbc431c44bf5f2446a4a19c8d887246f54 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Thu, 25 Jul 2019 15:25:23 +0100
Subject: [PATCH 055/158] Release notes for 1.13.3

---
 CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcac59854..30afee9eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,56 @@
 This is the changelog for the Flux daemon; the changelog for the Helm
 operator is in [./CHANGELOG-helmop.md](./CHANGELOG-helmop.md).
 
+## 1.13.3 (2019-07-25)
+
+This is a patch release, mostly concerned with adapting documentation
+to Flux's new home in https://github.com/fluxcd/ and the [CNCF
+sandbox](https://www.cncf.io/sandbox-projects/).
+
+### Fixes
+
+- Correct the name of the `--registry-require` argument mentioned in a
+  log message [fluxcd/flux#2256][]
+- Parse Docker credentials that have a host and port, but not a scheme
+  [fluxcd/flux#2248][]
+
+### Maintenance and documentation
+
+- Change references to weaveworks/flux to fluxcd/flux
+  [fluxcd/flux#2240][], [fluxcd/flux#2244][], [fluxcd/flux#2257][],
+  [fluxcd/flux#2271][]
+- Add Walmart to production users (:tada:!) [fluxcd/flux#2268][]
+- Mention the multi-tenancy tutorial in the README
+  [fluxcd/flux#2286][]
+- Fix the filename given in the `.flux.yaml` (manifest generation)
+  docs [fluxcd/flux#2270][]
+- Run credentials tests in parallel, without sleeping
+  [fluxcd/flux#2254][]
+- Correct the Prometheus annotations given in examples
+  [fluxcd/flux#2278][]
+
+### Thanks
+
+Thanks to the following for contributions since the last release:
+@2opremio, @aaron-trout, @adusumillipraveen, @alexhumphreys,
+@aliartiza75, @ariep, @binjheBenjamin, @bricef, @caniszczyk,
+@carlosjgp, @carlpett, @chriscorn-takt, @cloudoutloud, @derrickburns,
+@dholbach, @fnmeissner, @gled4er, @hiddeco, @jmtrusona, @jowparks,
+@jpellizzari, @ksaritek, @ktsakalozos, @mar1n3r0, @mzachh, @primeroz,
+@squaremo, @stefanprodan, @sureshamk, @vyckou, @ybaruchel, @zoni.
+
+[fluxcd/flux#2240]: https://github.com/fluxcd/flux/pull/2240
+[fluxcd/flux#2244]: https://github.com/fluxcd/flux/pull/2244
+[fluxcd/flux#2248]: https://github.com/fluxcd/flux/pull/2248
+[fluxcd/flux#2254]: https://github.com/fluxcd/flux/pull/2254
+[fluxcd/flux#2256]: https://github.com/fluxcd/flux/pull/2256
+[fluxcd/flux#2257]: https://github.com/fluxcd/flux/pull/2257
+[fluxcd/flux#2268]: https://github.com/fluxcd/flux/pull/2268
+[fluxcd/flux#2270]: https://github.com/fluxcd/flux/pull/2270
+[fluxcd/flux#2271]: https://github.com/fluxcd/flux/pull/2271
+[fluxcd/flux#2278]: https://github.com/fluxcd/flux/pull/2278
+[fluxcd/flux#2286]: https://github.com/fluxcd/flux/pull/2286
+
 ## 1.13.2 (2019-07-10)
 
 This is a patch release, including a fix for [problems with using image

From f913959b52074b5148be54e4afd06f8193758639 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Thu, 25 Jul 2019 15:44:27 +0100
Subject: [PATCH 056/158] Bump version in chart and example yamel

---
 chart/flux/values.yaml      | 2 +-
 deploy/flux-deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index 287a7fc18..823d9772a 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -9,7 +9,7 @@ logFormat: fmt
 
 image:
   repository: docker.io/fluxcd/flux
-  tag: 1.13.2
+  tag: 1.13.3
   pullPolicy: IfNotPresent
   pullSecret:
 
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index c1e563c78..2857339ee 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/flux:1.13.2
+        image: docker.io/fluxcd/flux:1.13.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:

From 9ae5a88c37115b9f85bf4365a8eec77fb3a23a0b Mon Sep 17 00:00:00 2001
From: Olivier Biesmans <olivier.biesmans@blablacar.com>
Date: Wed, 24 Jul 2019 12:46:17 +0200
Subject: [PATCH 057/158] Fix values merge in Helm integration

---
 integrations/helm/release/release.go      |  4 +-
 integrations/helm/release/release_test.go | 77 +++++++++++++++++++++++
 2 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 integrations/helm/release/release_test.go

diff --git a/integrations/helm/release/release.go b/integrations/helm/release/release.go
index a3caeaba6..639f6ca64 100644
--- a/integrations/helm/release/release.go
+++ b/integrations/helm/release/release.go
@@ -488,9 +488,9 @@ func fhrResourceID(fhr flux_v1beta1.HelmRelease) resource.ID {
 	return resource.MakeID(fhr.Namespace, "HelmRelease", fhr.Name)
 }
 
-// Merges source and destination `chartutils.Values`, preferring values from the source Values
+// Merges source and destination map, preferring values from the source Values
 // This is slightly adapted from https://github.com/helm/helm/blob/2332b480c9cb70a0d8a85247992d6155fbe82416/cmd/helm/install.go#L359
-func mergeValues(dest, src chartutil.Values) chartutil.Values {
+func mergeValues(dest, src map[string]interface{}) map[string]interface{} {
 	for k, v := range src {
 		// If the key doesn't exist already, then just set the key to that value
 		if _, exists := dest[k]; !exists {
diff --git a/integrations/helm/release/release_test.go b/integrations/helm/release/release_test.go
new file mode 100644
index 000000000..3c95c7bbf
--- /dev/null
+++ b/integrations/helm/release/release_test.go
@@ -0,0 +1,77 @@
+package release
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	flux_v1beta1 "github.com/weaveworks/flux/integrations/apis/flux.weave.works/v1beta1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes/fake"
+	"k8s.io/helm/pkg/chartutil"
+)
+
+func TestValues(t *testing.T) {
+	falseVal := false
+
+	chartValues, _ := chartutil.ReadValues([]byte(`image:
+  tag: 1.1.1
+valuesDict:
+  chart: true`))
+
+	client := fake.NewSimpleClientset(
+		&corev1.ConfigMap{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "release-configmap",
+				Namespace: "flux",
+			},
+			Data: map[string]string{
+				"values.yaml": `valuesDict:
+  configmap: true`,
+			},
+		},
+		&corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "release-secret",
+				Namespace: "flux",
+			},
+			Data: map[string][]byte{
+				"values.yaml": []byte(`valuesDict:
+  secret: true`),
+			},
+		},
+	)
+
+	valuesFromSource := []flux_v1beta1.ValuesFromSource{
+		flux_v1beta1.ValuesFromSource{
+			ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: "release-configmap",
+				},
+				Key:      "values.yaml",
+				Optional: &falseVal,
+			},
+			SecretKeyRef:      nil,
+			ExternalSourceRef: nil,
+			ChartFileRef:      nil,
+		},
+		flux_v1beta1.ValuesFromSource{
+			ConfigMapKeyRef: nil,
+			SecretKeyRef: &corev1.SecretKeySelector{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: "release-secret",
+				},
+				Key:      "values.yaml",
+				Optional: &falseVal,
+			},
+			ExternalSourceRef: nil,
+			ChartFileRef:      nil,
+		}}
+
+	values, err := Values(client.CoreV1(), "flux", "", valuesFromSource, chartValues)
+	assert.NoError(t, err)
+	assert.Equal(t, "1.1.1", values["image"].(map[string]interface{})["tag"])
+	assert.NotNil(t, values["valuesDict"].(map[string]interface{})["chart"])
+	assert.NotNil(t, values["valuesDict"].(map[string]interface{})["configmap"])
+	assert.NotNil(t, values["valuesDict"].(map[string]interface{})["secret"])
+}

From d670a5a8947e08a05e82603f5b8d4067c10c0606 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 23 Jul 2019 15:15:45 +0200
Subject: [PATCH 058/158] Rename `--registry-poll-interval`

The flag `--registry-poll-interval` used to control how often fluxd
would scan image repos for new images, and consequently update any
automated workloads. This has not been true for some time: it now
just controls the second part, while images are scanned on a
different schedule. The name is a persistent source of confusion.

Therefore: introduce a new flag `--automation-interval`, and make
`--registry-poll-interval` a synonym so as not to break things
suddenly, and deprecate the latter so as to encourage people to
change it.
---
 cmd/fluxd/main.go         | 19 +++++++++++++-----
 daemon/daemon.go          |  2 +-
 daemon/images.go          |  4 ++--
 daemon/loop.go            | 42 +++++++++++++++++++--------------------
 site/daemon.md            |  3 ++-
 site/faq.md               |  2 +-
 test/flux-deploy-all.yaml |  2 +-
 7 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index 25e07c2b0..15b0aef4f 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -140,6 +140,7 @@ func main() {
 		memcachedTimeout  = fs.Duration("memcached-timeout", time.Second, "maximum time to wait before giving up on memcached requests.")
 		memcachedService  = fs.String("memcached-service", "memcached", "SRV service used to discover memcache servers.")
 
+		automationInterval   = fs.Duration("automation-interval", 5*time.Minute, "period at which to check for image updates for automated workloads")
 		registryPollInterval = fs.Duration("registry-poll-interval", 5*time.Minute, "period at which to check for updated images")
 		registryRPS          = fs.Float64("registry-rps", 50, "maximum registry requests per second per host")
 		registryBurst        = fs.Int("registry-burst", defaultRemoteConnections, "maximum number of warmer connections to remote and memcache")
@@ -182,6 +183,7 @@ func main() {
 	)
 	fs.MarkDeprecated("registry-cache-expiry", "no longer used; cache entries are expired adaptively according to how often they change")
 	fs.MarkDeprecated("k8s-namespace-whitelist", "changed to --k8s-allow-namespace, use that instead")
+	fs.MarkDeprecated("registry-poll-interval", "changed to --automation-interval, use that instead")
 
 	var kubeConfig *string
 	{
@@ -245,6 +247,13 @@ func main() {
 	k8sruntime.ErrorHandlers = []func(error){logErrorUnlessAccessRelated}
 	// Argument validation
 
+	// Maintain backwards compatibility with the --registry-poll-interval
+	// flag, but only if the --automation-interval is not set to a custom
+	// (non default) value.
+	if fs.Changed("registry-poll-interval") && !fs.Changed("automation-interval") {
+		*automationInterval = *registryPollInterval
+	}
+
 	// Sort out values for the git tag and notes ref. There are
 	// running deployments that assume the defaults as given, so don't
 	// mess with those unless explicitly told.
@@ -595,10 +604,10 @@ func main() {
 		Logger:                    log.With(logger, "component", "daemon"),
 		ManifestGenerationEnabled: *manifestGeneration,
 		LoopVars: &daemon.LoopVars{
-			SyncInterval:         *syncInterval,
-			RegistryPollInterval: *registryPollInterval,
-			GitTimeout:           *gitTimeout,
-			GitVerifySignatures:  *gitVerifySignatures,
+			SyncInterval:        *syncInterval,
+			AutomationInterval:  *automationInterval,
+			GitTimeout:          *gitTimeout,
+			GitVerifySignatures: *gitVerifySignatures,
 		},
 	}
 
@@ -634,7 +643,7 @@ func main() {
 	shutdownWg.Add(1)
 	go daemon.Loop(shutdown, shutdownWg, log.With(logger, "component", "sync-loop"))
 
-	cacheWarmer.Notify = daemon.AskForImagePoll
+	cacheWarmer.Notify = daemon.AskForAutomatedWorkloadImageUpdates
 	cacheWarmer.Priority = daemon.ImageRefresh
 	cacheWarmer.Trace = *registryTrace
 	shutdownWg.Add(1)
diff --git a/daemon/daemon.go b/daemon/daemon.go
index e7189ea2a..1aa437219 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -463,7 +463,7 @@ func (d *Daemon) updatePolicies(spec update.Spec, updates resource.PolicyUpdates
 			return result, err
 		}
 		if anythingAutomated {
-			d.AskForImagePoll()
+			d.AskForAutomatedWorkloadImageUpdates()
 		}
 
 		var err error
diff --git a/daemon/images.go b/daemon/images.go
index b046703d2..951968adb 100644
--- a/daemon/images.go
+++ b/daemon/images.go
@@ -13,8 +13,8 @@ import (
 	"github.com/weaveworks/flux/update"
 )
 
-func (d *Daemon) pollForNewImages(logger log.Logger) {
-	logger.Log("msg", "polling images")
+func (d *Daemon) pollForNewAutomatedWorkloadImages(logger log.Logger) {
+	logger.Log("msg", "polling for new images for automated workloads")
 
 	ctx := context.Background()
 
diff --git a/daemon/loop.go b/daemon/loop.go
index c9106ad98..7d5fc4a4f 100644
--- a/daemon/loop.go
+++ b/daemon/loop.go
@@ -12,20 +12,20 @@ import (
 )
 
 type LoopVars struct {
-	SyncInterval         time.Duration
-	RegistryPollInterval time.Duration
-	GitTimeout           time.Duration
-	GitVerifySignatures  bool
-
-	initOnce       sync.Once
-	syncSoon       chan struct{}
-	pollImagesSoon chan struct{}
+	SyncInterval        time.Duration
+	AutomationInterval  time.Duration
+	GitTimeout          time.Duration
+	GitVerifySignatures bool
+
+	initOnce               sync.Once
+	syncSoon               chan struct{}
+	automatedWorkloadsSoon chan struct{}
 }
 
 func (loop *LoopVars) ensureInit() {
 	loop.initOnce.Do(func() {
 		loop.syncSoon = make(chan struct{}, 1)
-		loop.pollImagesSoon = make(chan struct{}, 1)
+		loop.automatedWorkloadsSoon = make(chan struct{}, 1)
 	})
 }
 
@@ -38,7 +38,7 @@ func (d *Daemon) Loop(stop chan struct{}, wg *sync.WaitGroup, logger log.Logger)
 	syncTimer := time.NewTimer(d.SyncInterval)
 	// Similarly checking to see if any controllers have new images
 	// available.
-	imagePollTimer := time.NewTimer(d.RegistryPollInterval)
+	automatedWorkloadTimer := time.NewTimer(d.AutomationInterval)
 
 	// Keep track of current, verified (if signature verification is
 	// enabled), HEAD, so we can know when to treat a repo
@@ -49,26 +49,26 @@ func (d *Daemon) Loop(stop chan struct{}, wg *sync.WaitGroup, logger log.Logger)
 	// In-memory sync tag state
 	lastKnownSyncTag := &lastKnownSyncTag{logger: logger, syncTag: d.GitConfig.SyncTag}
 
-	// Ask for a sync, and to poll images, straight away
+	// Ask for a sync, and to check
 	d.AskForSync()
-	d.AskForImagePoll()
+	d.AskForAutomatedWorkloadImageUpdates()
 
 	for {
 		select {
 		case <-stop:
 			logger.Log("stopping", "true")
 			return
-		case <-d.pollImagesSoon:
-			if !imagePollTimer.Stop() {
+		case <-d.automatedWorkloadsSoon:
+			if !automatedWorkloadTimer.Stop() {
 				select {
-				case <-imagePollTimer.C:
+				case <-automatedWorkloadTimer.C:
 				default:
 				}
 			}
-			d.pollForNewImages(logger)
-			imagePollTimer.Reset(d.RegistryPollInterval)
-		case <-imagePollTimer.C:
-			d.AskForImagePoll()
+			d.pollForNewAutomatedWorkloadImages(logger)
+			automatedWorkloadTimer.Reset(d.AutomationInterval)
+		case <-automatedWorkloadTimer.C:
+			d.AskForAutomatedWorkloadImageUpdates()
 		case <-d.syncSoon:
 			if !syncTimer.Stop() {
 				select {
@@ -150,10 +150,10 @@ func (d *LoopVars) AskForSync() {
 }
 
 // Ask for an image poll, or if there's one waiting, let that happen.
-func (d *LoopVars) AskForImagePoll() {
+func (d *LoopVars) AskForAutomatedWorkloadImageUpdates() {
 	d.ensureInit()
 	select {
-	case d.pollImagesSoon <- struct{}{}:
+	case d.automatedWorkloadsSoon <- struct{}{}:
 	default:
 	}
 }
diff --git a/site/daemon.md b/site/daemon.md
index 64007edf0..d823ca582 100644
--- a/site/daemon.md
+++ b/site/daemon.md
@@ -68,12 +68,13 @@ fluxd requires setup and offers customization though a multitude of flags.
 | **syncing:** control over how config is applied to the cluster
 | --sync-interval                                  | `5m`                               | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
 | --sync-garbage-collection                        | `false`                            | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
+| **automation (of image updates):**
+| --automation-interval                            | `5m`                               | period at which to check for image updates for automated workloads
 | **registry cache:** (none of these need overriding, usually)
 | --memcached-hostname                             | `memcached`                        | hostname for memcached service to use for caching image metadata
 | --memcached-timeout                              | `1s`                               | maximum time to wait before giving up on memcached requests
 | --memcached-service                              | `memcached`                        | SRV service used to discover memcache servers
 | --registry-cache-expiry                          | `1h`                               | Duration to keep cached registry tag info. Must be < 1 month.
-| --registry-poll-interval                         | `5m`                               | period at which to poll registry for new images
 | --registry-rps                                   | `200`                              | maximum registry requests per second per host
 | --registry-burst                                 | `125`                              | maximum number of warmer connections to remote and memcache
 | --registry-insecure-host                         | []                                 | registry hosts to use HTTP for (instead of HTTPS)
diff --git a/site/faq.md b/site/faq.md
index 573fc6292..0f8c4e159 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -196,7 +196,7 @@ See also
    by default.
 
 The latter default is quite conservative, so you can try lowering it
-(it's set with the flag `--registry-poll-interval`).
+(it's set with the flag `--automation-interval`).
 
 Please don't _increase_ the rate limiting numbers (`--registry-rps`
 and `--registry-burst`) -- it's possible to get blacklisted by image
diff --git a/test/flux-deploy-all.yaml b/test/flux-deploy-all.yaml
index 8af30e1ef..0ac072d25 100644
--- a/test/flux-deploy-all.yaml
+++ b/test/flux-deploy-all.yaml
@@ -94,5 +94,5 @@ spec:
         - --git-url=ssh://docker@MINIKUBE_IP:/home/docker/flux.git
         - --git-branch=master
         # Tune up to make tests run quicker
-        - --registry-poll-interval=60s
+        - --automation-interval=60s
         - --git-poll-interval=60s

From 44a461fbb5e712bf997a139fb842316d72591a4f Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 23 Jul 2019 13:40:26 +0200
Subject: [PATCH 059/158] Upgrade justinbarrick/go-k8s-portforward@d79fe1b9

To only look for pods with status.phase=Running while trying to
setup a port forward. Given a pod needs to be running to be able to
port forward, and to work around scenarios where a node failure
ocurred and one pod hangs in a 'terminating' state.
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 62fcae930..338ea19a9 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@ require (
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/justinbarrick/go-k8s-portforward v1.0.3
+	github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
 	github.com/opencontainers/go-digest v1.0.0-rc1
diff --git a/go.sum b/go.sum
index 7d23cd107..d3826d4ee 100644
--- a/go.sum
+++ b/go.sum
@@ -140,8 +140,8 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBv
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/justinbarrick/go-k8s-portforward v1.0.2/go.mod h1:klMOboLnC1/UlkyJnYFjcMcbOtwAcKop+LkIZ4r428o=
-github.com/justinbarrick/go-k8s-portforward v1.0.3 h1:FPvJqHjIKb0xlA8FuFYSzlsyQWeqNzXbCDQMyfbmCpI=
-github.com/justinbarrick/go-k8s-portforward v1.0.3/go.mod h1:GkvGI25j2iHpJVINl/hZC+sbf9IJ1XkY1MtjSh3Usuk=
+github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d h1:xQ/ZtcWCKzWg5QbOhq6RFPvevl+IE580Vm0Vgxuw3xs=
+github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d/go.mod h1:GkvGI25j2iHpJVINl/hZC+sbf9IJ1XkY1MtjSh3Usuk=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

From a35330d7620adeca7ee58e1605de9edd6689350f Mon Sep 17 00:00:00 2001
From: Harry Lascelles <harry@harrylascelles.com>
Date: Thu, 25 Jul 2019 15:39:36 +0100
Subject: [PATCH 060/158] Correct bussiness to business

---
 cluster/kubernetes/manifests.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/kubernetes/manifests.go b/cluster/kubernetes/manifests.go
index 26abae33b..15f569e98 100644
--- a/cluster/kubernetes/manifests.go
+++ b/cluster/kubernetes/manifests.go
@@ -99,7 +99,7 @@ func (m *manifests) setEffectiveNamespaces(manifests map[string]kresource.KubeMa
 		km.SetNamespace(ns)
 		if _, warningLogged := m.resourceWarnings[resIDStr]; warningLogged {
 			// indicate that we found the resource's scope and allow logging a warning again
-			m.logger.Log("info", fmt.Sprintf("found scope of resource %s, back in bussiness!", km.ResourceID().String()))
+			m.logger.Log("info", fmt.Sprintf("found scope of resource %s, back in business!", km.ResourceID().String()))
 			delete(m.resourceWarnings, resIDStr)
 		}
 		result[km.ResourceID().String()] = km

From 130da33fce5d9b28d9df3d56849e3e258ef4c24f Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Mon, 22 Jul 2019 20:27:06 +0200
Subject: [PATCH 061/158] Generate dependency paths relative to root folder

---
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 578f1b974..35d681b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,7 @@ endif
 CURRENT_OS_ARCH=$(shell echo `go env GOOS`-`go env GOARCH`)
 GOBIN?=$(shell echo `go env GOPATH`/bin)
 
-# NB because this outputs absolute file names, you have to be careful
-# if you're testing out the Makefile with `-W` (pretend a file is
-# new); use the full path to the pretend-new file, e.g.,
-#  `make -W $PWD/registry/registry.go`
-godeps=$(shell go list -deps -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}' $(1))
+godeps=$(shell go list -deps -f '{{if not .Standard}}{{ $$dep := . }}{{range .GoFiles}}{{$$dep.Dir}}/{{.}} {{end}}{{end}}' $(1) | sed "s%${PWD}/%%g")
 
 FLUXD_DEPS:=$(call godeps,./cmd/fluxd/...)
 FLUXCTL_DEPS:=$(call godeps,./cmd/fluxctl/...)

From 74bbfb2ab050dd3d6470b55c9c743a79bab8a7ae Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Mon, 22 Jul 2019 20:39:49 +0200
Subject: [PATCH 062/158] Embed all manifests in deploy/* inside fluxctl

---
 Makefile                            |   7 +-
 cmd/fluxctl/setup-assets/bindata.go | 329 ++++++++++++++++++++++++++++
 go.mod                              |   1 +
 go.sum                              |   2 +
 tools.go                            |   1 +
 5 files changed, 338 insertions(+), 2 deletions(-)
 create mode 100644 cmd/fluxctl/setup-assets/bindata.go

diff --git a/Makefile b/Makefile
index 35d681b2b..9939286f7 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-check-generated:
+cmd/fluxctl/setup-assets/bindata.go: deploy/*
+	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg setup-assets -o $@ deploy/
+
+check-generated: cmd/fluxctl/setup-assets/bindata.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client
+	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/deploy-bindata.go
 
diff --git a/cmd/fluxctl/setup-assets/bindata.go b/cmd/fluxctl/setup-assets/bindata.go
new file mode 100644
index 000000000..2aa6cc8c9
--- /dev/null
+++ b/cmd/fluxctl/setup-assets/bindata.go
@@ -0,0 +1,329 @@
+// Code generated by go-bindata.
+// sources:
+// deploy/flux-account.yaml
+// deploy/flux-deployment.yaml
+// deploy/flux-secret.yaml
+// deploy/memcache-dep.yaml
+// deploy/memcache-svc.yaml
+// DO NOT EDIT!
+
+package setup-assets
+
+import (
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+func bindataRead(data []byte, name string) ([]byte, error) {
+	gz, err := gzip.NewReader(bytes.NewBuffer(data))
+	if err != nil {
+		return nil, fmt.Errorf("Read %q: %v", name, err)
+	}
+
+	var buf bytes.Buffer
+	_, err = io.Copy(&buf, gz)
+	clErr := gz.Close()
+
+	if err != nil {
+		return nil, fmt.Errorf("Read %q: %v", name, err)
+	}
+	if clErr != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
+
+type asset struct {
+	bytes []byte
+	info  os.FileInfo
+}
+
+type bindataFileInfo struct {
+	name    string
+	size    int64
+	mode    os.FileMode
+	modTime time.Time
+}
+
+func (fi bindataFileInfo) Name() string {
+	return fi.name
+}
+func (fi bindataFileInfo) Size() int64 {
+	return fi.size
+}
+func (fi bindataFileInfo) Mode() os.FileMode {
+	return fi.mode
+}
+func (fi bindataFileInfo) ModTime() time.Time {
+	return fi.modTime
+}
+func (fi bindataFileInfo) IsDir() bool {
+	return false
+}
+func (fi bindataFileInfo) Sys() interface{} {
+	return nil
+}
+
+var _deployFluxAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x51\xbd\x6e\xf3\x30\x0c\xdc\xf5\x14\x04\x32\xe4\xfb\x8a\xd8\x45\xb6\xc2\x5b\x92\xa1\x43\x3b\xb9\x3f\x4b\xd1\x81\x92\xe8\x46\x8d\x22\x1a\x94\xe4\xfe\x3c\x7d\xe1\x38\x01\x62\xa4\x2d\x10\xa0\x1b\x79\x38\xf2\xee\xc8\xa2\x28\xd4\x04\xee\xd7\x04\x91\xa4\x73\x86\x00\x8d\xe1\x1c\xd2\x0c\x8c\xcf\x31\x91\x80\xb0\xa7\x38\x03\x0c\x76\x04\x81\x76\xc1\xba\xf0\x02\x28\xa4\x26\xc0\xc1\x7f\x40\x20\xb2\x64\xa1\x61\x81\x9b\xac\x49\x02\x25\x8a\xf0\xe6\xd2\x7a\x37\x52\x68\x8c\x64\x7b\x05\x8a\x11\x0c\x87\x24\xec\xe1\x5f\xbd\x5c\xac\xfe\x97\x0a\x5b\xf7\x48\x12\x1d\x87\x0a\xba\xb9\xda\xb8\x60\x2b\xb8\x1b\x5c\x2d\x06\x53\x6a\x4b\x09\x2d\x26\xac\x14\x80\x47\x4d\x3e\xf6\x15\x40\xc0\x2d\x55\xd0\xf8\xfc\xae\x46\x4d\x1f\xef\x78\xaf\x68\x34\x25\xe6\xb4\x66\x71\x9f\x98\x1c\x87\x72\x73\x15\x4b\xc7\x97\xdd\x5c\x53\xc2\x83\xec\x6a\x08\x5a\xb3\xa7\xb3\x35\x25\x7b\xda\x51\x0a\xc0\xd6\x5d\x0b\xe7\x36\x56\xf0\x34\xbd\x98\x3e\xef\xe6\x84\x22\x67\x31\x34\x02\x3b\x12\x7d\x04\x14\x10\x38\xd4\x7b\xe2\x43\x7d\xfb\x33\xf7\x0f\x12\x2e\x87\x47\x9e\x1f\x94\x3d\xd5\xd4\xf4\xa4\x43\xd0\x5f\xf4\x15\xc0\xe9\x6d\x47\xfb\x62\xd6\xaf\x64\xd2\xfe\x76\xdf\xfe\xff\xc4\xce\xd0\xc6\x16\x0d\x55\x60\xa9\xc1\xec\x93\xfa\x0a\x00\x00\xff\xff\xb1\x6e\xe4\xd9\xd5\x02\x00\x00")
+
+func deployFluxAccountYamlBytes() ([]byte, error) {
+	return bindataRead(
+		_deployFluxAccountYaml,
+		"deploy/flux-account.yaml",
+	)
+}
+
+func deployFluxAccountYaml() (*asset, error) {
+	bytes, err := deployFluxAccountYamlBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "deploy/flux-account.yaml", size: 725, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _deployFluxDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x9c\x00\xd2\xea\xe4\x4b\x8b\x62\x53\x05\x6d\xed\xc6\x35\x1c\xdb\x07\xbb\x6e\xd1\xa7\x86\xe2\x8e\xb4\x84\xb8\xe4\x96\x33\x2b\x45\xdf\xbe\x18\x72\xff\x70\x4f\x77\x76\xe0\x3c\xc4\x07\xee\x70\xfe\xfc\x66\xf8\x9b\x19\xad\x56\xab\x1b\xd5\x9a\x7f\x61\x20\xe3\x5d\x09\xaa\x6d\x69\x7d\xda\xdc\x1c\x8d\xab\x4a\x78\x85\xad\xf5\x97\x06\x1d\xdf\x34\xc8\xaa\x52\xac\xca\x1b\x00\xa7\x1a\x2c\x61\x6f\xbb\xdf\x6e\xa8\x45\x2d\x47\x01\x5b\x6b\xb4\xa2\x12\x36\x37\x00\x84\x16\x35\xfb\x20\x5f\x00\x1a\xc5\xba\xfe\x45\xed\xd0\x52\x3a\x98\x69\x00\x20\x0e\x8a\xf1\x70\x49\x1f\xf9\xd2\x62\x09\x1f\x51\x07\x54\x8c\x37\x00\x8c\x4d\x6b\x15\x63\xaf\x2c\xf3\x43\xfe\x53\xce\x79\x56\x6c\xbc\x1b\x95\x03\xb4\xc1\x37\xc8\x35\x76\x54\x18\x5f\xb4\x3e\x70\x09\x8b\xbb\xdb\xbb\xcd\x02\x9e\x01\xa3\xb5\x99\x04\xb0\x07\xd2\x41\xb5\x08\xeb\x06\x39\x18\x4d\x80\xae\x6a\xbd\x71\xfc\x9c\x40\x2e\x17\xbd\x62\x3b\x8b\xe1\x41\x14\x00\x03\x16\xf1\x6f\x0c\x27\xa3\xf1\xaf\x5a\xfb\xce\xf1\xfb\xb9\x20\xc0\xc9\xdb\xae\xc1\x51\xd5\xaa\x57\x75\x30\xbc\x3a\xe2\x65\x34\x40\x82\x02\x4f\x06\x87\x93\x49\xdf\x4a\xae\x54\x31\x4d\x99\x54\x85\x7b\xd5\x59\x7e\xe7\x2b\x2c\xe1\xf6\x87\xdb\x5b\x78\x06\xe7\x1a\x1d\x34\xe2\x0d\x56\x10\x50\x55\x2b\xef\xec\x65\x09\x67\x84\xb3\x77\xcf\x19\x76\x08\x6a\x67\x51\xf0\xd0\x75\xe3\xab\x9b\x5e\xe1\x33\xf8\x67\x6d\x08\x0c\x81\x02\x6e\xda\x3d\x41\x47\x58\xc1\xde\x07\x38\xa0\xc3\xa0\xd8\xb8\x03\x7c\xfa\xf4\x0f\x38\xe2\x85\x0a\x78\xe3\xe0\xed\x9f\x08\x7e\xda\xc2\xa6\xd8\xdc\x2e\x47\x2d\x83\xed\x14\x02\x81\x0a\x98\xfb\x41\x5e\x5c\x71\x88\x15\x28\x20\x6c\x95\x14\x45\x0f\x14\x9c\x71\x54\xa3\x95\x83\x73\x30\x2c\x8e\x16\x8f\xe3\x77\x40\x37\x82\x81\x4d\xcb\x97\x57\x26\xe4\x20\x36\x58\x99\xae\x29\xe1\x1d\x36\x3e\x5c\xf2\x38\x11\xf6\xde\x5a\x7f\x96\x88\x7a\xd3\x86\x62\xa8\x1d\xc9\x99\x02\xdd\x11\xfb\xc6\x08\x02\x47\xe7\xcf\xee\xbf\xb5\x27\xa6\x51\xc5\xde\x58\x5c\xc2\xb9\x36\xba\x86\x8b\xef\xe0\x6c\xac\x4d\x41\xb1\x87\xca\x83\xd9\xc7\x63\xb9\x24\x7f\x04\xf0\x67\x27\x6e\x8f\x0a\x02\xb6\x1e\x82\xe2\x1a\x03\x70\xad\x5c\x6f\xf8\x60\xb8\xee\x76\xe0\xe5\x10\xc1\x9a\x23\x16\xf0\x1f\xdf\x3d\xb7\x16\x94\x25\x3f\x98\x98\x83\x0d\x86\xc1\x38\xf6\xf1\x8e\xf6\x8e\x95\x71\x18\x96\xb0\x43\xeb\xcf\x05\x7c\xc2\x09\xd5\x9a\xb9\xa5\x72\xbd\x4e\x76\x0a\xed\x9b\xf5\x19\xd5\x09\xcf\x3e\x1c\x69\x2d\x95\xb6\xde\x59\xbf\x5b\x37\x8a\x18\xc3\x9a\x0c\xe3\x9a\x58\xb9\x4a\x59\xef\x70\x45\xc8\x5d\x5b\x34\xd5\xb3\xe8\xed\x4a\xad\xda\x60\x4e\x8a\x31\x96\xa7\x04\x3b\x1a\x1a\x52\x45\x54\xaf\xb4\x77\x7b\x73\x18\x3f\x01\xa4\x83\x77\xaa\x2d\xb3\xc3\xfc\x9d\xad\xb2\x6b\xdf\x9a\xb6\xe2\xd8\xed\x70\x9d\x94\x4c\xd5\xf9\xd5\x94\x9d\x0d\xd5\x72\x52\xab\x13\x82\x82\xca\xec\xf7\x18\x84\x19\x07\x0d\xfd\xa3\x8b\xde\x52\xab\x74\xca\x50\x52\x97\xe7\x48\xb8\xe7\x64\x2a\x1c\xb2\xb2\x37\x87\x46\xb5\x93\x23\x86\x6b\x50\x0e\xd0\x71\xb8\xc4\x18\x7e\x4d\x42\xbf\x2e\x41\xb9\x0a\x3a\xa7\x7d\x23\x94\x1c\xef\xa7\x68\xdf\xc5\x6c\x2b\x57\x8d\x5a\xd0\x9d\xa2\x06\x83\xd4\xa7\xfb\x2a\x03\x02\xc3\x37\x64\x20\xbb\xf6\xd5\x0c\x44\xa2\x60\x0f\xa6\x11\x1a\x85\xd7\xf7\xaf\x23\x47\xc0\x77\x12\x16\x99\x83\x33\x6e\x32\x2e\xc1\x9d\x30\x98\xbd\xd1\x91\xcf\xa1\xed\x42\xeb\x09\xe9\xfb\xdf\x01\xe4\xa8\x25\xb1\x4b\x42\x51\x00\x12\x7b\xbf\x03\x38\x50\xe1\x30\xbd\xe2\x27\x10\x3b\xb4\x07\xa1\x17\xca\xa0\x99\x33\xf4\xb3\x27\x38\xfa\xfa\xde\x23\x1c\x3d\xc0\x39\x3e\xd4\xab\xf6\x90\x35\x90\x1e\xf5\x80\x91\x46\x9d\x87\x45\x29\x3d\x92\x78\x01\xa6\x51\x07\x4c\xd5\x2f\x17\x0a\xf8\xd9\xb8\x2a\xc6\xdc\x08\xeb\x04\xd4\x53\xd5\x26\xc6\xb1\xa8\x08\x85\x5b\xe2\x55\x49\x82\x0c\x03\xa0\x78\xa4\x05\xe1\x84\xca\xeb\x23\x86\x48\x0d\xe1\x8a\x1c\x58\x8d\xf0\x0d\xb9\x94\x91\x40\xe9\x54\xe6\xac\x0e\x20\xde\x16\xa3\x4c\x34\x55\x42\xaf\xd4\xf8\xa8\x46\x57\xf1\x9f\x72\x53\x6c\xee\x8a\x17\x73\xd9\xfb\xce\xda\x7b\x6f\x8d\xbe\x94\xf0\x66\xff\xde\xf3\x7d\x40\xca\x23\x09\x48\xbe\x0b\x1a\x29\xa7\xfa\x80\xff\xeb\x90\x78\x76\x06\xa0\xdb\xae\x84\x3f\xdc\x36\xb3\xc3\x26\x76\x83\x12\xfe\xf8\xc3\x3b\x33\x4d\x12\x3e\xe4\x97\x57\x53\x76\xee\xe3\x54\x71\x77\x7b\x27\xcd\xd5\xb8\xbd\x0f\x4d\x2c\x5b\x65\x47\xe9\xac\xc6\x66\x3a\x1e\x6f\xf6\x90\x48\xfb\x5e\x71\x5d\xc2\x1a\x59\x47\x2c\xaa\x35\x51\x2d\x53\x8b\x4f\x73\x14\x58\xdf\x3f\x8f\x83\x39\xa1\x03\xe3\x12\x3c\xcf\x29\xdd\x21\xaa\xd7\xb3\x57\x9d\x50\x50\xd5\x07\x67\x2f\x25\x70\xe8\x50\xb4\x49\x47\x8f\x0f\x6a\xd7\xf3\x90\x54\x40\x8b\x61\xef\x83\x46\x51\x9a\x5a\xb8\x74\xf0\xa7\x1c\xcf\xbb\xec\xdc\xf7\x93\x0a\xbd\xef\x49\xec\xdb\xdc\xcf\xca\xe9\x8d\xd3\xb6\x8b\x0f\x5d\x06\x91\xc4\xc7\x03\x09\xa4\x4e\xf7\x95\xc6\x3c\xb4\xe6\x1f\xe5\xea\x83\xa6\x39\x92\x01\x54\xa8\xad\x0a\x32\x80\xec\xfc\x29\xab\xd5\x2f\x74\xad\xf4\x9a\xf3\xe0\x83\xf7\xbc\x2e\x88\xea\x27\x03\x50\x6e\x66\x75\x31\x31\xea\x22\x59\x5e\x0e\x22\x99\x06\x74\x27\x13\xbc\x8b\xfc\x95\x5a\xc3\xe2\xed\xe7\xbf\xfd\xfd\xe5\x87\xf7\x3f\xbf\x79\xbd\x48\x8c\xb5\x14\x3c\xfc\x09\x43\x98\xb7\x97\x4c\x4d\x64\xe4\xdd\x25\x91\x3f\xdb\xc7\x62\xbc\xea\x0b\xd7\x31\x4e\xc5\x29\xc2\x4f\x06\x2a\x14\x2d\x63\xf4\x60\x4d\x18\x25\xeb\x9c\xbd\x77\x31\x27\x99\x8a\x87\xfd\x37\x4f\x7a\x6c\xbe\xc3\x20\xa9\x1c\x28\xcb\x18\x9c\x0c\x8a\x57\x1e\xef\x83\x6f\xa4\x2c\x86\x06\xbb\x04\x45\x52\x6e\x7d\x13\x10\x18\xac\xd7\x47\xba\x4e\x36\xba\x53\xf9\x08\x2e\x13\xdc\x33\x5c\x4e\xca\x76\x78\x85\xc9\xd7\x8a\xf8\x61\x0d\x0c\x2d\xe2\x0b\x15\x20\x1d\x6a\xde\x99\xbe\xd0\x9b\x9e\xa8\x4b\x91\x4a\xcd\x78\x26\x37\xe7\x87\xc9\x69\x31\x59\xce\x62\x48\x69\x48\x0b\x07\x56\xc2\x99\x5a\xe9\x1a\x2b\x41\x36\x4f\xed\x38\x04\x49\x12\x05\x96\x65\xa6\xc5\x87\x7e\xca\xc9\x2e\xf4\x0b\x53\xbc\xb8\x8c\x46\x64\xd0\xa7\xae\x6d\xed\x45\x80\xa0\x1c\x8a\x69\xd6\xe0\xb3\x17\x2f\x3b\x49\x69\x2c\xb8\xb8\xdd\xc5\x3c\x40\xed\xcf\x71\x99\xf1\xce\xa1\xe6\x38\x87\xf0\x1c\xba\xd5\x6a\x0c\x20\x4e\xa9\x62\x7c\x3b\x1e\x15\x7d\x8b\x2e\xe8\xa4\x0b\x6d\x3b\x99\x7c\x0b\xe1\x2f\x9b\x43\xf2\x99\xd2\x53\x9b\xa0\x78\x99\x44\xdf\xdc\xcf\x82\x92\x57\x47\xc8\x71\x59\x9a\x27\x76\xf2\x61\x90\x97\x95\x94\x83\x48\xc6\xf5\x25\x63\xe0\xdc\xe3\x5e\x7a\x7b\x33\x9b\x09\x0c\x41\xd3\x51\x5c\xe7\x22\x7a\x06\xab\x54\x4d\xbb\xc8\xeb\xb1\x1b\xc7\x2d\xee\xbb\x61\x35\xfa\x3e\xf7\x65\x78\x5b\xa9\x0a\x65\x88\xc8\x96\xb9\x99\x23\xc2\x85\x89\xdf\x57\x95\x09\xdb\x2b\xd6\xcf\xdd\xfa\xd8\xcf\x02\x3e\x40\xc0\xc6\x9f\x12\x64\x53\x1a\x3f\x7f\xfc\xa5\x98\x29\x97\x1e\xd3\x05\xbb\x3d\x18\xfe\xcb\xb4\x93\x94\x0f\xc6\x8e\xd5\x01\x79\x45\xac\x02\x63\x75\x75\x7d\x17\x94\xd3\xf5\x36\x6d\x2c\x99\x2f\xe6\x91\x66\x72\x56\x2e\x16\x48\x40\xc1\x5d\xa7\x11\xb1\x51\xce\xec\x65\x78\x90\x12\x22\x53\x61\x48\xdc\xf9\x60\x0c\x8b\xfb\x95\x27\x84\xce\x55\x18\x1e\x04\x16\xd0\x2a\x36\x27\x84\x56\x71\x4d\x43\x02\x0e\x86\xe3\xa2\x47\x86\x65\x01\x9d\x97\xa4\xf8\x2e\xd2\x5b\xea\x76\x95\x09\x9b\x65\xfa\xf7\xc5\xe3\x5c\x82\x52\x7e\x67\x2f\x5e\xa0\x8b\xfb\xbb\x28\x17\x92\x33\xfc\x60\xc4\xce\x0d\xf4\x74\xd1\x93\xc1\xf6\x0b\xec\x30\xdc\xe8\x75\xc9\xad\xed\x9f\x8f\x78\x01\x53\xfd\x34\x8a\x7d\xa1\x03\x64\x5e\x89\x0a\xc5\x5d\xc0\xd9\x9c\xff\x88\xad\xf8\xf9\xb2\x1a\xe5\xe9\xe9\xd8\x1d\xfe\xc6\x03\x00\xd9\x4b\x57\x0e\x16\x5d\x4b\x1c\x50\x35\x8b\xe1\x1d\x66\x4a\xbe\xc3\xe2\x50\x2c\xe1\xdf\x52\x4f\xf0\xd2\xfa\xae\xfa\xbe\x88\x6b\x0c\xfb\xa3\x8c\x25\x04\xad\x0a\x6c\x74\x67\x55\x80\x7e\x83\xee\xb5\x3c\xa4\x90\xde\xea\xf6\x4c\x32\x29\x6b\xd1\x55\xc4\x3a\x2d\x52\xa1\xaa\xd6\xac\x1f\x94\x8c\x5c\x8b\x86\xb6\x6a\xa7\x37\x2f\xee\xae\xff\x9f\x07\xfc\x09\xc3\xe9\x91\x1f\xa7\xa4\x9b\x4e\xfc\x29\x59\xfb\x31\x7f\xc8\xea\x28\x04\x10\x12\x99\x20\x67\xbf\x78\x3d\xcf\x7e\x34\xcb\x7e\xfd\x92\x10\xe3\x9a\x16\x3b\xda\xfc\x39\x5a\x43\x8c\x6e\xd5\xbb\xb0\x2d\xef\x6e\xef\x36\xd3\xfa\xf7\xa1\x4d\x83\x2f\xbc\x7a\xff\x69\xe0\x38\x5a\xf6\xad\xb7\x0b\x3d\xe3\x81\xab\x3c\x13\xf8\x28\x0c\x8d\xba\xc4\x89\xdd\x9e\xa6\xdd\xcd\x91\xf5\xfe\xd8\xb5\x60\x88\x3a\x24\xf0\x0e\xc8\x37\x08\x6f\xbb\x1d\x06\x87\x8c\x04\xf1\x87\x06\x9a\x56\xb3\xca\xd1\xb0\x14\x2c\xde\x7b\x87\x8b\xfc\xcb\xcb\xe8\x40\xbe\x9c\x25\xe3\x34\xdf\xd7\x86\x16\x1a\xfd\x9b\x7d\x19\xbb\xfb\x62\xb3\xb8\xf9\x7f\x00\x00\x00\xff\xff\xe2\xd9\xda\x0a\x2b\x15\x00\x00")
+
+func deployFluxDeploymentYamlBytes() ([]byte, error) {
+	return bindataRead(
+		_deployFluxDeploymentYaml,
+		"deploy/flux-deployment.yaml",
+	)
+}
+
+func deployFluxDeploymentYaml() (*asset, error) {
+	bytes, err := deployFluxDeploymentYamlBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "deploy/flux-deployment.yaml", size: 5419, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _deployFluxSecretYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x04\xc0\xbb\x0d\x02\x31\x0c\x06\xe0\xde\x53\x78\x01\x17\xb4\x5e\x82\x02\x89\xde\x22\x3f\xc8\x22\x0f\x13\x9c\xd3\x65\xfb\xfb\x44\x84\x2c\xfc\x89\xf9\xf7\xd1\x95\x8f\x1b\x7d\xbd\x17\xe5\x07\x5e\x13\x49\x0d\x69\xc5\xd2\x94\x98\xbb\x35\x28\xbf\xeb\x3a\xe5\xe3\x29\x05\x51\xc7\xa6\xdc\x01\xe5\x7b\xd8\x6f\x81\xae\x00\x00\x00\xff\xff\x86\x01\x49\x4e\x4f\x00\x00\x00")
+
+func deployFluxSecretYamlBytes() ([]byte, error) {
+	return bindataRead(
+		_deployFluxSecretYaml,
+		"deploy/flux-secret.yaml",
+	)
+}
+
+func deployFluxSecretYaml() (*asset, error) {
+	bytes, err := deployFluxSecretYamlBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "deploy/flux-secret.yaml", size: 79, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _deployMemcacheDepYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\x4f\x6f\xd3\x40\x10\xc5\xef\xfe\x14\x4f\xca\x15\x07\xb9\x52\x2e\xbe\x21\x0a\xa8\x12\xa0\x5c\xca\x7d\xb2\x9e\x38\x2b\x76\x77\x96\x9d\x71\x88\xf9\xf4\xc8\x49\xe3\x38\x6d\xe7\x64\xed\x7b\xbf\xf9\xe7\xa9\xeb\xba\x5a\x21\x72\x74\xe4\x0e\xdc\xa1\xe3\x1c\x64\x8c\x9c\x0c\x83\x72\x87\xdd\x88\xaf\x61\x38\xc1\x04\x67\x47\xb5\x82\x93\x64\xe4\x13\x17\xf8\x48\x3d\x23\xb2\x51\x47\x46\xeb\x8a\xb2\xff\xc5\x45\xbd\xa4\x16\x94\xb3\x7e\x3c\x36\xd5\x6f\x9f\xba\x16\x8f\x73\xda\xea\x6a\x6f\x2b\x20\x51\xe4\xf6\x56\xbd\xd2\xcc\x6e\x7a\x2f\x9c\x83\x77\xa4\x2d\x9a\x0a\x50\x0e\xec\x4c\xca\xa4\x00\x91\xcc\x1d\xbe\xd3\x8e\x83\x5e\x1e\xde\xa6\x01\x8c\x63\x0e\x64\xfc\x82\x2c\x4a\x4e\x11\xee\xe8\xf7\x78\xe0\xda\xca\x14\xf3\xc4\x33\x53\xbf\xcb\x4c\x71\xde\xc9\x42\x68\x9b\xf5\x66\xdd\x6c\xee\xf5\xed\x10\xc2\x56\x82\x77\x63\x8b\xa7\xfd\x4f\xb1\x6d\x61\x9d\x96\x73\x75\x51\xe9\x17\xfd\xd5\xa8\x23\x36\xcd\x03\x80\x15\x7e\xd0\xc9\xc7\x21\x4e\x15\xa4\x8c\xd3\x8f\x19\x94\x3f\xc0\x27\x44\xee\x69\x37\x1a\xeb\x12\x7c\xc2\x26\xe2\x0e\x54\xff\x8f\xb1\x97\x02\x49\x0c\x6f\x1c\x97\xf6\x8c\xa6\x79\x68\x1a\xac\xf0\xc8\x7b\x1a\x82\x21\x4b\xb9\xf5\xb5\x9a\x3c\xc7\xe3\xe5\xf3\x39\x39\x89\xe7\x53\x31\x41\xcf\x86\x20\xbd\x42\xf6\x60\x72\x07\x14\xfe\x33\xb0\x1a\x28\x75\x28\xac\x59\x92\xf2\x7a\x4e\x34\x65\xbd\x9b\xf0\xb2\x4f\x17\x3c\x27\xbb\x0d\xb0\xd8\xfd\x56\x8a\xb5\x97\xee\x66\x59\xd9\x0d\xc5\xdb\xf8\x59\x92\xf1\xc9\xda\x05\x57\x86\xf4\x49\x9f\x95\xcb\x6b\xe6\x45\xfa\x56\x64\xc8\x6f\x35\x0a\x41\xfe\x6e\x8b\x3f\xfa\xc0\x3d\x7f\x51\x47\x81\xec\x7c\xd0\x7b\x0a\xca\xd5\xff\x00\x00\x00\xff\xff\x55\xe1\x76\x95\x30\x03\x00\x00")
+
+func deployMemcacheDepYamlBytes() ([]byte, error) {
+	return bindataRead(
+		_deployMemcacheDepYaml,
+		"deploy/memcache-dep.yaml",
+	)
+}
+
+func deployMemcacheDepYaml() (*asset, error) {
+	bytes, err := deployMemcacheDepYamlBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "deploy/memcache-dep.yaml", size: 816, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _deployMemcacheSvcYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8b\x3d\xaa\x83\x31\x0c\x04\x7b\x9d\x62\x2f\xe0\x42\xaf\xd4\x35\x1e\xa4\x17\xf2\x42\x4c\xe2\x1f\x6c\xf3\x9d\x3f\x38\xe9\x92\xad\x96\x61\x26\xa5\x24\x3e\xca\x8d\x73\x95\xde\x0c\x97\xca\xa3\xb4\x6c\xf8\xe7\xbc\x4a\x50\x2a\xb7\x67\xdf\x6e\x02\x34\xaf\x34\x54\xd6\xf0\xb8\x33\xcb\x1a\x8c\xc3\x47\x9f\x7b\x9d\x03\xa4\x1f\x09\xef\x1d\xc5\xa0\xfa\xa7\x2a\xc0\xe2\x93\xb1\xfb\xfc\x34\x5f\xc5\x2b\x00\x00\xff\xff\xa8\x56\xba\x05\x93\x00\x00\x00")
+
+func deployMemcacheSvcYamlBytes() ([]byte, error) {
+	return bindataRead(
+		_deployMemcacheSvcYaml,
+		"deploy/memcache-svc.yaml",
+	)
+}
+
+func deployMemcacheSvcYaml() (*asset, error) {
+	bytes, err := deployMemcacheSvcYamlBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "deploy/memcache-svc.yaml", size: 147, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+// Asset loads and returns the asset for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func Asset(name string) ([]byte, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+		}
+		return a.bytes, nil
+	}
+	return nil, fmt.Errorf("Asset %s not found", name)
+}
+
+// MustAsset is like Asset but panics when Asset would return an error.
+// It simplifies safe initialization of global variables.
+func MustAsset(name string) []byte {
+	a, err := Asset(name)
+	if err != nil {
+		panic("asset: Asset(" + name + "): " + err.Error())
+	}
+
+	return a
+}
+
+// AssetInfo loads and returns the asset info for the given name.
+// It returns an error if the asset could not be found or
+// could not be loaded.
+func AssetInfo(name string) (os.FileInfo, error) {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	if f, ok := _bindata[cannonicalName]; ok {
+		a, err := f()
+		if err != nil {
+			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+		}
+		return a.info, nil
+	}
+	return nil, fmt.Errorf("AssetInfo %s not found", name)
+}
+
+// AssetNames returns the names of the assets.
+func AssetNames() []string {
+	names := make([]string, 0, len(_bindata))
+	for name := range _bindata {
+		names = append(names, name)
+	}
+	return names
+}
+
+// _bindata is a table, holding each asset generator, mapped to its name.
+var _bindata = map[string]func() (*asset, error){
+	"deploy/flux-account.yaml": deployFluxAccountYaml,
+	"deploy/flux-deployment.yaml": deployFluxDeploymentYaml,
+	"deploy/flux-secret.yaml": deployFluxSecretYaml,
+	"deploy/memcache-dep.yaml": deployMemcacheDepYaml,
+	"deploy/memcache-svc.yaml": deployMemcacheSvcYaml,
+}
+
+// AssetDir returns the file names below a certain
+// directory embedded in the file by go-bindata.
+// For example if you run go-bindata on data/... and data contains the
+// following hierarchy:
+//     data/
+//       foo.txt
+//       img/
+//         a.png
+//         b.png
+// then AssetDir("data") would return []string{"foo.txt", "img"}
+// AssetDir("data/img") would return []string{"a.png", "b.png"}
+// AssetDir("foo.txt") and AssetDir("notexist") would return an error
+// AssetDir("") will return []string{"data"}.
+func AssetDir(name string) ([]string, error) {
+	node := _bintree
+	if len(name) != 0 {
+		cannonicalName := strings.Replace(name, "\\", "/", -1)
+		pathList := strings.Split(cannonicalName, "/")
+		for _, p := range pathList {
+			node = node.Children[p]
+			if node == nil {
+				return nil, fmt.Errorf("Asset %s not found", name)
+			}
+		}
+	}
+	if node.Func != nil {
+		return nil, fmt.Errorf("Asset %s not found", name)
+	}
+	rv := make([]string, 0, len(node.Children))
+	for childName := range node.Children {
+		rv = append(rv, childName)
+	}
+	return rv, nil
+}
+
+type bintree struct {
+	Func     func() (*asset, error)
+	Children map[string]*bintree
+}
+var _bintree = &bintree{nil, map[string]*bintree{
+	"deploy": &bintree{nil, map[string]*bintree{
+		"flux-account.yaml": &bintree{deployFluxAccountYaml, map[string]*bintree{}},
+		"flux-deployment.yaml": &bintree{deployFluxDeploymentYaml, map[string]*bintree{}},
+		"flux-secret.yaml": &bintree{deployFluxSecretYaml, map[string]*bintree{}},
+		"memcache-dep.yaml": &bintree{deployMemcacheDepYaml, map[string]*bintree{}},
+		"memcache-svc.yaml": &bintree{deployMemcacheSvcYaml, map[string]*bintree{}},
+	}},
+}}
+
+// RestoreAsset restores an asset under the given directory
+func RestoreAsset(dir, name string) error {
+	data, err := Asset(name)
+	if err != nil {
+		return err
+	}
+	info, err := AssetInfo(name)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
+	if err != nil {
+		return err
+	}
+	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// RestoreAssets restores an asset under the given directory recursively
+func RestoreAssets(dir, name string) error {
+	children, err := AssetDir(name)
+	// File
+	if err != nil {
+		return RestoreAsset(dir, name)
+	}
+	// Dir
+	for _, child := range children {
+		err = RestoreAssets(dir, filepath.Join(name, child))
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func _filePath(dir, name string) string {
+	cannonicalName := strings.Replace(name, "\\", "/", -1)
+	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
+}
+
diff --git a/go.mod b/go.mod
index 338ea19a9..68d9d49e9 100644
--- a/go.mod
+++ b/go.mod
@@ -37,6 +37,7 @@ require (
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible
 	github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
diff --git a/go.sum b/go.sum
index d3826d4ee..526019540 100644
--- a/go.sum
+++ b/go.sum
@@ -138,6 +138,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible h1:eX6cWzw+KSwhN430wwbdWPgqnlbnK5ux76/q5ko+Qu8=
+github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/justinbarrick/go-k8s-portforward v1.0.2/go.mod h1:klMOboLnC1/UlkyJnYFjcMcbOtwAcKop+LkIZ4r428o=
 github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d h1:xQ/ZtcWCKzWg5QbOhq6RFPvevl+IE580Vm0Vgxuw3xs=
diff --git a/tools.go b/tools.go
index f358383b5..b9d7206fe 100644
--- a/tools.go
+++ b/tools.go
@@ -7,4 +7,5 @@ package flux
 
 import (
 	_ "k8s.io/code-generator"
+	_ "github.com/jteeuwen/go-bindata"
 )

From 10c797de609bc0a3afbaf19fd910c33b5498054e Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Mon, 22 Jul 2019 22:17:05 +0200
Subject: [PATCH 063/158] WIP: Add fluxctl setup

---
 cmd/fluxctl/root_cmd.go  |   5 +-
 cmd/fluxctl/setup_cmd.go | 101 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 cmd/fluxctl/setup_cmd.go

diff --git a/cmd/fluxctl/root_cmd.go b/cmd/fluxctl/root_cmd.go
index 50672ba40..803c16a6c 100644
--- a/cmd/fluxctl/root_cmd.go
+++ b/cmd/fluxctl/root_cmd.go
@@ -89,15 +89,18 @@ func (opts *rootOpts) Command() *cobra.Command {
 		newSave(opts).Command(),
 		newIdentity(opts).Command(),
 		newSync(opts).Command(),
+		newSetup().Command(),
 	)
 
 	return cmd
 }
 
 func (opts *rootOpts) PersistentPreRunE(cmd *cobra.Command, _ []string) error {
-	// skip port forward for version command
+	// skip port forward for certain commands
 	switch cmd.Use {
 	case "version":
+		fallthrough
+	case "setup":
 		return nil
 	}
 
diff --git a/cmd/fluxctl/setup_cmd.go b/cmd/fluxctl/setup_cmd.go
new file mode 100644
index 000000000..3a3c9c3fb
--- /dev/null
+++ b/cmd/fluxctl/setup_cmd.go
@@ -0,0 +1,101 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/spf13/cobra"
+
+	"github.com/weaveworks/flux/git"
+)
+
+type setupOpts struct {
+	gitURL             string
+	gitBranch          string
+	gitFluxPath        string
+	gitLabel           string
+	timeout            time.Duration
+	namespace          string
+	additionalFluxArgs []string
+	amend              bool
+}
+
+func newSetup() *setupOpts {
+	return &setupOpts{}
+}
+
+func (opts *setupOpts) Command() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "setup",
+		Short: "Bootstrap Flux, installing it in the cluster and initializing its manifests in the Git repository",
+		RunE:  opts.RunE,
+	}
+	cmd.Flags().StringVarP(&opts.gitURL, "git-url", "r", "",
+		"URL of the Git repository to be used by Flux, e.g. git@github.com:<your username>/flux-get-started")
+	cmd.Flags().StringVarP(&opts.gitBranch, "git-branch", "b", "master",
+		"Git branch to be used by Flux")
+	cmd.Flags().StringVarP(&opts.gitLabel, "git-label", "l", "flux",
+		"Git label to keep track of FLux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
+	cmd.Flags().StringVarP(&opts.gitFluxPath, "git-flux-subdir", "p", "flux/",
+		"Directory within the Git repository where to commit the Flux manifests")
+	cmd.Flags().DurationVarP(&opts.timeout, "timeout", "t", 10*time.Second,
+		"Timeout duration for I/O operations")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "flux",
+		"Cluster namespace where to install flux")
+	cmd.Flags().BoolVarP(&opts.amend, "amend", "a", false,
+		"Stop for amending the Flux manifests before pushing them to the Git repository")
+	cmd.Flags().StringSliceVarP(&opts.additionalFluxArgs, "extra-flux-args", "e", []string{},
+		"Additional arguments for Flux as CSVs, e.g. --extra-flux-arg='--manifest-generation=true,--sync-garbage-collection=true'")
+	return cmd
+}
+
+func (opts *setupOpts) RunE(cmd *cobra.Command, args []string) error {
+	//0. Read and patch embedded deploy/* manifests with what was passed to ops
+
+	// TODO. BTW, it's probably easier to embed chart/flux/* and use `helm template` as a library instead
+
+	//1. Clone repository. In the future we could optionally create the repository automatically for the most
+	//   popular git providers (e.g. GitHub OAuth).
+
+	if opts.gitURL == "" {
+		fmt.Errorf("no Git repository was provided, please provide a repository through --git-url")
+	}
+
+	remote := git.Remote{opts.gitURL}
+	pollInterval := 0 * time.Second // there is no need for polling, We will fetch the repo once, manually
+	repo := git.NewRepo(remote, git.Branch(opts.gitBranch), git.Timeout(opts.timeout), git.PollInterval(pollInterval))
+	checkoutConfig := git.Config{
+		Branch: opts.gitBranch,
+	}
+	ctx := context.Background()
+	cloneCtx, cloneCtxCancel := context.WithTimeout(ctx, opts.timeout)
+	defer cloneCtxCancel()
+	checkout, err := repo.Clone(cloneCtx, checkoutConfig)
+	if err != nil {
+		return fmt.Errorf("cannot clone repository %s: %s", opts.gitURL)
+	}
+	cleanCheckout := true
+	defer func() {
+		if cleanCheckout {
+			checkout.Clean()
+		}
+	}()
+
+	// 2. Write manifests from (0) to the repository's clone working directory
+
+	// 3. If --amend was passed, stop to let the user edit the manifests, by prompting a shell
+
+	// 4. `kubectl apply` the changes to the cluster
+
+	// 5. commit the local changes and push to the remote repository
+
+	// 6. Make sure that the ssh key is added to the repo. At this point we should probably just print the ssh
+	//    key and telling the user to add it manually. In the future we can do this programatically for the most popular
+	//    Git providers.
+
+	// 7. Confirm that Flux is running (for instance by checking that its own manifests have been synced, this can be
+	//    done by checking that the sync annotations have been added)
+
+	return nil
+}

From af923817011b54cd892957d6f2cc32143ad45b59 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 13:05:11 +0200
Subject: [PATCH 064/158] Rename `fluxctl setup` to `fluxctl install`

---
 Makefile                                             |  6 +++---
 .../{setup-assets => install-assets}/bindata.go      |  0
 cmd/fluxctl/{setup_cmd.go => install_cmd.go}         | 12 ++++++------
 cmd/fluxctl/root_cmd.go                              |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename cmd/fluxctl/{setup-assets => install-assets}/bindata.go (100%)
 rename cmd/fluxctl/{setup_cmd.go => install_cmd.go} (93%)

diff --git a/Makefile b/Makefile
index 9939286f7..f2575a4c3 100644
--- a/Makefile
+++ b/Makefile
@@ -120,10 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/setup-assets/bindata.go: deploy/*
-	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg setup-assets -o $@ deploy/
+cmd/fluxctl/install-assets/bindata.go: deploy/*
+	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg install-assets -o $@ deploy/
 
-check-generated: cmd/fluxctl/setup-assets/bindata.go
+check-generated: cmd/fluxctl/install-assets/bindata.go
 	./bin/helm/update_codegen.sh
 	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/deploy-bindata.go
 
diff --git a/cmd/fluxctl/setup-assets/bindata.go b/cmd/fluxctl/install-assets/bindata.go
similarity index 100%
rename from cmd/fluxctl/setup-assets/bindata.go
rename to cmd/fluxctl/install-assets/bindata.go
diff --git a/cmd/fluxctl/setup_cmd.go b/cmd/fluxctl/install_cmd.go
similarity index 93%
rename from cmd/fluxctl/setup_cmd.go
rename to cmd/fluxctl/install_cmd.go
index 3a3c9c3fb..b7a78ed24 100644
--- a/cmd/fluxctl/setup_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -10,7 +10,7 @@ import (
 	"github.com/weaveworks/flux/git"
 )
 
-type setupOpts struct {
+type installOpts struct {
 	gitURL             string
 	gitBranch          string
 	gitFluxPath        string
@@ -21,13 +21,13 @@ type setupOpts struct {
 	amend              bool
 }
 
-func newSetup() *setupOpts {
-	return &setupOpts{}
+func newInstall() *installOpts {
+	return &installOpts{}
 }
 
-func (opts *setupOpts) Command() *cobra.Command {
+func (opts *installOpts) Command() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "setup",
+		Use:   "install",
 		Short: "Bootstrap Flux, installing it in the cluster and initializing its manifests in the Git repository",
 		RunE:  opts.RunE,
 	}
@@ -50,7 +50,7 @@ func (opts *setupOpts) Command() *cobra.Command {
 	return cmd
 }
 
-func (opts *setupOpts) RunE(cmd *cobra.Command, args []string) error {
+func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	//0. Read and patch embedded deploy/* manifests with what was passed to ops
 
 	// TODO. BTW, it's probably easier to embed chart/flux/* and use `helm template` as a library instead
diff --git a/cmd/fluxctl/root_cmd.go b/cmd/fluxctl/root_cmd.go
index 803c16a6c..1f4eea652 100644
--- a/cmd/fluxctl/root_cmd.go
+++ b/cmd/fluxctl/root_cmd.go
@@ -89,7 +89,7 @@ func (opts *rootOpts) Command() *cobra.Command {
 		newSave(opts).Command(),
 		newIdentity(opts).Command(),
 		newSync(opts).Command(),
-		newSetup().Command(),
+		newInstall().Command(),
 	)
 
 	return cmd
@@ -100,7 +100,7 @@ func (opts *rootOpts) PersistentPreRunE(cmd *cobra.Command, _ []string) error {
 	switch cmd.Use {
 	case "version":
 		fallthrough
-	case "setup":
+	case "install":
 		return nil
 	}
 

From a01733eb932a2155173c9d9b27f80214f4f11e72 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 13:25:05 +0200
Subject: [PATCH 065/158] Move deploy/*.yaml to
 cmd/fluxctl/install-assets/*.yaml.tmpl

---
 Makefile                                      |   4 +-
 cmd/fluxctl/install-assets/bindata.go         | 329 ------------------
 .../install-assets/flux-account.yaml.tmpl     |   0
 .../install-assets/flux-deployment.yaml.tmpl  |   0
 .../install-assets/flux-secret.yaml.tmpl      |   0
 .../install-assets/memcache-dep.yaml.tmpl     |   0
 .../install-assets/memcache-svc.yaml.tmpl     |   0
 tools.go                                      |   2 +-
 8 files changed, 3 insertions(+), 332 deletions(-)
 delete mode 100644 cmd/fluxctl/install-assets/bindata.go
 rename deploy/flux-account.yaml => cmd/fluxctl/install-assets/flux-account.yaml.tmpl (100%)
 rename deploy/flux-deployment.yaml => cmd/fluxctl/install-assets/flux-deployment.yaml.tmpl (100%)
 rename deploy/flux-secret.yaml => cmd/fluxctl/install-assets/flux-secret.yaml.tmpl (100%)
 rename deploy/memcache-dep.yaml => cmd/fluxctl/install-assets/memcache-dep.yaml.tmpl (100%)
 rename deploy/memcache-svc.yaml => cmd/fluxctl/install-assets/memcache-svc.yaml.tmpl (100%)

diff --git a/Makefile b/Makefile
index f2575a4c3..e07a24982 100644
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,8 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/install-assets/bindata.go: deploy/*
-	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg install-assets -o $@ deploy/
+cmd/fluxctl/install-assets/bindata.go: cmd/fluxctl/install-assets/*.tmpl
+	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg install-assets -o $@ $^
 
 check-generated: cmd/fluxctl/install-assets/bindata.go
 	./bin/helm/update_codegen.sh
diff --git a/cmd/fluxctl/install-assets/bindata.go b/cmd/fluxctl/install-assets/bindata.go
deleted file mode 100644
index 2aa6cc8c9..000000000
--- a/cmd/fluxctl/install-assets/bindata.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Code generated by go-bindata.
-// sources:
-// deploy/flux-account.yaml
-// deploy/flux-deployment.yaml
-// deploy/flux-secret.yaml
-// deploy/memcache-dep.yaml
-// deploy/memcache-svc.yaml
-// DO NOT EDIT!
-
-package setup-assets
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func bindataRead(data []byte, name string) ([]byte, error) {
-	gz, err := gzip.NewReader(bytes.NewBuffer(data))
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-
-	var buf bytes.Buffer
-	_, err = io.Copy(&buf, gz)
-	clErr := gz.Close()
-
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-	if clErr != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-type asset struct {
-	bytes []byte
-	info  os.FileInfo
-}
-
-type bindataFileInfo struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-}
-
-func (fi bindataFileInfo) Name() string {
-	return fi.name
-}
-func (fi bindataFileInfo) Size() int64 {
-	return fi.size
-}
-func (fi bindataFileInfo) Mode() os.FileMode {
-	return fi.mode
-}
-func (fi bindataFileInfo) ModTime() time.Time {
-	return fi.modTime
-}
-func (fi bindataFileInfo) IsDir() bool {
-	return false
-}
-func (fi bindataFileInfo) Sys() interface{} {
-	return nil
-}
-
-var _deployFluxAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x51\xbd\x6e\xf3\x30\x0c\xdc\xf5\x14\x04\x32\xe4\xfb\x8a\xd8\x45\xb6\xc2\x5b\x92\xa1\x43\x3b\xb9\x3f\x4b\xd1\x81\x92\xe8\x46\x8d\x22\x1a\x94\xe4\xfe\x3c\x7d\xe1\x38\x01\x62\xa4\x2d\x10\xa0\x1b\x79\x38\xf2\xee\xc8\xa2\x28\xd4\x04\xee\xd7\x04\x91\xa4\x73\x86\x00\x8d\xe1\x1c\xd2\x0c\x8c\xcf\x31\x91\x80\xb0\xa7\x38\x03\x0c\x76\x04\x81\x76\xc1\xba\xf0\x02\x28\xa4\x26\xc0\xc1\x7f\x40\x20\xb2\x64\xa1\x61\x81\x9b\xac\x49\x02\x25\x8a\xf0\xe6\xd2\x7a\x37\x52\x68\x8c\x64\x7b\x05\x8a\x11\x0c\x87\x24\xec\xe1\x5f\xbd\x5c\xac\xfe\x97\x0a\x5b\xf7\x48\x12\x1d\x87\x0a\xba\xb9\xda\xb8\x60\x2b\xb8\x1b\x5c\x2d\x06\x53\x6a\x4b\x09\x2d\x26\xac\x14\x80\x47\x4d\x3e\xf6\x15\x40\xc0\x2d\x55\xd0\xf8\xfc\xae\x46\x4d\x1f\xef\x78\xaf\x68\x34\x25\xe6\xb4\x66\x71\x9f\x98\x1c\x87\x72\x73\x15\x4b\xc7\x97\xdd\x5c\x53\xc2\x83\xec\x6a\x08\x5a\xb3\xa7\xb3\x35\x25\x7b\xda\x51\x0a\xc0\xd6\x5d\x0b\xe7\x36\x56\xf0\x34\xbd\x98\x3e\xef\xe6\x84\x22\x67\x31\x34\x02\x3b\x12\x7d\x04\x14\x10\x38\xd4\x7b\xe2\x43\x7d\xfb\x33\xf7\x0f\x12\x2e\x87\x47\x9e\x1f\x94\x3d\xd5\xd4\xf4\xa4\x43\xd0\x5f\xf4\x15\xc0\xe9\x6d\x47\xfb\x62\xd6\xaf\x64\xd2\xfe\x76\xdf\xfe\xff\xc4\xce\xd0\xc6\x16\x0d\x55\x60\xa9\xc1\xec\x93\xfa\x0a\x00\x00\xff\xff\xb1\x6e\xe4\xd9\xd5\x02\x00\x00")
-
-func deployFluxAccountYamlBytes() ([]byte, error) {
-	return bindataRead(
-		_deployFluxAccountYaml,
-		"deploy/flux-account.yaml",
-	)
-}
-
-func deployFluxAccountYaml() (*asset, error) {
-	bytes, err := deployFluxAccountYamlBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "deploy/flux-account.yaml", size: 725, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _deployFluxDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x9c\x00\xd2\xea\xe4\x4b\x8b\x62\x53\x05\x6d\xed\xc6\x35\x1c\xdb\x07\xbb\x6e\xd1\xa7\x86\xe2\x8e\xb4\x84\xb8\xe4\x96\x33\x2b\x45\xdf\xbe\x18\x72\xff\x70\x4f\x77\x76\xe0\x3c\xc4\x07\xee\x70\xfe\xfc\x66\xf8\x9b\x19\xad\x56\xab\x1b\xd5\x9a\x7f\x61\x20\xe3\x5d\x09\xaa\x6d\x69\x7d\xda\xdc\x1c\x8d\xab\x4a\x78\x85\xad\xf5\x97\x06\x1d\xdf\x34\xc8\xaa\x52\xac\xca\x1b\x00\xa7\x1a\x2c\x61\x6f\xbb\xdf\x6e\xa8\x45\x2d\x47\x01\x5b\x6b\xb4\xa2\x12\x36\x37\x00\x84\x16\x35\xfb\x20\x5f\x00\x1a\xc5\xba\xfe\x45\xed\xd0\x52\x3a\x98\x69\x00\x20\x0e\x8a\xf1\x70\x49\x1f\xf9\xd2\x62\x09\x1f\x51\x07\x54\x8c\x37\x00\x8c\x4d\x6b\x15\x63\xaf\x2c\xf3\x43\xfe\x53\xce\x79\x56\x6c\xbc\x1b\x95\x03\xb4\xc1\x37\xc8\x35\x76\x54\x18\x5f\xb4\x3e\x70\x09\x8b\xbb\xdb\xbb\xcd\x02\x9e\x01\xa3\xb5\x99\x04\xb0\x07\xd2\x41\xb5\x08\xeb\x06\x39\x18\x4d\x80\xae\x6a\xbd\x71\xfc\x9c\x40\x2e\x17\xbd\x62\x3b\x8b\xe1\x41\x14\x00\x03\x16\xf1\x6f\x0c\x27\xa3\xf1\xaf\x5a\xfb\xce\xf1\xfb\xb9\x20\xc0\xc9\xdb\xae\xc1\x51\xd5\xaa\x57\x75\x30\xbc\x3a\xe2\x65\x34\x40\x82\x02\x4f\x06\x87\x93\x49\xdf\x4a\xae\x54\x31\x4d\x99\x54\x85\x7b\xd5\x59\x7e\xe7\x2b\x2c\xe1\xf6\x87\xdb\x5b\x78\x06\xe7\x1a\x1d\x34\xe2\x0d\x56\x10\x50\x55\x2b\xef\xec\x65\x09\x67\x84\xb3\x77\xcf\x19\x76\x08\x6a\x67\x51\xf0\xd0\x75\xe3\xab\x9b\x5e\xe1\x33\xf8\x67\x6d\x08\x0c\x81\x02\x6e\xda\x3d\x41\x47\x58\xc1\xde\x07\x38\xa0\xc3\xa0\xd8\xb8\x03\x7c\xfa\xf4\x0f\x38\xe2\x85\x0a\x78\xe3\xe0\xed\x9f\x08\x7e\xda\xc2\xa6\xd8\xdc\x2e\x47\x2d\x83\xed\x14\x02\x81\x0a\x98\xfb\x41\x5e\x5c\x71\x88\x15\x28\x20\x6c\x95\x14\x45\x0f\x14\x9c\x71\x54\xa3\x95\x83\x73\x30\x2c\x8e\x16\x8f\xe3\x77\x40\x37\x82\x81\x4d\xcb\x97\x57\x26\xe4\x20\x36\x58\x99\xae\x29\xe1\x1d\x36\x3e\x5c\xf2\x38\x11\xf6\xde\x5a\x7f\x96\x88\x7a\xd3\x86\x62\xa8\x1d\xc9\x99\x02\xdd\x11\xfb\xc6\x08\x02\x47\xe7\xcf\xee\xbf\xb5\x27\xa6\x51\xc5\xde\x58\x5c\xc2\xb9\x36\xba\x86\x8b\xef\xe0\x6c\xac\x4d\x41\xb1\x87\xca\x83\xd9\xc7\x63\xb9\x24\x7f\x04\xf0\x67\x27\x6e\x8f\x0a\x02\xb6\x1e\x82\xe2\x1a\x03\x70\xad\x5c\x6f\xf8\x60\xb8\xee\x76\xe0\xe5\x10\xc1\x9a\x23\x16\xf0\x1f\xdf\x3d\xb7\x16\x94\x25\x3f\x98\x98\x83\x0d\x86\xc1\x38\xf6\xf1\x8e\xf6\x8e\x95\x71\x18\x96\xb0\x43\xeb\xcf\x05\x7c\xc2\x09\xd5\x9a\xb9\xa5\x72\xbd\x4e\x76\x0a\xed\x9b\xf5\x19\xd5\x09\xcf\x3e\x1c\x69\x2d\x95\xb6\xde\x59\xbf\x5b\x37\x8a\x18\xc3\x9a\x0c\xe3\x9a\x58\xb9\x4a\x59\xef\x70\x45\xc8\x5d\x5b\x34\xd5\xb3\xe8\xed\x4a\xad\xda\x60\x4e\x8a\x31\x96\xa7\x04\x3b\x1a\x1a\x52\x45\x54\xaf\xb4\x77\x7b\x73\x18\x3f\x01\xa4\x83\x77\xaa\x2d\xb3\xc3\xfc\x9d\xad\xb2\x6b\xdf\x9a\xb6\xe2\xd8\xed\x70\x9d\x94\x4c\xd5\xf9\xd5\x94\x9d\x0d\xd5\x72\x52\xab\x13\x82\x82\xca\xec\xf7\x18\x84\x19\x07\x0d\xfd\xa3\x8b\xde\x52\xab\x74\xca\x50\x52\x97\xe7\x48\xb8\xe7\x64\x2a\x1c\xb2\xb2\x37\x87\x46\xb5\x93\x23\x86\x6b\x50\x0e\xd0\x71\xb8\xc4\x18\x7e\x4d\x42\xbf\x2e\x41\xb9\x0a\x3a\xa7\x7d\x23\x94\x1c\xef\xa7\x68\xdf\xc5\x6c\x2b\x57\x8d\x5a\xd0\x9d\xa2\x06\x83\xd4\xa7\xfb\x2a\x03\x02\xc3\x37\x64\x20\xbb\xf6\xd5\x0c\x44\xa2\x60\x0f\xa6\x11\x1a\x85\xd7\xf7\xaf\x23\x47\xc0\x77\x12\x16\x99\x83\x33\x6e\x32\x2e\xc1\x9d\x30\x98\xbd\xd1\x91\xcf\xa1\xed\x42\xeb\x09\xe9\xfb\xdf\x01\xe4\xa8\x25\xb1\x4b\x42\x51\x00\x12\x7b\xbf\x03\x38\x50\xe1\x30\xbd\xe2\x27\x10\x3b\xb4\x07\xa1\x17\xca\xa0\x99\x33\xf4\xb3\x27\x38\xfa\xfa\xde\x23\x1c\x3d\xc0\x39\x3e\xd4\xab\xf6\x90\x35\x90\x1e\xf5\x80\x91\x46\x9d\x87\x45\x29\x3d\x92\x78\x01\xa6\x51\x07\x4c\xd5\x2f\x17\x0a\xf8\xd9\xb8\x2a\xc6\xdc\x08\xeb\x04\xd4\x53\xd5\x26\xc6\xb1\xa8\x08\x85\x5b\xe2\x55\x49\x82\x0c\x03\xa0\x78\xa4\x05\xe1\x84\xca\xeb\x23\x86\x48\x0d\xe1\x8a\x1c\x58\x8d\xf0\x0d\xb9\x94\x91\x40\xe9\x54\xe6\xac\x0e\x20\xde\x16\xa3\x4c\x34\x55\x42\xaf\xd4\xf8\xa8\x46\x57\xf1\x9f\x72\x53\x6c\xee\x8a\x17\x73\xd9\xfb\xce\xda\x7b\x6f\x8d\xbe\x94\xf0\x66\xff\xde\xf3\x7d\x40\xca\x23\x09\x48\xbe\x0b\x1a\x29\xa7\xfa\x80\xff\xeb\x90\x78\x76\x06\xa0\xdb\xae\x84\x3f\xdc\x36\xb3\xc3\x26\x76\x83\x12\xfe\xf8\xc3\x3b\x33\x4d\x12\x3e\xe4\x97\x57\x53\x76\xee\xe3\x54\x71\x77\x7b\x27\xcd\xd5\xb8\xbd\x0f\x4d\x2c\x5b\x65\x47\xe9\xac\xc6\x66\x3a\x1e\x6f\xf6\x90\x48\xfb\x5e\x71\x5d\xc2\x1a\x59\x47\x2c\xaa\x35\x51\x2d\x53\x8b\x4f\x73\x14\x58\xdf\x3f\x8f\x83\x39\xa1\x03\xe3\x12\x3c\xcf\x29\xdd\x21\xaa\xd7\xb3\x57\x9d\x50\x50\xd5\x07\x67\x2f\x25\x70\xe8\x50\xb4\x49\x47\x8f\x0f\x6a\xd7\xf3\x90\x54\x40\x8b\x61\xef\x83\x46\x51\x9a\x5a\xb8\x74\xf0\xa7\x1c\xcf\xbb\xec\xdc\xf7\x93\x0a\xbd\xef\x49\xec\xdb\xdc\xcf\xca\xe9\x8d\xd3\xb6\x8b\x0f\x5d\x06\x91\xc4\xc7\x03\x09\xa4\x4e\xf7\x95\xc6\x3c\xb4\xe6\x1f\xe5\xea\x83\xa6\x39\x92\x01\x54\xa8\xad\x0a\x32\x80\xec\xfc\x29\xab\xd5\x2f\x74\xad\xf4\x9a\xf3\xe0\x83\xf7\xbc\x2e\x88\xea\x27\x03\x50\x6e\x66\x75\x31\x31\xea\x22\x59\x5e\x0e\x22\x99\x06\x74\x27\x13\xbc\x8b\xfc\x95\x5a\xc3\xe2\xed\xe7\xbf\xfd\xfd\xe5\x87\xf7\x3f\xbf\x79\xbd\x48\x8c\xb5\x14\x3c\xfc\x09\x43\x98\xb7\x97\x4c\x4d\x64\xe4\xdd\x25\x91\x3f\xdb\xc7\x62\xbc\xea\x0b\xd7\x31\x4e\xc5\x29\xc2\x4f\x06\x2a\x14\x2d\x63\xf4\x60\x4d\x18\x25\xeb\x9c\xbd\x77\x31\x27\x99\x8a\x87\xfd\x37\x4f\x7a\x6c\xbe\xc3\x20\xa9\x1c\x28\xcb\x18\x9c\x0c\x8a\x57\x1e\xef\x83\x6f\xa4\x2c\x86\x06\xbb\x04\x45\x52\x6e\x7d\x13\x10\x18\xac\xd7\x47\xba\x4e\x36\xba\x53\xf9\x08\x2e\x13\xdc\x33\x5c\x4e\xca\x76\x78\x85\xc9\xd7\x8a\xf8\x61\x0d\x0c\x2d\xe2\x0b\x15\x20\x1d\x6a\xde\x99\xbe\xd0\x9b\x9e\xa8\x4b\x91\x4a\xcd\x78\x26\x37\xe7\x87\xc9\x69\x31\x59\xce\x62\x48\x69\x48\x0b\x07\x56\xc2\x99\x5a\xe9\x1a\x2b\x41\x36\x4f\xed\x38\x04\x49\x12\x05\x96\x65\xa6\xc5\x87\x7e\xca\xc9\x2e\xf4\x0b\x53\xbc\xb8\x8c\x46\x64\xd0\xa7\xae\x6d\xed\x45\x80\xa0\x1c\x8a\x69\xd6\xe0\xb3\x17\x2f\x3b\x49\x69\x2c\xb8\xb8\xdd\xc5\x3c\x40\xed\xcf\x71\x99\xf1\xce\xa1\xe6\x38\x87\xf0\x1c\xba\xd5\x6a\x0c\x20\x4e\xa9\x62\x7c\x3b\x1e\x15\x7d\x8b\x2e\xe8\xa4\x0b\x6d\x3b\x99\x7c\x0b\xe1\x2f\x9b\x43\xf2\x99\xd2\x53\x9b\xa0\x78\x99\x44\xdf\xdc\xcf\x82\x92\x57\x47\xc8\x71\x59\x9a\x27\x76\xf2\x61\x90\x97\x95\x94\x83\x48\xc6\xf5\x25\x63\xe0\xdc\xe3\x5e\x7a\x7b\x33\x9b\x09\x0c\x41\xd3\x51\x5c\xe7\x22\x7a\x06\xab\x54\x4d\xbb\xc8\xeb\xb1\x1b\xc7\x2d\xee\xbb\x61\x35\xfa\x3e\xf7\x65\x78\x5b\xa9\x0a\x65\x88\xc8\x96\xb9\x99\x23\xc2\x85\x89\xdf\x57\x95\x09\xdb\x2b\xd6\xcf\xdd\xfa\xd8\xcf\x02\x3e\x40\xc0\xc6\x9f\x12\x64\x53\x1a\x3f\x7f\xfc\xa5\x98\x29\x97\x1e\xd3\x05\xbb\x3d\x18\xfe\xcb\xb4\x93\x94\x0f\xc6\x8e\xd5\x01\x79\x45\xac\x02\x63\x75\x75\x7d\x17\x94\xd3\xf5\x36\x6d\x2c\x99\x2f\xe6\x91\x66\x72\x56\x2e\x16\x48\x40\xc1\x5d\xa7\x11\xb1\x51\xce\xec\x65\x78\x90\x12\x22\x53\x61\x48\xdc\xf9\x60\x0c\x8b\xfb\x95\x27\x84\xce\x55\x18\x1e\x04\x16\xd0\x2a\x36\x27\x84\x56\x71\x4d\x43\x02\x0e\x86\xe3\xa2\x47\x86\x65\x01\x9d\x97\xa4\xf8\x2e\xd2\x5b\xea\x76\x95\x09\x9b\x65\xfa\xf7\xc5\xe3\x5c\x82\x52\x7e\x67\x2f\x5e\xa0\x8b\xfb\xbb\x28\x17\x92\x33\xfc\x60\xc4\xce\x0d\xf4\x74\xd1\x93\xc1\xf6\x0b\xec\x30\xdc\xe8\x75\xc9\xad\xed\x9f\x8f\x78\x01\x53\xfd\x34\x8a\x7d\xa1\x03\x64\x5e\x89\x0a\xc5\x5d\xc0\xd9\x9c\xff\x88\xad\xf8\xf9\xb2\x1a\xe5\xe9\xe9\xd8\x1d\xfe\xc6\x03\x00\xd9\x4b\x57\x0e\x16\x5d\x4b\x1c\x50\x35\x8b\xe1\x1d\x66\x4a\xbe\xc3\xe2\x50\x2c\xe1\xdf\x52\x4f\xf0\xd2\xfa\xae\xfa\xbe\x88\x6b\x0c\xfb\xa3\x8c\x25\x04\xad\x0a\x6c\x74\x67\x55\x80\x7e\x83\xee\xb5\x3c\xa4\x90\xde\xea\xf6\x4c\x32\x29\x6b\xd1\x55\xc4\x3a\x2d\x52\xa1\xaa\xd6\xac\x1f\x94\x8c\x5c\x8b\x86\xb6\x6a\xa7\x37\x2f\xee\xae\xff\x9f\x07\xfc\x09\xc3\xe9\x91\x1f\xa7\xa4\x9b\x4e\xfc\x29\x59\xfb\x31\x7f\xc8\xea\x28\x04\x10\x12\x99\x20\x67\xbf\x78\x3d\xcf\x7e\x34\xcb\x7e\xfd\x92\x10\xe3\x9a\x16\x3b\xda\xfc\x39\x5a\x43\x8c\x6e\xd5\xbb\xb0\x2d\xef\x6e\xef\x36\xd3\xfa\xf7\xa1\x4d\x83\x2f\xbc\x7a\xff\x69\xe0\x38\x5a\xf6\xad\xb7\x0b\x3d\xe3\x81\xab\x3c\x13\xf8\x28\x0c\x8d\xba\xc4\x89\xdd\x9e\xa6\xdd\xcd\x91\xf5\xfe\xd8\xb5\x60\x88\x3a\x24\xf0\x0e\xc8\x37\x08\x6f\xbb\x1d\x06\x87\x8c\x04\xf1\x87\x06\x9a\x56\xb3\xca\xd1\xb0\x14\x2c\xde\x7b\x87\x8b\xfc\xcb\xcb\xe8\x40\xbe\x9c\x25\xe3\x34\xdf\xd7\x86\x16\x1a\xfd\x9b\x7d\x19\xbb\xfb\x62\xb3\xb8\xf9\x7f\x00\x00\x00\xff\xff\xe2\xd9\xda\x0a\x2b\x15\x00\x00")
-
-func deployFluxDeploymentYamlBytes() ([]byte, error) {
-	return bindataRead(
-		_deployFluxDeploymentYaml,
-		"deploy/flux-deployment.yaml",
-	)
-}
-
-func deployFluxDeploymentYaml() (*asset, error) {
-	bytes, err := deployFluxDeploymentYamlBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "deploy/flux-deployment.yaml", size: 5419, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _deployFluxSecretYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x04\xc0\xbb\x0d\x02\x31\x0c\x06\xe0\xde\x53\x78\x01\x17\xb4\x5e\x82\x02\x89\xde\x22\x3f\xc8\x22\x0f\x13\x9c\xd3\x65\xfb\xfb\x44\x84\x2c\xfc\x89\xf9\xf7\xd1\x95\x8f\x1b\x7d\xbd\x17\xe5\x07\x5e\x13\x49\x0d\x69\xc5\xd2\x94\x98\xbb\x35\x28\xbf\xeb\x3a\xe5\xe3\x29\x05\x51\xc7\xa6\xdc\x01\xe5\x7b\xd8\x6f\x81\xae\x00\x00\x00\xff\xff\x86\x01\x49\x4e\x4f\x00\x00\x00")
-
-func deployFluxSecretYamlBytes() ([]byte, error) {
-	return bindataRead(
-		_deployFluxSecretYaml,
-		"deploy/flux-secret.yaml",
-	)
-}
-
-func deployFluxSecretYaml() (*asset, error) {
-	bytes, err := deployFluxSecretYamlBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "deploy/flux-secret.yaml", size: 79, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _deployMemcacheDepYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\x4f\x6f\xd3\x40\x10\xc5\xef\xfe\x14\x4f\xca\x15\x07\xb9\x52\x2e\xbe\x21\x0a\xa8\x12\xa0\x5c\xca\x7d\xb2\x9e\x38\x2b\x76\x77\x96\x9d\x71\x88\xf9\xf4\xc8\x49\xe3\x38\x6d\xe7\x64\xed\x7b\xbf\xf9\xe7\xa9\xeb\xba\x5a\x21\x72\x74\xe4\x0e\xdc\xa1\xe3\x1c\x64\x8c\x9c\x0c\x83\x72\x87\xdd\x88\xaf\x61\x38\xc1\x04\x67\x47\xb5\x82\x93\x64\xe4\x13\x17\xf8\x48\x3d\x23\xb2\x51\x47\x46\xeb\x8a\xb2\xff\xc5\x45\xbd\xa4\x16\x94\xb3\x7e\x3c\x36\xd5\x6f\x9f\xba\x16\x8f\x73\xda\xea\x6a\x6f\x2b\x20\x51\xe4\xf6\x56\xbd\xd2\xcc\x6e\x7a\x2f\x9c\x83\x77\xa4\x2d\x9a\x0a\x50\x0e\xec\x4c\xca\xa4\x00\x91\xcc\x1d\xbe\xd3\x8e\x83\x5e\x1e\xde\xa6\x01\x8c\x63\x0e\x64\xfc\x82\x2c\x4a\x4e\x11\xee\xe8\xf7\x78\xe0\xda\xca\x14\xf3\xc4\x33\x53\xbf\xcb\x4c\x71\xde\xc9\x42\x68\x9b\xf5\x66\xdd\x6c\xee\xf5\xed\x10\xc2\x56\x82\x77\x63\x8b\xa7\xfd\x4f\xb1\x6d\x61\x9d\x96\x73\x75\x51\xe9\x17\xfd\xd5\xa8\x23\x36\xcd\x03\x80\x15\x7e\xd0\xc9\xc7\x21\x4e\x15\xa4\x8c\xd3\x8f\x19\x94\x3f\xc0\x27\x44\xee\x69\x37\x1a\xeb\x12\x7c\xc2\x26\xe2\x0e\x54\xff\x8f\xb1\x97\x02\x49\x0c\x6f\x1c\x97\xf6\x8c\xa6\x79\x68\x1a\xac\xf0\xc8\x7b\x1a\x82\x21\x4b\xb9\xf5\xb5\x9a\x3c\xc7\xe3\xe5\xf3\x39\x39\x89\xe7\x53\x31\x41\xcf\x86\x20\xbd\x42\xf6\x60\x72\x07\x14\xfe\x33\xb0\x1a\x28\x75\x28\xac\x59\x92\xf2\x7a\x4e\x34\x65\xbd\x9b\xf0\xb2\x4f\x17\x3c\x27\xbb\x0d\xb0\xd8\xfd\x56\x8a\xb5\x97\xee\x66\x59\xd9\x0d\xc5\xdb\xf8\x59\x92\xf1\xc9\xda\x05\x57\x86\xf4\x49\x9f\x95\xcb\x6b\xe6\x45\xfa\x56\x64\xc8\x6f\x35\x0a\x41\xfe\x6e\x8b\x3f\xfa\xc0\x3d\x7f\x51\x47\x81\xec\x7c\xd0\x7b\x0a\xca\xd5\xff\x00\x00\x00\xff\xff\x55\xe1\x76\x95\x30\x03\x00\x00")
-
-func deployMemcacheDepYamlBytes() ([]byte, error) {
-	return bindataRead(
-		_deployMemcacheDepYaml,
-		"deploy/memcache-dep.yaml",
-	)
-}
-
-func deployMemcacheDepYaml() (*asset, error) {
-	bytes, err := deployMemcacheDepYamlBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "deploy/memcache-dep.yaml", size: 816, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _deployMemcacheSvcYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8b\x3d\xaa\x83\x31\x0c\x04\x7b\x9d\x62\x2f\xe0\x42\xaf\xd4\x35\x1e\xa4\x17\xf2\x42\x4c\xe2\x1f\x6c\xf3\x9d\x3f\x38\xe9\x92\xad\x96\x61\x26\xa5\x24\x3e\xca\x8d\x73\x95\xde\x0c\x97\xca\xa3\xb4\x6c\xf8\xe7\xbc\x4a\x50\x2a\xb7\x67\xdf\x6e\x02\x34\xaf\x34\x54\xd6\xf0\xb8\x33\xcb\x1a\x8c\xc3\x47\x9f\x7b\x9d\x03\xa4\x1f\x09\xef\x1d\xc5\xa0\xfa\xa7\x2a\xc0\xe2\x93\xb1\xfb\xfc\x34\x5f\xc5\x2b\x00\x00\xff\xff\xa8\x56\xba\x05\x93\x00\x00\x00")
-
-func deployMemcacheSvcYamlBytes() ([]byte, error) {
-	return bindataRead(
-		_deployMemcacheSvcYaml,
-		"deploy/memcache-svc.yaml",
-	)
-}
-
-func deployMemcacheSvcYaml() (*asset, error) {
-	bytes, err := deployMemcacheSvcYamlBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "deploy/memcache-svc.yaml", size: 147, mode: os.FileMode(384), modTime: time.Unix(1, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-// Asset loads and returns the asset for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func Asset(name string) ([]byte, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
-		}
-		return a.bytes, nil
-	}
-	return nil, fmt.Errorf("Asset %s not found", name)
-}
-
-// MustAsset is like Asset but panics when Asset would return an error.
-// It simplifies safe initialization of global variables.
-func MustAsset(name string) []byte {
-	a, err := Asset(name)
-	if err != nil {
-		panic("asset: Asset(" + name + "): " + err.Error())
-	}
-
-	return a
-}
-
-// AssetInfo loads and returns the asset info for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func AssetInfo(name string) (os.FileInfo, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
-		}
-		return a.info, nil
-	}
-	return nil, fmt.Errorf("AssetInfo %s not found", name)
-}
-
-// AssetNames returns the names of the assets.
-func AssetNames() []string {
-	names := make([]string, 0, len(_bindata))
-	for name := range _bindata {
-		names = append(names, name)
-	}
-	return names
-}
-
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() (*asset, error){
-	"deploy/flux-account.yaml": deployFluxAccountYaml,
-	"deploy/flux-deployment.yaml": deployFluxDeploymentYaml,
-	"deploy/flux-secret.yaml": deployFluxSecretYaml,
-	"deploy/memcache-dep.yaml": deployMemcacheDepYaml,
-	"deploy/memcache-svc.yaml": deployMemcacheSvcYaml,
-}
-
-// AssetDir returns the file names below a certain
-// directory embedded in the file by go-bindata.
-// For example if you run go-bindata on data/... and data contains the
-// following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
-// then AssetDir("data") would return []string{"foo.txt", "img"}
-// AssetDir("data/img") would return []string{"a.png", "b.png"}
-// AssetDir("foo.txt") and AssetDir("notexist") would return an error
-// AssetDir("") will return []string{"data"}.
-func AssetDir(name string) ([]string, error) {
-	node := _bintree
-	if len(name) != 0 {
-		cannonicalName := strings.Replace(name, "\\", "/", -1)
-		pathList := strings.Split(cannonicalName, "/")
-		for _, p := range pathList {
-			node = node.Children[p]
-			if node == nil {
-				return nil, fmt.Errorf("Asset %s not found", name)
-			}
-		}
-	}
-	if node.Func != nil {
-		return nil, fmt.Errorf("Asset %s not found", name)
-	}
-	rv := make([]string, 0, len(node.Children))
-	for childName := range node.Children {
-		rv = append(rv, childName)
-	}
-	return rv, nil
-}
-
-type bintree struct {
-	Func     func() (*asset, error)
-	Children map[string]*bintree
-}
-var _bintree = &bintree{nil, map[string]*bintree{
-	"deploy": &bintree{nil, map[string]*bintree{
-		"flux-account.yaml": &bintree{deployFluxAccountYaml, map[string]*bintree{}},
-		"flux-deployment.yaml": &bintree{deployFluxDeploymentYaml, map[string]*bintree{}},
-		"flux-secret.yaml": &bintree{deployFluxSecretYaml, map[string]*bintree{}},
-		"memcache-dep.yaml": &bintree{deployMemcacheDepYaml, map[string]*bintree{}},
-		"memcache-svc.yaml": &bintree{deployMemcacheSvcYaml, map[string]*bintree{}},
-	}},
-}}
-
-// RestoreAsset restores an asset under the given directory
-func RestoreAsset(dir, name string) error {
-	data, err := Asset(name)
-	if err != nil {
-		return err
-	}
-	info, err := AssetInfo(name)
-	if err != nil {
-		return err
-	}
-	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
-	if err != nil {
-		return err
-	}
-	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// RestoreAssets restores an asset under the given directory recursively
-func RestoreAssets(dir, name string) error {
-	children, err := AssetDir(name)
-	// File
-	if err != nil {
-		return RestoreAsset(dir, name)
-	}
-	// Dir
-	for _, child := range children {
-		err = RestoreAssets(dir, filepath.Join(name, child))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func _filePath(dir, name string) string {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
-}
-
diff --git a/deploy/flux-account.yaml b/cmd/fluxctl/install-assets/flux-account.yaml.tmpl
similarity index 100%
rename from deploy/flux-account.yaml
rename to cmd/fluxctl/install-assets/flux-account.yaml.tmpl
diff --git a/deploy/flux-deployment.yaml b/cmd/fluxctl/install-assets/flux-deployment.yaml.tmpl
similarity index 100%
rename from deploy/flux-deployment.yaml
rename to cmd/fluxctl/install-assets/flux-deployment.yaml.tmpl
diff --git a/deploy/flux-secret.yaml b/cmd/fluxctl/install-assets/flux-secret.yaml.tmpl
similarity index 100%
rename from deploy/flux-secret.yaml
rename to cmd/fluxctl/install-assets/flux-secret.yaml.tmpl
diff --git a/deploy/memcache-dep.yaml b/cmd/fluxctl/install-assets/memcache-dep.yaml.tmpl
similarity index 100%
rename from deploy/memcache-dep.yaml
rename to cmd/fluxctl/install-assets/memcache-dep.yaml.tmpl
diff --git a/deploy/memcache-svc.yaml b/cmd/fluxctl/install-assets/memcache-svc.yaml.tmpl
similarity index 100%
rename from deploy/memcache-svc.yaml
rename to cmd/fluxctl/install-assets/memcache-svc.yaml.tmpl
diff --git a/tools.go b/tools.go
index b9d7206fe..9e51b6995 100644
--- a/tools.go
+++ b/tools.go
@@ -6,6 +6,6 @@
 package flux
 
 import (
-	_ "k8s.io/code-generator"
 	_ "github.com/jteeuwen/go-bindata"
+	_ "k8s.io/code-generator"
 )

From 85b6d5fb57701d1116b391a861350207afbad864 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 14:17:20 +0200
Subject: [PATCH 066/158] Tweak arguments to what was agreed

---
 cmd/fluxctl/install_cmd.go | 86 +++++++++-----------------------------
 1 file changed, 19 insertions(+), 67 deletions(-)

diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index b7a78ed24..732f7ef20 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -1,24 +1,18 @@
 package main
 
 import (
-	"context"
-	"fmt"
-	"time"
-
 	"github.com/spf13/cobra"
-
-	"github.com/weaveworks/flux/git"
 )
 
 type installOpts struct {
 	gitURL             string
 	gitBranch          string
-	gitFluxPath        string
+	gitPaths           []string
 	gitLabel           string
-	timeout            time.Duration
+	gitUser            string
+	gitEmail           string
 	namespace          string
 	additionalFluxArgs []string
-	amend              bool
 }
 
 func newInstall() *installOpts {
@@ -28,74 +22,32 @@ func newInstall() *installOpts {
 func (opts *installOpts) Command() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "install",
-		Short: "Bootstrap Flux, installing it in the cluster and initializing its manifests in the Git repository",
-		RunE:  opts.RunE,
+		Short: "Print and tweak Kubernetes manifests needed to install Flux in a Cluster",
+		Example: `# Install Flux and make it use Git repository git@github.com:<your username>/flux-get-started
+fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | kubectl -f -`,
+		RunE: opts.RunE,
 	}
-	cmd.Flags().StringVarP(&opts.gitURL, "git-url", "r", "",
+	cmd.Flags().StringVarP(&opts.gitURL, "git-url", "", "",
 		"URL of the Git repository to be used by Flux, e.g. git@github.com:<your username>/flux-get-started")
-	cmd.Flags().StringVarP(&opts.gitBranch, "git-branch", "b", "master",
+	cmd.Flags().StringVarP(&opts.gitBranch, "git-branch", "", "master",
 		"Git branch to be used by Flux")
-	cmd.Flags().StringVarP(&opts.gitLabel, "git-label", "l", "flux",
-		"Git label to keep track of FLux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
-	cmd.Flags().StringVarP(&opts.gitFluxPath, "git-flux-subdir", "p", "flux/",
-		"Directory within the Git repository where to commit the Flux manifests")
-	cmd.Flags().DurationVarP(&opts.timeout, "timeout", "t", 10*time.Second,
-		"Timeout duration for I/O operations")
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "n", "flux",
+	cmd.Flags().StringVarP(&opts.gitLabel, "git-label", "", "flux",
+		"Git label to keep track of Flux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
+	cmd.Flags().StringVarP(&opts.gitUser, "git-user", "", "Flux",
+		"Username to use as git committer")
+	cmd.Flags().StringVarP(&opts.gitEmail, "git-email", "", "flux-dev@googlegroups.com",
+		"Email to use as git committer")
+	cmd.Flags().StringVarP(&opts.namespace, "namespace", "", "flux",
 		"Cluster namespace where to install flux")
-	cmd.Flags().BoolVarP(&opts.amend, "amend", "a", false,
-		"Stop for amending the Flux manifests before pushing them to the Git repository")
-	cmd.Flags().StringSliceVarP(&opts.additionalFluxArgs, "extra-flux-args", "e", []string{},
+	cmd.Flags().StringSliceVarP(&opts.additionalFluxArgs, "extra-flux-args", "", []string{},
 		"Additional arguments for Flux as CSVs, e.g. --extra-flux-arg='--manifest-generation=true,--sync-garbage-collection=true'")
 	return cmd
 }
 
 func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
-	//0. Read and patch embedded deploy/* manifests with what was passed to ops
-
-	// TODO. BTW, it's probably easier to embed chart/flux/* and use `helm template` as a library instead
-
-	//1. Clone repository. In the future we could optionally create the repository automatically for the most
-	//   popular git providers (e.g. GitHub OAuth).
-
-	if opts.gitURL == "" {
-		fmt.Errorf("no Git repository was provided, please provide a repository through --git-url")
-	}
-
-	remote := git.Remote{opts.gitURL}
-	pollInterval := 0 * time.Second // there is no need for polling, We will fetch the repo once, manually
-	repo := git.NewRepo(remote, git.Branch(opts.gitBranch), git.Timeout(opts.timeout), git.PollInterval(pollInterval))
-	checkoutConfig := git.Config{
-		Branch: opts.gitBranch,
-	}
-	ctx := context.Background()
-	cloneCtx, cloneCtxCancel := context.WithTimeout(ctx, opts.timeout)
-	defer cloneCtxCancel()
-	checkout, err := repo.Clone(cloneCtx, checkoutConfig)
-	if err != nil {
-		return fmt.Errorf("cannot clone repository %s: %s", opts.gitURL)
-	}
-	cleanCheckout := true
-	defer func() {
-		if cleanCheckout {
-			checkout.Clean()
-		}
-	}()
-
-	// 2. Write manifests from (0) to the repository's clone working directory
-
-	// 3. If --amend was passed, stop to let the user edit the manifests, by prompting a shell
-
-	// 4. `kubectl apply` the changes to the cluster
-
-	// 5. commit the local changes and push to the remote repository
-
-	// 6. Make sure that the ssh key is added to the repo. At this point we should probably just print the ssh
-	//    key and telling the user to add it manually. In the future we can do this programatically for the most popular
-	//    Git providers.
+	//0. Read and patch embedded templates manifests with what was passed to as options
 
-	// 7. Confirm that Flux is running (for instance by checking that its own manifests have been synced, this can be
-	//    done by checking that the sync annotations have been added)
+	//1. Print them
 
 	return nil
 }

From e021542f7d2bc08d7fe8c7d368e8bdacba422353 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 14:47:34 +0200
Subject: [PATCH 067/158] Replace go-bindata by vfsgen

---
 Makefile                                      |   8 +-
 cmd/fluxctl/install/generate.go               |  22 ++
 .../install/generated_templates.gogen.go      | 250 ++++++++++++++++++
 .../templates}/flux-account.yaml.tmpl         |   0
 .../templates}/flux-deployment.yaml.tmpl      |   0
 .../templates}/flux-secret.yaml.tmpl          |   0
 .../templates}/memcache-dep.yaml.tmpl         |   0
 .../templates}/memcache-svc.yaml.tmpl         |   0
 go.mod                                        |   3 +-
 go.sum                                        |   6 +-
 tools.go                                      |   2 +-
 11 files changed, 283 insertions(+), 8 deletions(-)
 create mode 100644 cmd/fluxctl/install/generate.go
 create mode 100644 cmd/fluxctl/install/generated_templates.gogen.go
 rename cmd/fluxctl/{install-assets => install/templates}/flux-account.yaml.tmpl (100%)
 rename cmd/fluxctl/{install-assets => install/templates}/flux-deployment.yaml.tmpl (100%)
 rename cmd/fluxctl/{install-assets => install/templates}/flux-secret.yaml.tmpl (100%)
 rename cmd/fluxctl/{install-assets => install/templates}/memcache-dep.yaml.tmpl (100%)
 rename cmd/fluxctl/{install-assets => install/templates}/memcache-svc.yaml.tmpl (100%)

diff --git a/Makefile b/Makefile
index e07a24982..b2ae38952 100644
--- a/Makefile
+++ b/Makefile
@@ -120,10 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/install-assets/bindata.go: cmd/fluxctl/install-assets/*.tmpl
-	go run github.com/jteeuwen/go-bindata/go-bindata -mode 0600 -modtime 1 -pkg install-assets -o $@ $^
+cmd/fluxctl/install/generated_templates.gogen.go: cmd/fluxctl/install/templates/*
+	cd cmd/fluxctl/install && go run generate.go
 
-check-generated: cmd/fluxctl/install-assets/bindata.go
+check-generated: cmd/fluxctl/install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/deploy-bindata.go
+	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/install/generated_templates.gogen.go
 
diff --git a/cmd/fluxctl/install/generate.go b/cmd/fluxctl/install/generate.go
new file mode 100644
index 000000000..716bf8eb6
--- /dev/null
+++ b/cmd/fluxctl/install/generate.go
@@ -0,0 +1,22 @@
+// +build ignore
+
+package main
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/shurcooL/vfsgen"
+)
+
+func main() {
+	var fs http.FileSystem = http.Dir("templates/")
+	err := vfsgen.Generate(fs, vfsgen.Options{
+		Filename:     "generated_templates.gogen.go",
+		PackageName:  "install",
+		VariableName: "Templates",
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+}
diff --git a/cmd/fluxctl/install/generated_templates.gogen.go b/cmd/fluxctl/install/generated_templates.gogen.go
new file mode 100644
index 000000000..5845e9233
--- /dev/null
+++ b/cmd/fluxctl/install/generated_templates.gogen.go
@@ -0,0 +1,250 @@
+// Code generated by vfsgen; DO NOT EDIT.
+
+package install
+
+import (
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	pathpkg "path"
+	"time"
+)
+
+// Templates statically implements the virtual filesystem provided to vfsgen.
+var Templates = func() http.FileSystem {
+	fs := vfsgen۰FS{
+		"/": &vfsgen۰DirInfo{
+			name:    "/",
+			modTime: time.Date(2019, 7, 24, 12, 44, 40, 451689542, time.UTC),
+		},
+		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
+			name:             "flux-account.yaml.tmpl",
+			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
+			uncompressedSize: 725,
+
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x51\xbd\x6e\xf3\x30\x0c\xdc\xf5\x14\x04\x32\xe4\xfb\x8a\xd8\x45\xb6\xc2\x5b\x92\xa1\x43\x3b\xb9\x3f\x4b\xd1\x81\x92\xe8\x46\x8d\x22\x1a\x94\xe4\xfe\x3c\x7d\xe1\x38\x01\x62\xa4\x2d\x10\xa0\x1b\x79\x38\xf2\xee\xc8\xa2\x28\xd4\x04\xee\xd7\x04\x91\xa4\x73\x86\x00\x8d\xe1\x1c\xd2\x0c\x8c\xcf\x31\x91\x80\xb0\xa7\x38\x03\x0c\x76\x04\x81\x76\xc1\xba\xf0\x02\x28\xa4\x26\xc0\xc1\x7f\x40\x20\xb2\x64\xa1\x61\x81\x9b\xac\x49\x02\x25\x8a\xf0\xe6\xd2\x7a\x37\x52\x68\x8c\x64\x7b\x05\x8a\x11\x0c\x87\x24\xec\xe1\x5f\xbd\x5c\xac\xfe\x97\x0a\x5b\xf7\x48\x12\x1d\x87\x0a\xba\xb9\xda\xb8\x60\x2b\xb8\x1b\x5c\x2d\x06\x53\x6a\x4b\x09\x2d\x26\xac\x14\x80\x47\x4d\x3e\xf6\x15\x40\xc0\x2d\x55\xd0\xf8\xfc\xae\x46\x4d\x1f\xef\x78\xaf\x68\x34\x25\xe6\xb4\x66\x71\x9f\x98\x1c\x87\x72\x73\x15\x4b\xc7\x97\xdd\x5c\x53\xc2\x83\xec\x6a\x08\x5a\xb3\xa7\xb3\x35\x25\x7b\xda\x51\x0a\xc0\xd6\x5d\x0b\xe7\x36\x56\xf0\x34\xbd\x98\x3e\xef\xe6\x84\x22\x67\x31\x34\x02\x3b\x12\x7d\x04\x14\x10\x38\xd4\x7b\xe2\x43\x7d\xfb\x33\xf7\x0f\x12\x2e\x87\x47\x9e\x1f\x94\x3d\xd5\xd4\xf4\xa4\x43\xd0\x5f\xf4\x15\xc0\xe9\x6d\x47\xfb\x62\xd6\xaf\x64\xd2\xfe\x76\xdf\xfe\xff\xc4\xce\xd0\xc6\x16\x0d\x55\x60\xa9\xc1\xec\x93\xfa\x0a\x00\x00\xff\xff\xb1\x6e\xe4\xd9\xd5\x02\x00\x00"),
+		},
+		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
+			name:             "flux-deployment.yaml.tmpl",
+			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
+			uncompressedSize: 5419,
+
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x9c\x00\xd2\xea\xe4\x4b\x8b\x62\x53\x05\x6d\xed\xc6\x35\x1c\xdb\x07\xbb\x6e\xd1\xa7\x86\xe2\x8e\xb4\x84\xb8\xe4\x96\x33\x2b\x45\xdf\xbe\x18\x72\xff\x70\x4f\x77\x76\xe0\x3c\xc4\x07\xee\x70\xfe\xfc\x66\xf8\x9b\x19\xad\x56\xab\x1b\xd5\x9a\x7f\x61\x20\xe3\x5d\x09\xaa\x6d\x69\x7d\xda\xdc\x1c\x8d\xab\x4a\x78\x85\xad\xf5\x97\x06\x1d\xdf\x34\xc8\xaa\x52\xac\xca\x1b\x00\xa7\x1a\x2c\x61\x6f\xbb\xdf\x6e\xa8\x45\x2d\x47\x01\x5b\x6b\xb4\xa2\x12\x36\x37\x00\x84\x16\x35\xfb\x20\x5f\x00\x1a\xc5\xba\xfe\x45\xed\xd0\x52\x3a\x98\x69\x00\x20\x0e\x8a\xf1\x70\x49\x1f\xf9\xd2\x62\x09\x1f\x51\x07\x54\x8c\x37\x00\x8c\x4d\x6b\x15\x63\xaf\x2c\xf3\x43\xfe\x53\xce\x79\x56\x6c\xbc\x1b\x95\x03\xb4\xc1\x37\xc8\x35\x76\x54\x18\x5f\xb4\x3e\x70\x09\x8b\xbb\xdb\xbb\xcd\x02\x9e\x01\xa3\xb5\x99\x04\xb0\x07\xd2\x41\xb5\x08\xeb\x06\x39\x18\x4d\x80\xae\x6a\xbd\x71\xfc\x9c\x40\x2e\x17\xbd\x62\x3b\x8b\xe1\x41\x14\x00\x03\x16\xf1\x6f\x0c\x27\xa3\xf1\xaf\x5a\xfb\xce\xf1\xfb\xb9\x20\xc0\xc9\xdb\xae\xc1\x51\xd5\xaa\x57\x75\x30\xbc\x3a\xe2\x65\x34\x40\x82\x02\x4f\x06\x87\x93\x49\xdf\x4a\xae\x54\x31\x4d\x99\x54\x85\x7b\xd5\x59\x7e\xe7\x2b\x2c\xe1\xf6\x87\xdb\x5b\x78\x06\xe7\x1a\x1d\x34\xe2\x0d\x56\x10\x50\x55\x2b\xef\xec\x65\x09\x67\x84\xb3\x77\xcf\x19\x76\x08\x6a\x67\x51\xf0\xd0\x75\xe3\xab\x9b\x5e\xe1\x33\xf8\x67\x6d\x08\x0c\x81\x02\x6e\xda\x3d\x41\x47\x58\xc1\xde\x07\x38\xa0\xc3\xa0\xd8\xb8\x03\x7c\xfa\xf4\x0f\x38\xe2\x85\x0a\x78\xe3\xe0\xed\x9f\x08\x7e\xda\xc2\xa6\xd8\xdc\x2e\x47\x2d\x83\xed\x14\x02\x81\x0a\x98\xfb\x41\x5e\x5c\x71\x88\x15\x28\x20\x6c\x95\x14\x45\x0f\x14\x9c\x71\x54\xa3\x95\x83\x73\x30\x2c\x8e\x16\x8f\xe3\x77\x40\x37\x82\x81\x4d\xcb\x97\x57\x26\xe4\x20\x36\x58\x99\xae\x29\xe1\x1d\x36\x3e\x5c\xf2\x38\x11\xf6\xde\x5a\x7f\x96\x88\x7a\xd3\x86\x62\xa8\x1d\xc9\x99\x02\xdd\x11\xfb\xc6\x08\x02\x47\xe7\xcf\xee\xbf\xb5\x27\xa6\x51\xc5\xde\x58\x5c\xc2\xb9\x36\xba\x86\x8b\xef\xe0\x6c\xac\x4d\x41\xb1\x87\xca\x83\xd9\xc7\x63\xb9\x24\x7f\x04\xf0\x67\x27\x6e\x8f\x0a\x02\xb6\x1e\x82\xe2\x1a\x03\x70\xad\x5c\x6f\xf8\x60\xb8\xee\x76\xe0\xe5\x10\xc1\x9a\x23\x16\xf0\x1f\xdf\x3d\xb7\x16\x94\x25\x3f\x98\x98\x83\x0d\x86\xc1\x38\xf6\xf1\x8e\xf6\x8e\x95\x71\x18\x96\xb0\x43\xeb\xcf\x05\x7c\xc2\x09\xd5\x9a\xb9\xa5\x72\xbd\x4e\x76\x0a\xed\x9b\xf5\x19\xd5\x09\xcf\x3e\x1c\x69\x2d\x95\xb6\xde\x59\xbf\x5b\x37\x8a\x18\xc3\x9a\x0c\xe3\x9a\x58\xb9\x4a\x59\xef\x70\x45\xc8\x5d\x5b\x34\xd5\xb3\xe8\xed\x4a\xad\xda\x60\x4e\x8a\x31\x96\xa7\x04\x3b\x1a\x1a\x52\x45\x54\xaf\xb4\x77\x7b\x73\x18\x3f\x01\xa4\x83\x77\xaa\x2d\xb3\xc3\xfc\x9d\xad\xb2\x6b\xdf\x9a\xb6\xe2\xd8\xed\x70\x9d\x94\x4c\xd5\xf9\xd5\x94\x9d\x0d\xd5\x72\x52\xab\x13\x82\x82\xca\xec\xf7\x18\x84\x19\x07\x0d\xfd\xa3\x8b\xde\x52\xab\x74\xca\x50\x52\x97\xe7\x48\xb8\xe7\x64\x2a\x1c\xb2\xb2\x37\x87\x46\xb5\x93\x23\x86\x6b\x50\x0e\xd0\x71\xb8\xc4\x18\x7e\x4d\x42\xbf\x2e\x41\xb9\x0a\x3a\xa7\x7d\x23\x94\x1c\xef\xa7\x68\xdf\xc5\x6c\x2b\x57\x8d\x5a\xd0\x9d\xa2\x06\x83\xd4\xa7\xfb\x2a\x03\x02\xc3\x37\x64\x20\xbb\xf6\xd5\x0c\x44\xa2\x60\x0f\xa6\x11\x1a\x85\xd7\xf7\xaf\x23\x47\xc0\x77\x12\x16\x99\x83\x33\x6e\x32\x2e\xc1\x9d\x30\x98\xbd\xd1\x91\xcf\xa1\xed\x42\xeb\x09\xe9\xfb\xdf\x01\xe4\xa8\x25\xb1\x4b\x42\x51\x00\x12\x7b\xbf\x03\x38\x50\xe1\x30\xbd\xe2\x27\x10\x3b\xb4\x07\xa1\x17\xca\xa0\x99\x33\xf4\xb3\x27\x38\xfa\xfa\xde\x23\x1c\x3d\xc0\x39\x3e\xd4\xab\xf6\x90\x35\x90\x1e\xf5\x80\x91\x46\x9d\x87\x45\x29\x3d\x92\x78\x01\xa6\x51\x07\x4c\xd5\x2f\x17\x0a\xf8\xd9\xb8\x2a\xc6\xdc\x08\xeb\x04\xd4\x53\xd5\x26\xc6\xb1\xa8\x08\x85\x5b\xe2\x55\x49\x82\x0c\x03\xa0\x78\xa4\x05\xe1\x84\xca\xeb\x23\x86\x48\x0d\xe1\x8a\x1c\x58\x8d\xf0\x0d\xb9\x94\x91\x40\xe9\x54\xe6\xac\x0e\x20\xde\x16\xa3\x4c\x34\x55\x42\xaf\xd4\xf8\xa8\x46\x57\xf1\x9f\x72\x53\x6c\xee\x8a\x17\x73\xd9\xfb\xce\xda\x7b\x6f\x8d\xbe\x94\xf0\x66\xff\xde\xf3\x7d\x40\xca\x23\x09\x48\xbe\x0b\x1a\x29\xa7\xfa\x80\xff\xeb\x90\x78\x76\x06\xa0\xdb\xae\x84\x3f\xdc\x36\xb3\xc3\x26\x76\x83\x12\xfe\xf8\xc3\x3b\x33\x4d\x12\x3e\xe4\x97\x57\x53\x76\xee\xe3\x54\x71\x77\x7b\x27\xcd\xd5\xb8\xbd\x0f\x4d\x2c\x5b\x65\x47\xe9\xac\xc6\x66\x3a\x1e\x6f\xf6\x90\x48\xfb\x5e\x71\x5d\xc2\x1a\x59\x47\x2c\xaa\x35\x51\x2d\x53\x8b\x4f\x73\x14\x58\xdf\x3f\x8f\x83\x39\xa1\x03\xe3\x12\x3c\xcf\x29\xdd\x21\xaa\xd7\xb3\x57\x9d\x50\x50\xd5\x07\x67\x2f\x25\x70\xe8\x50\xb4\x49\x47\x8f\x0f\x6a\xd7\xf3\x90\x54\x40\x8b\x61\xef\x83\x46\x51\x9a\x5a\xb8\x74\xf0\xa7\x1c\xcf\xbb\xec\xdc\xf7\x93\x0a\xbd\xef\x49\xec\xdb\xdc\xcf\xca\xe9\x8d\xd3\xb6\x8b\x0f\x5d\x06\x91\xc4\xc7\x03\x09\xa4\x4e\xf7\x95\xc6\x3c\xb4\xe6\x1f\xe5\xea\x83\xa6\x39\x92\x01\x54\xa8\xad\x0a\x32\x80\xec\xfc\x29\xab\xd5\x2f\x74\xad\xf4\x9a\xf3\xe0\x83\xf7\xbc\x2e\x88\xea\x27\x03\x50\x6e\x66\x75\x31\x31\xea\x22\x59\x5e\x0e\x22\x99\x06\x74\x27\x13\xbc\x8b\xfc\x95\x5a\xc3\xe2\xed\xe7\xbf\xfd\xfd\xe5\x87\xf7\x3f\xbf\x79\xbd\x48\x8c\xb5\x14\x3c\xfc\x09\x43\x98\xb7\x97\x4c\x4d\x64\xe4\xdd\x25\x91\x3f\xdb\xc7\x62\xbc\xea\x0b\xd7\x31\x4e\xc5\x29\xc2\x4f\x06\x2a\x14\x2d\x63\xf4\x60\x4d\x18\x25\xeb\x9c\xbd\x77\x31\x27\x99\x8a\x87\xfd\x37\x4f\x7a\x6c\xbe\xc3\x20\xa9\x1c\x28\xcb\x18\x9c\x0c\x8a\x57\x1e\xef\x83\x6f\xa4\x2c\x86\x06\xbb\x04\x45\x52\x6e\x7d\x13\x10\x18\xac\xd7\x47\xba\x4e\x36\xba\x53\xf9\x08\x2e\x13\xdc\x33\x5c\x4e\xca\x76\x78\x85\xc9\xd7\x8a\xf8\x61\x0d\x0c\x2d\xe2\x0b\x15\x20\x1d\x6a\xde\x99\xbe\xd0\x9b\x9e\xa8\x4b\x91\x4a\xcd\x78\x26\x37\xe7\x87\xc9\x69\x31\x59\xce\x62\x48\x69\x48\x0b\x07\x56\xc2\x99\x5a\xe9\x1a\x2b\x41\x36\x4f\xed\x38\x04\x49\x12\x05\x96\x65\xa6\xc5\x87\x7e\xca\xc9\x2e\xf4\x0b\x53\xbc\xb8\x8c\x46\x64\xd0\xa7\xae\x6d\xed\x45\x80\xa0\x1c\x8a\x69\xd6\xe0\xb3\x17\x2f\x3b\x49\x69\x2c\xb8\xb8\xdd\xc5\x3c\x40\xed\xcf\x71\x99\xf1\xce\xa1\xe6\x38\x87\xf0\x1c\xba\xd5\x6a\x0c\x20\x4e\xa9\x62\x7c\x3b\x1e\x15\x7d\x8b\x2e\xe8\xa4\x0b\x6d\x3b\x99\x7c\x0b\xe1\x2f\x9b\x43\xf2\x99\xd2\x53\x9b\xa0\x78\x99\x44\xdf\xdc\xcf\x82\x92\x57\x47\xc8\x71\x59\x9a\x27\x76\xf2\x61\x90\x97\x95\x94\x83\x48\xc6\xf5\x25\x63\xe0\xdc\xe3\x5e\x7a\x7b\x33\x9b\x09\x0c\x41\xd3\x51\x5c\xe7\x22\x7a\x06\xab\x54\x4d\xbb\xc8\xeb\xb1\x1b\xc7\x2d\xee\xbb\x61\x35\xfa\x3e\xf7\x65\x78\x5b\xa9\x0a\x65\x88\xc8\x96\xb9\x99\x23\xc2\x85\x89\xdf\x57\x95\x09\xdb\x2b\xd6\xcf\xdd\xfa\xd8\xcf\x02\x3e\x40\xc0\xc6\x9f\x12\x64\x53\x1a\x3f\x7f\xfc\xa5\x98\x29\x97\x1e\xd3\x05\xbb\x3d\x18\xfe\xcb\xb4\x93\x94\x0f\xc6\x8e\xd5\x01\x79\x45\xac\x02\x63\x75\x75\x7d\x17\x94\xd3\xf5\x36\x6d\x2c\x99\x2f\xe6\x91\x66\x72\x56\x2e\x16\x48\x40\xc1\x5d\xa7\x11\xb1\x51\xce\xec\x65\x78\x90\x12\x22\x53\x61\x48\xdc\xf9\x60\x0c\x8b\xfb\x95\x27\x84\xce\x55\x18\x1e\x04\x16\xd0\x2a\x36\x27\x84\x56\x71\x4d\x43\x02\x0e\x86\xe3\xa2\x47\x86\x65\x01\x9d\x97\xa4\xf8\x2e\xd2\x5b\xea\x76\x95\x09\x9b\x65\xfa\xf7\xc5\xe3\x5c\x82\x52\x7e\x67\x2f\x5e\xa0\x8b\xfb\xbb\x28\x17\x92\x33\xfc\x60\xc4\xce\x0d\xf4\x74\xd1\x93\xc1\xf6\x0b\xec\x30\xdc\xe8\x75\xc9\xad\xed\x9f\x8f\x78\x01\x53\xfd\x34\x8a\x7d\xa1\x03\x64\x5e\x89\x0a\xc5\x5d\xc0\xd9\x9c\xff\x88\xad\xf8\xf9\xb2\x1a\xe5\xe9\xe9\xd8\x1d\xfe\xc6\x03\x00\xd9\x4b\x57\x0e\x16\x5d\x4b\x1c\x50\x35\x8b\xe1\x1d\x66\x4a\xbe\xc3\xe2\x50\x2c\xe1\xdf\x52\x4f\xf0\xd2\xfa\xae\xfa\xbe\x88\x6b\x0c\xfb\xa3\x8c\x25\x04\xad\x0a\x6c\x74\x67\x55\x80\x7e\x83\xee\xb5\x3c\xa4\x90\xde\xea\xf6\x4c\x32\x29\x6b\xd1\x55\xc4\x3a\x2d\x52\xa1\xaa\xd6\xac\x1f\x94\x8c\x5c\x8b\x86\xb6\x6a\xa7\x37\x2f\xee\xae\xff\x9f\x07\xfc\x09\xc3\xe9\x91\x1f\xa7\xa4\x9b\x4e\xfc\x29\x59\xfb\x31\x7f\xc8\xea\x28\x04\x10\x12\x99\x20\x67\xbf\x78\x3d\xcf\x7e\x34\xcb\x7e\xfd\x92\x10\xe3\x9a\x16\x3b\xda\xfc\x39\x5a\x43\x8c\x6e\xd5\xbb\xb0\x2d\xef\x6e\xef\x36\xd3\xfa\xf7\xa1\x4d\x83\x2f\xbc\x7a\xff\x69\xe0\x38\x5a\xf6\xad\xb7\x0b\x3d\xe3\x81\xab\x3c\x13\xf8\x28\x0c\x8d\xba\xc4\x89\xdd\x9e\xa6\xdd\xcd\x91\xf5\xfe\xd8\xb5\x60\x88\x3a\x24\xf0\x0e\xc8\x37\x08\x6f\xbb\x1d\x06\x87\x8c\x04\xf1\x87\x06\x9a\x56\xb3\xca\xd1\xb0\x14\x2c\xde\x7b\x87\x8b\xfc\xcb\xcb\xe8\x40\xbe\x9c\x25\xe3\x34\xdf\xd7\x86\x16\x1a\xfd\x9b\x7d\x19\xbb\xfb\x62\xb3\xb8\xf9\x7f\x00\x00\x00\xff\xff\xe2\xd9\xda\x0a\x2b\x15\x00\x00"),
+		},
+		"/flux-secret.yaml.tmpl": &vfsgen۰FileInfo{
+			name:    "flux-secret.yaml.tmpl",
+			modTime: time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
+			content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x66\x6c\x75\x78\x2d\x67\x69\x74\x2d\x64\x65\x70\x6c\x6f\x79\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a"),
+		},
+		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
+			name:             "memcache-dep.yaml.tmpl",
+			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
+			uncompressedSize: 816,
+
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\x4f\x6f\xd3\x40\x10\xc5\xef\xfe\x14\x4f\xca\x15\x07\xb9\x52\x2e\xbe\x21\x0a\xa8\x12\xa0\x5c\xca\x7d\xb2\x9e\x38\x2b\x76\x77\x96\x9d\x71\x88\xf9\xf4\xc8\x49\xe3\x38\x6d\xe7\x64\xed\x7b\xbf\xf9\xe7\xa9\xeb\xba\x5a\x21\x72\x74\xe4\x0e\xdc\xa1\xe3\x1c\x64\x8c\x9c\x0c\x83\x72\x87\xdd\x88\xaf\x61\x38\xc1\x04\x67\x47\xb5\x82\x93\x64\xe4\x13\x17\xf8\x48\x3d\x23\xb2\x51\x47\x46\xeb\x8a\xb2\xff\xc5\x45\xbd\xa4\x16\x94\xb3\x7e\x3c\x36\xd5\x6f\x9f\xba\x16\x8f\x73\xda\xea\x6a\x6f\x2b\x20\x51\xe4\xf6\x56\xbd\xd2\xcc\x6e\x7a\x2f\x9c\x83\x77\xa4\x2d\x9a\x0a\x50\x0e\xec\x4c\xca\xa4\x00\x91\xcc\x1d\xbe\xd3\x8e\x83\x5e\x1e\xde\xa6\x01\x8c\x63\x0e\x64\xfc\x82\x2c\x4a\x4e\x11\xee\xe8\xf7\x78\xe0\xda\xca\x14\xf3\xc4\x33\x53\xbf\xcb\x4c\x71\xde\xc9\x42\x68\x9b\xf5\x66\xdd\x6c\xee\xf5\xed\x10\xc2\x56\x82\x77\x63\x8b\xa7\xfd\x4f\xb1\x6d\x61\x9d\x96\x73\x75\x51\xe9\x17\xfd\xd5\xa8\x23\x36\xcd\x03\x80\x15\x7e\xd0\xc9\xc7\x21\x4e\x15\xa4\x8c\xd3\x8f\x19\x94\x3f\xc0\x27\x44\xee\x69\x37\x1a\xeb\x12\x7c\xc2\x26\xe2\x0e\x54\xff\x8f\xb1\x97\x02\x49\x0c\x6f\x1c\x97\xf6\x8c\xa6\x79\x68\x1a\xac\xf0\xc8\x7b\x1a\x82\x21\x4b\xb9\xf5\xb5\x9a\x3c\xc7\xe3\xe5\xf3\x39\x39\x89\xe7\x53\x31\x41\xcf\x86\x20\xbd\x42\xf6\x60\x72\x07\x14\xfe\x33\xb0\x1a\x28\x75\x28\xac\x59\x92\xf2\x7a\x4e\x34\x65\xbd\x9b\xf0\xb2\x4f\x17\x3c\x27\xbb\x0d\xb0\xd8\xfd\x56\x8a\xb5\x97\xee\x66\x59\xd9\x0d\xc5\xdb\xf8\x59\x92\xf1\xc9\xda\x05\x57\x86\xf4\x49\x9f\x95\xcb\x6b\xe6\x45\xfa\x56\x64\xc8\x6f\x35\x0a\x41\xfe\x6e\x8b\x3f\xfa\xc0\x3d\x7f\x51\x47\x81\xec\x7c\xd0\x7b\x0a\xca\xd5\xff\x00\x00\x00\xff\xff\x55\xe1\x76\x95\x30\x03\x00\x00"),
+		},
+		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
+			name:             "memcache-svc.yaml.tmpl",
+			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
+			uncompressedSize: 147,
+
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8b\x3d\xaa\x83\x31\x0c\x04\x7b\x9d\x62\x2f\xe0\x42\xaf\xd4\x35\x1e\xa4\x17\xf2\x42\x4c\xe2\x1f\x6c\xf3\x9d\x3f\x38\xe9\x92\xad\x96\x61\x26\xa5\x24\x3e\xca\x8d\x73\x95\xde\x0c\x97\xca\xa3\xb4\x6c\xf8\xe7\xbc\x4a\x50\x2a\xb7\x67\xdf\x6e\x02\x34\xaf\x34\x54\xd6\xf0\xb8\x33\xcb\x1a\x8c\xc3\x47\x9f\x7b\x9d\x03\xa4\x1f\x09\xef\x1d\xc5\xa0\xfa\xa7\x2a\xc0\xe2\x93\xb1\xfb\xfc\x34\x5f\xc5\x2b\x00\x00\xff\xff\xa8\x56\xba\x05\x93\x00\x00\x00"),
+		},
+	}
+	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
+		fs["/flux-account.yaml.tmpl"].(os.FileInfo),
+		fs["/flux-deployment.yaml.tmpl"].(os.FileInfo),
+		fs["/flux-secret.yaml.tmpl"].(os.FileInfo),
+		fs["/memcache-dep.yaml.tmpl"].(os.FileInfo),
+		fs["/memcache-svc.yaml.tmpl"].(os.FileInfo),
+	}
+
+	return fs
+}()
+
+type vfsgen۰FS map[string]interface{}
+
+func (fs vfsgen۰FS) Open(path string) (http.File, error) {
+	path = pathpkg.Clean("/" + path)
+	f, ok := fs[path]
+	if !ok {
+		return nil, &os.PathError{Op: "open", Path: path, Err: os.ErrNotExist}
+	}
+
+	switch f := f.(type) {
+	case *vfsgen۰CompressedFileInfo:
+		gr, err := gzip.NewReader(bytes.NewReader(f.compressedContent))
+		if err != nil {
+			// This should never happen because we generate the gzip bytes such that they are always valid.
+			panic("unexpected error reading own gzip compressed bytes: " + err.Error())
+		}
+		return &vfsgen۰CompressedFile{
+			vfsgen۰CompressedFileInfo: f,
+			gr:                        gr,
+		}, nil
+	case *vfsgen۰FileInfo:
+		return &vfsgen۰File{
+			vfsgen۰FileInfo: f,
+			Reader:          bytes.NewReader(f.content),
+		}, nil
+	case *vfsgen۰DirInfo:
+		return &vfsgen۰Dir{
+			vfsgen۰DirInfo: f,
+		}, nil
+	default:
+		// This should never happen because we generate only the above types.
+		panic(fmt.Sprintf("unexpected type %T", f))
+	}
+}
+
+// vfsgen۰CompressedFileInfo is a static definition of a gzip compressed file.
+type vfsgen۰CompressedFileInfo struct {
+	name              string
+	modTime           time.Time
+	compressedContent []byte
+	uncompressedSize  int64
+}
+
+func (f *vfsgen۰CompressedFileInfo) Readdir(count int) ([]os.FileInfo, error) {
+	return nil, fmt.Errorf("cannot Readdir from file %s", f.name)
+}
+func (f *vfsgen۰CompressedFileInfo) Stat() (os.FileInfo, error) { return f, nil }
+
+func (f *vfsgen۰CompressedFileInfo) GzipBytes() []byte {
+	return f.compressedContent
+}
+
+func (f *vfsgen۰CompressedFileInfo) Name() string       { return f.name }
+func (f *vfsgen۰CompressedFileInfo) Size() int64        { return f.uncompressedSize }
+func (f *vfsgen۰CompressedFileInfo) Mode() os.FileMode  { return 0444 }
+func (f *vfsgen۰CompressedFileInfo) ModTime() time.Time { return f.modTime }
+func (f *vfsgen۰CompressedFileInfo) IsDir() bool        { return false }
+func (f *vfsgen۰CompressedFileInfo) Sys() interface{}   { return nil }
+
+// vfsgen۰CompressedFile is an opened compressedFile instance.
+type vfsgen۰CompressedFile struct {
+	*vfsgen۰CompressedFileInfo
+	gr      *gzip.Reader
+	grPos   int64 // Actual gr uncompressed position.
+	seekPos int64 // Seek uncompressed position.
+}
+
+func (f *vfsgen۰CompressedFile) Read(p []byte) (n int, err error) {
+	if f.grPos > f.seekPos {
+		// Rewind to beginning.
+		err = f.gr.Reset(bytes.NewReader(f.compressedContent))
+		if err != nil {
+			return 0, err
+		}
+		f.grPos = 0
+	}
+	if f.grPos < f.seekPos {
+		// Fast-forward.
+		_, err = io.CopyN(ioutil.Discard, f.gr, f.seekPos-f.grPos)
+		if err != nil {
+			return 0, err
+		}
+		f.grPos = f.seekPos
+	}
+	n, err = f.gr.Read(p)
+	f.grPos += int64(n)
+	f.seekPos = f.grPos
+	return n, err
+}
+func (f *vfsgen۰CompressedFile) Seek(offset int64, whence int) (int64, error) {
+	switch whence {
+	case io.SeekStart:
+		f.seekPos = 0 + offset
+	case io.SeekCurrent:
+		f.seekPos += offset
+	case io.SeekEnd:
+		f.seekPos = f.uncompressedSize + offset
+	default:
+		panic(fmt.Errorf("invalid whence value: %v", whence))
+	}
+	return f.seekPos, nil
+}
+func (f *vfsgen۰CompressedFile) Close() error {
+	return f.gr.Close()
+}
+
+// vfsgen۰FileInfo is a static definition of an uncompressed file (because it's not worth gzip compressing).
+type vfsgen۰FileInfo struct {
+	name    string
+	modTime time.Time
+	content []byte
+}
+
+func (f *vfsgen۰FileInfo) Readdir(count int) ([]os.FileInfo, error) {
+	return nil, fmt.Errorf("cannot Readdir from file %s", f.name)
+}
+func (f *vfsgen۰FileInfo) Stat() (os.FileInfo, error) { return f, nil }
+
+func (f *vfsgen۰FileInfo) NotWorthGzipCompressing() {}
+
+func (f *vfsgen۰FileInfo) Name() string       { return f.name }
+func (f *vfsgen۰FileInfo) Size() int64        { return int64(len(f.content)) }
+func (f *vfsgen۰FileInfo) Mode() os.FileMode  { return 0444 }
+func (f *vfsgen۰FileInfo) ModTime() time.Time { return f.modTime }
+func (f *vfsgen۰FileInfo) IsDir() bool        { return false }
+func (f *vfsgen۰FileInfo) Sys() interface{}   { return nil }
+
+// vfsgen۰File is an opened file instance.
+type vfsgen۰File struct {
+	*vfsgen۰FileInfo
+	*bytes.Reader
+}
+
+func (f *vfsgen۰File) Close() error {
+	return nil
+}
+
+// vfsgen۰DirInfo is a static definition of a directory.
+type vfsgen۰DirInfo struct {
+	name    string
+	modTime time.Time
+	entries []os.FileInfo
+}
+
+func (d *vfsgen۰DirInfo) Read([]byte) (int, error) {
+	return 0, fmt.Errorf("cannot Read from directory %s", d.name)
+}
+func (d *vfsgen۰DirInfo) Close() error               { return nil }
+func (d *vfsgen۰DirInfo) Stat() (os.FileInfo, error) { return d, nil }
+
+func (d *vfsgen۰DirInfo) Name() string       { return d.name }
+func (d *vfsgen۰DirInfo) Size() int64        { return 0 }
+func (d *vfsgen۰DirInfo) Mode() os.FileMode  { return 0755 | os.ModeDir }
+func (d *vfsgen۰DirInfo) ModTime() time.Time { return d.modTime }
+func (d *vfsgen۰DirInfo) IsDir() bool        { return true }
+func (d *vfsgen۰DirInfo) Sys() interface{}   { return nil }
+
+// vfsgen۰Dir is an opened dir instance.
+type vfsgen۰Dir struct {
+	*vfsgen۰DirInfo
+	pos int // Position within entries for Seek and Readdir.
+}
+
+func (d *vfsgen۰Dir) Seek(offset int64, whence int) (int64, error) {
+	if offset == 0 && whence == io.SeekStart {
+		d.pos = 0
+		return 0, nil
+	}
+	return 0, fmt.Errorf("unsupported Seek in directory %s", d.name)
+}
+
+func (d *vfsgen۰Dir) Readdir(count int) ([]os.FileInfo, error) {
+	if d.pos >= len(d.entries) && count > 0 {
+		return nil, io.EOF
+	}
+	if count <= 0 || count > len(d.entries)-d.pos {
+		count = len(d.entries) - d.pos
+	}
+	e := d.entries[d.pos : d.pos+count]
+	d.pos += count
+	return e, nil
+}
diff --git a/cmd/fluxctl/install-assets/flux-account.yaml.tmpl b/cmd/fluxctl/install/templates/flux-account.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install-assets/flux-account.yaml.tmpl
rename to cmd/fluxctl/install/templates/flux-account.yaml.tmpl
diff --git a/cmd/fluxctl/install-assets/flux-deployment.yaml.tmpl b/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install-assets/flux-deployment.yaml.tmpl
rename to cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
diff --git a/cmd/fluxctl/install-assets/flux-secret.yaml.tmpl b/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install-assets/flux-secret.yaml.tmpl
rename to cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
diff --git a/cmd/fluxctl/install-assets/memcache-dep.yaml.tmpl b/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install-assets/memcache-dep.yaml.tmpl
rename to cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
diff --git a/cmd/fluxctl/install-assets/memcache-svc.yaml.tmpl b/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install-assets/memcache-svc.yaml.tmpl
rename to cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
diff --git a/go.mod b/go.mod
index 68d9d49e9..9c3cce6b1 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,6 @@ require (
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible
 	github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
@@ -52,6 +51,8 @@ require (
 	github.com/prometheus/common v0.3.0 // indirect
 	github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142 // indirect
 	github.com/ryanuber/go-glob v1.0.0
+	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
+	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/sirupsen/logrus v1.4.1 // indirect
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3
diff --git a/go.sum b/go.sum
index 526019540..7547385c4 100644
--- a/go.sum
+++ b/go.sum
@@ -138,8 +138,6 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible h1:eX6cWzw+KSwhN430wwbdWPgqnlbnK5ux76/q5ko+Qu8=
-github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/justinbarrick/go-k8s-portforward v1.0.2/go.mod h1:klMOboLnC1/UlkyJnYFjcMcbOtwAcKop+LkIZ4r428o=
 github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d h1:xQ/ZtcWCKzWg5QbOhq6RFPvevl+IE580Vm0Vgxuw3xs=
@@ -208,6 +206,10 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
+github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0=
+github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
diff --git a/tools.go b/tools.go
index 9e51b6995..29a2a5ccd 100644
--- a/tools.go
+++ b/tools.go
@@ -6,6 +6,6 @@
 package flux
 
 import (
-	_ "github.com/jteeuwen/go-bindata"
+	_ "github.com/shurcooL/vfsgen"
 	_ "k8s.io/code-generator"
 )

From cc6e2deafb00a73480c527992c885652e6cdf77c Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 15:51:09 +0200
Subject: [PATCH 068/158] Update arguments and implement command

The templates haven't been implemented yet
---
 Makefile                                      |  2 +-
 cmd/fluxctl/install/generate.go               |  2 +-
 .../install/generated_templates.gogen.go      |  4 +-
 cmd/fluxctl/install/install.go                | 51 +++++++++++++++++++
 cmd/fluxctl/install_cmd.go                    | 39 +++++++-------
 go.mod                                        |  2 +-
 6 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 cmd/fluxctl/install/install.go

diff --git a/Makefile b/Makefile
index b2ae38952..f30a91ec0 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/install/generated_templates.gogen.go: cmd/fluxctl/install/templates/*
+cmd/fluxctl/install/generated_templates.gogen.go: cmd/fluxctl/install/templates/* cmd/fluxctl/install/generate.go
 	cd cmd/fluxctl/install && go run generate.go
 
 check-generated: cmd/fluxctl/install/generated_templates.gogen.go
diff --git a/cmd/fluxctl/install/generate.go b/cmd/fluxctl/install/generate.go
index 716bf8eb6..5991238f8 100644
--- a/cmd/fluxctl/install/generate.go
+++ b/cmd/fluxctl/install/generate.go
@@ -14,7 +14,7 @@ func main() {
 	err := vfsgen.Generate(fs, vfsgen.Options{
 		Filename:     "generated_templates.gogen.go",
 		PackageName:  "install",
-		VariableName: "Templates",
+		VariableName: "templates",
 	})
 	if err != nil {
 		log.Fatalln(err)
diff --git a/cmd/fluxctl/install/generated_templates.gogen.go b/cmd/fluxctl/install/generated_templates.gogen.go
index 5845e9233..bbd5c459a 100644
--- a/cmd/fluxctl/install/generated_templates.gogen.go
+++ b/cmd/fluxctl/install/generated_templates.gogen.go
@@ -14,8 +14,8 @@ import (
 	"time"
 )
 
-// Templates statically implements the virtual filesystem provided to vfsgen.
-var Templates = func() http.FileSystem {
+// templates statically implements the virtual filesystem provided to vfsgen.
+var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
diff --git a/cmd/fluxctl/install/install.go b/cmd/fluxctl/install/install.go
new file mode 100644
index 000000000..b9a45a2ac
--- /dev/null
+++ b/cmd/fluxctl/install/install.go
@@ -0,0 +1,51 @@
+package install
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"text/template"
+
+	"github.com/shurcooL/httpfs/vfsutil"
+)
+
+type TemplateParameters struct {
+	GitURL             string
+	GitBranch          string
+	GitPaths           []string
+	GitLabel           string
+	GitUser            string
+	GitEmail           string
+	Namespace          string
+	AdditionalFluxArgs []string
+}
+
+func FillInInstallTemplates(opts TemplateParameters) (io.Reader, error) {
+	result := bytes.NewBuffer(nil)
+	err := vfsutil.WalkFiles(templates, "/", func(path string, info os.FileInfo, rs io.ReadSeeker, err error) error {
+		if err != nil {
+			return fmt.Errorf("cannot walk embedded files: %s", err)
+		}
+		if info.IsDir() {
+			return nil
+		}
+		templateBytes, err := ioutil.ReadAll(rs)
+		if err != nil {
+			return fmt.Errorf("cannot read embedded file %q: %s", info.Name(), err)
+		}
+		template, err := template.New(info.Name()).Parse(string(templateBytes))
+		if err != nil {
+			return fmt.Errorf("cannot parse embedded file %q: %s", info.Name(), err)
+		}
+		if err := template.Execute(result, opts); err != nil {
+			return fmt.Errorf("cannot execute template for embedded file %q: %s", info.Name(), err)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, fmt.Errorf("internal error filling embedded installation templates: %s", err)
+	}
+	return result, nil
+}
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index 732f7ef20..795a66bce 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -1,19 +1,15 @@
 package main
 
 import (
+	"io"
+	"os"
+
 	"github.com/spf13/cobra"
+
+	"github.com/weaveworks/flux/cmd/fluxctl/install"
 )
 
-type installOpts struct {
-	gitURL             string
-	gitBranch          string
-	gitPaths           []string
-	gitLabel           string
-	gitUser            string
-	gitEmail           string
-	namespace          string
-	additionalFluxArgs []string
-}
+type installOpts install.TemplateParameters
 
 func newInstall() *installOpts {
 	return &installOpts{}
@@ -27,27 +23,30 @@ func (opts *installOpts) Command() *cobra.Command {
 fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | kubectl -f -`,
 		RunE: opts.RunE,
 	}
-	cmd.Flags().StringVarP(&opts.gitURL, "git-url", "", "",
+	cmd.Flags().StringVarP(&opts.GitURL, "git-url", "", "",
 		"URL of the Git repository to be used by Flux, e.g. git@github.com:<your username>/flux-get-started")
-	cmd.Flags().StringVarP(&opts.gitBranch, "git-branch", "", "master",
+	cmd.Flags().StringVarP(&opts.GitBranch, "git-branch", "", "master",
 		"Git branch to be used by Flux")
-	cmd.Flags().StringVarP(&opts.gitLabel, "git-label", "", "flux",
+	cmd.Flags().StringVarP(&opts.GitLabel, "git-label", "", "flux",
 		"Git label to keep track of Flux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
-	cmd.Flags().StringVarP(&opts.gitUser, "git-user", "", "Flux",
+	cmd.Flags().StringVarP(&opts.GitUser, "git-user", "", "Flux",
 		"Username to use as git committer")
-	cmd.Flags().StringVarP(&opts.gitEmail, "git-email", "", "flux-dev@googlegroups.com",
+	cmd.Flags().StringVarP(&opts.GitEmail, "git-email", "", "flux-dev@googlegroups.com",
 		"Email to use as git committer")
-	cmd.Flags().StringVarP(&opts.namespace, "namespace", "", "flux",
+	cmd.Flags().StringVarP(&opts.Namespace, "namespace", "", "flux",
 		"Cluster namespace where to install flux")
-	cmd.Flags().StringSliceVarP(&opts.additionalFluxArgs, "extra-flux-args", "", []string{},
+	cmd.Flags().StringSliceVarP(&opts.AdditionalFluxArgs, "extra-flux-args", "", []string{},
 		"Additional arguments for Flux as CSVs, e.g. --extra-flux-arg='--manifest-generation=true,--sync-garbage-collection=true'")
 	return cmd
 }
 
 func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
-	//0. Read and patch embedded templates manifests with what was passed to as options
-
-	//1. Print them
+	templates, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(os.Stdout, templates)
+	return err
 
 	return nil
 }
diff --git a/go.mod b/go.mod
index 9c3cce6b1..9b1f9102c 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
 	github.com/prometheus/common v0.3.0 // indirect
 	github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142 // indirect
 	github.com/ryanuber/go-glob v1.0.0
-	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
+	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/sirupsen/logrus v1.4.1 // indirect
 	github.com/spf13/cobra v0.0.3

From 68fe2fe424beee13fb5545c5625537a37b0ecd8a Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 16:49:14 +0200
Subject: [PATCH 069/158] Fill in the templates

---
 .../install/generated_templates.gogen.go      | 30 +++++++--------
 cmd/fluxctl/install/install.go                | 11 ++++--
 .../install/templates/flux-account.yaml.tmpl  |  3 +-
 .../templates/flux-deployment.yaml.tmpl       | 18 +++++----
 .../install/templates/flux-secret.yaml.tmpl   |  1 +
 .../install/templates/memcache-dep.yaml.tmpl  |  1 +
 .../install/templates/memcache-svc.yaml.tmpl  |  3 +-
 cmd/fluxctl/install_cmd.go                    | 10 ++++-
 go.mod                                        |  2 +-
 go.sum                                        | 38 +++++++++++++++++++
 10 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/cmd/fluxctl/install/generated_templates.gogen.go b/cmd/fluxctl/install/generated_templates.gogen.go
index bbd5c459a..bd2953232 100644
--- a/cmd/fluxctl/install/generated_templates.gogen.go
+++ b/cmd/fluxctl/install/generated_templates.gogen.go
@@ -19,40 +19,40 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 24, 12, 44, 40, 451689542, time.UTC),
+			modTime: time.Date(2019, 7, 24, 14, 59, 5, 476026678, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
-			uncompressedSize: 725,
+			modTime:          time.Date(2019, 7, 24, 14, 31, 52, 545386882, time.UTC),
+			uncompressedSize: 764,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x51\xbd\x6e\xf3\x30\x0c\xdc\xf5\x14\x04\x32\xe4\xfb\x8a\xd8\x45\xb6\xc2\x5b\x92\xa1\x43\x3b\xb9\x3f\x4b\xd1\x81\x92\xe8\x46\x8d\x22\x1a\x94\xe4\xfe\x3c\x7d\xe1\x38\x01\x62\xa4\x2d\x10\xa0\x1b\x79\x38\xf2\xee\xc8\xa2\x28\xd4\x04\xee\xd7\x04\x91\xa4\x73\x86\x00\x8d\xe1\x1c\xd2\x0c\x8c\xcf\x31\x91\x80\xb0\xa7\x38\x03\x0c\x76\x04\x81\x76\xc1\xba\xf0\x02\x28\xa4\x26\xc0\xc1\x7f\x40\x20\xb2\x64\xa1\x61\x81\x9b\xac\x49\x02\x25\x8a\xf0\xe6\xd2\x7a\x37\x52\x68\x8c\x64\x7b\x05\x8a\x11\x0c\x87\x24\xec\xe1\x5f\xbd\x5c\xac\xfe\x97\x0a\x5b\xf7\x48\x12\x1d\x87\x0a\xba\xb9\xda\xb8\x60\x2b\xb8\x1b\x5c\x2d\x06\x53\x6a\x4b\x09\x2d\x26\xac\x14\x80\x47\x4d\x3e\xf6\x15\x40\xc0\x2d\x55\xd0\xf8\xfc\xae\x46\x4d\x1f\xef\x78\xaf\x68\x34\x25\xe6\xb4\x66\x71\x9f\x98\x1c\x87\x72\x73\x15\x4b\xc7\x97\xdd\x5c\x53\xc2\x83\xec\x6a\x08\x5a\xb3\xa7\xb3\x35\x25\x7b\xda\x51\x0a\xc0\xd6\x5d\x0b\xe7\x36\x56\xf0\x34\xbd\x98\x3e\xef\xe6\x84\x22\x67\x31\x34\x02\x3b\x12\x7d\x04\x14\x10\x38\xd4\x7b\xe2\x43\x7d\xfb\x33\xf7\x0f\x12\x2e\x87\x47\x9e\x1f\x94\x3d\xd5\xd4\xf4\xa4\x43\xd0\x5f\xf4\x15\xc0\xe9\x6d\x47\xfb\x62\xd6\xaf\x64\xd2\xfe\x76\xdf\xfe\xff\xc4\xce\xd0\xc6\x16\x0d\x55\x60\xa9\xc1\xec\x93\xfa\x0a\x00\x00\xff\xff\xb1\x6e\xe4\xd9\xd5\x02\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x52\xbb\x6e\xc2\x30\x14\xdd\xfd\x15\x47\x62\xa0\xad\x48\x2a\xb6\x2a\x1b\x30\x74\x68\xd5\x21\x7d\x2c\x55\x87\x6b\xe7\x52\x5c\x8c\x1d\xf9\x91\x3e\x10\xff\x5e\x85\x80\x04\x82\x22\x21\x75\xcb\x3d\x3a\x37\xe7\x71\x9d\x65\x99\xe8\xe1\x69\xc6\x08\xec\x1b\xad\x18\xa4\x94\x4b\x36\x0e\xa0\x4c\x0a\x91\x3d\xbc\x33\x1c\x06\x20\x5b\xed\x41\x90\xda\x56\xda\xbe\x83\x3c\x8b\x1e\x9c\x35\xdf\xb0\xcc\x15\x57\x98\x3a\x8f\xbb\x24\xd9\x5b\x8e\x1c\xf0\xa9\xe3\x6c\xbd\x92\x49\x0a\x5c\xb5\x0a\x1c\x02\x94\xb3\xd1\x3b\x83\x8b\x72\x3c\x9a\x5c\xe6\x82\x6a\xfd\xc2\x3e\x68\x67\x0b\x34\x43\x31\xd7\xb6\x2a\xf0\xd8\xb9\x1a\x75\xa6\xc4\x82\x23\x55\x14\xa9\x10\x80\x21\xc9\x26\xb4\x5f\x80\xa5\x05\x17\x98\x9a\xf4\x25\x8e\x0c\xa1\x26\xc5\x05\x96\x4b\xe4\x0f\xdb\x11\xab\x95\x68\xc3\xef\xaa\x7a\x49\x2a\xa7\x14\x67\xce\xeb\x1f\x8a\xda\xd9\x7c\x7e\x13\x72\xed\xae\x9b\xa1\xe4\x48\x5b\x53\x93\xae\x86\xd2\x19\x3e\xdb\x91\x4f\x86\xd7\x94\x0c\x54\xeb\x5b\xef\x52\x1d\x0a\xbc\xf6\xaf\xfa\x6f\xeb\x3d\xcf\xc1\x25\xaf\x78\x0f\x6c\xd8\xcb\x1d\x20\x83\x75\xb6\xdc\x10\x9f\xcb\xfb\xbf\xb9\xff\x90\x70\xdc\x9d\xf9\xfc\xa0\xce\x70\xc9\xd3\x96\xb4\x0d\x7a\x42\x5f\x00\x87\xdd\xee\xfd\x2f\x24\xf9\xc1\x2a\x6e\xba\x3b\xfa\x3a\x0e\xec\x9c\x3e\xff\x6f\x00\x00\x00\xff\xff\xd0\x46\x0b\xa3\xfc\x02\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
-			uncompressedSize: 5419,
+			modTime:          time.Date(2019, 7, 24, 14, 54, 42, 529577876, time.UTC),
+			uncompressedSize: 5418,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x9c\x00\xd2\xea\xe4\x4b\x8b\x62\x53\x05\x6d\xed\xc6\x35\x1c\xdb\x07\xbb\x6e\xd1\xa7\x86\xe2\x8e\xb4\x84\xb8\xe4\x96\x33\x2b\x45\xdf\xbe\x18\x72\xff\x70\x4f\x77\x76\xe0\x3c\xc4\x07\xee\x70\xfe\xfc\x66\xf8\x9b\x19\xad\x56\xab\x1b\xd5\x9a\x7f\x61\x20\xe3\x5d\x09\xaa\x6d\x69\x7d\xda\xdc\x1c\x8d\xab\x4a\x78\x85\xad\xf5\x97\x06\x1d\xdf\x34\xc8\xaa\x52\xac\xca\x1b\x00\xa7\x1a\x2c\x61\x6f\xbb\xdf\x6e\xa8\x45\x2d\x47\x01\x5b\x6b\xb4\xa2\x12\x36\x37\x00\x84\x16\x35\xfb\x20\x5f\x00\x1a\xc5\xba\xfe\x45\xed\xd0\x52\x3a\x98\x69\x00\x20\x0e\x8a\xf1\x70\x49\x1f\xf9\xd2\x62\x09\x1f\x51\x07\x54\x8c\x37\x00\x8c\x4d\x6b\x15\x63\xaf\x2c\xf3\x43\xfe\x53\xce\x79\x56\x6c\xbc\x1b\x95\x03\xb4\xc1\x37\xc8\x35\x76\x54\x18\x5f\xb4\x3e\x70\x09\x8b\xbb\xdb\xbb\xcd\x02\x9e\x01\xa3\xb5\x99\x04\xb0\x07\xd2\x41\xb5\x08\xeb\x06\x39\x18\x4d\x80\xae\x6a\xbd\x71\xfc\x9c\x40\x2e\x17\xbd\x62\x3b\x8b\xe1\x41\x14\x00\x03\x16\xf1\x6f\x0c\x27\xa3\xf1\xaf\x5a\xfb\xce\xf1\xfb\xb9\x20\xc0\xc9\xdb\xae\xc1\x51\xd5\xaa\x57\x75\x30\xbc\x3a\xe2\x65\x34\x40\x82\x02\x4f\x06\x87\x93\x49\xdf\x4a\xae\x54\x31\x4d\x99\x54\x85\x7b\xd5\x59\x7e\xe7\x2b\x2c\xe1\xf6\x87\xdb\x5b\x78\x06\xe7\x1a\x1d\x34\xe2\x0d\x56\x10\x50\x55\x2b\xef\xec\x65\x09\x67\x84\xb3\x77\xcf\x19\x76\x08\x6a\x67\x51\xf0\xd0\x75\xe3\xab\x9b\x5e\xe1\x33\xf8\x67\x6d\x08\x0c\x81\x02\x6e\xda\x3d\x41\x47\x58\xc1\xde\x07\x38\xa0\xc3\xa0\xd8\xb8\x03\x7c\xfa\xf4\x0f\x38\xe2\x85\x0a\x78\xe3\xe0\xed\x9f\x08\x7e\xda\xc2\xa6\xd8\xdc\x2e\x47\x2d\x83\xed\x14\x02\x81\x0a\x98\xfb\x41\x5e\x5c\x71\x88\x15\x28\x20\x6c\x95\x14\x45\x0f\x14\x9c\x71\x54\xa3\x95\x83\x73\x30\x2c\x8e\x16\x8f\xe3\x77\x40\x37\x82\x81\x4d\xcb\x97\x57\x26\xe4\x20\x36\x58\x99\xae\x29\xe1\x1d\x36\x3e\x5c\xf2\x38\x11\xf6\xde\x5a\x7f\x96\x88\x7a\xd3\x86\x62\xa8\x1d\xc9\x99\x02\xdd\x11\xfb\xc6\x08\x02\x47\xe7\xcf\xee\xbf\xb5\x27\xa6\x51\xc5\xde\x58\x5c\xc2\xb9\x36\xba\x86\x8b\xef\xe0\x6c\xac\x4d\x41\xb1\x87\xca\x83\xd9\xc7\x63\xb9\x24\x7f\x04\xf0\x67\x27\x6e\x8f\x0a\x02\xb6\x1e\x82\xe2\x1a\x03\x70\xad\x5c\x6f\xf8\x60\xb8\xee\x76\xe0\xe5\x10\xc1\x9a\x23\x16\xf0\x1f\xdf\x3d\xb7\x16\x94\x25\x3f\x98\x98\x83\x0d\x86\xc1\x38\xf6\xf1\x8e\xf6\x8e\x95\x71\x18\x96\xb0\x43\xeb\xcf\x05\x7c\xc2\x09\xd5\x9a\xb9\xa5\x72\xbd\x4e\x76\x0a\xed\x9b\xf5\x19\xd5\x09\xcf\x3e\x1c\x69\x2d\x95\xb6\xde\x59\xbf\x5b\x37\x8a\x18\xc3\x9a\x0c\xe3\x9a\x58\xb9\x4a\x59\xef\x70\x45\xc8\x5d\x5b\x34\xd5\xb3\xe8\xed\x4a\xad\xda\x60\x4e\x8a\x31\x96\xa7\x04\x3b\x1a\x1a\x52\x45\x54\xaf\xb4\x77\x7b\x73\x18\x3f\x01\xa4\x83\x77\xaa\x2d\xb3\xc3\xfc\x9d\xad\xb2\x6b\xdf\x9a\xb6\xe2\xd8\xed\x70\x9d\x94\x4c\xd5\xf9\xd5\x94\x9d\x0d\xd5\x72\x52\xab\x13\x82\x82\xca\xec\xf7\x18\x84\x19\x07\x0d\xfd\xa3\x8b\xde\x52\xab\x74\xca\x50\x52\x97\xe7\x48\xb8\xe7\x64\x2a\x1c\xb2\xb2\x37\x87\x46\xb5\x93\x23\x86\x6b\x50\x0e\xd0\x71\xb8\xc4\x18\x7e\x4d\x42\xbf\x2e\x41\xb9\x0a\x3a\xa7\x7d\x23\x94\x1c\xef\xa7\x68\xdf\xc5\x6c\x2b\x57\x8d\x5a\xd0\x9d\xa2\x06\x83\xd4\xa7\xfb\x2a\x03\x02\xc3\x37\x64\x20\xbb\xf6\xd5\x0c\x44\xa2\x60\x0f\xa6\x11\x1a\x85\xd7\xf7\xaf\x23\x47\xc0\x77\x12\x16\x99\x83\x33\x6e\x32\x2e\xc1\x9d\x30\x98\xbd\xd1\x91\xcf\xa1\xed\x42\xeb\x09\xe9\xfb\xdf\x01\xe4\xa8\x25\xb1\x4b\x42\x51\x00\x12\x7b\xbf\x03\x38\x50\xe1\x30\xbd\xe2\x27\x10\x3b\xb4\x07\xa1\x17\xca\xa0\x99\x33\xf4\xb3\x27\x38\xfa\xfa\xde\x23\x1c\x3d\xc0\x39\x3e\xd4\xab\xf6\x90\x35\x90\x1e\xf5\x80\x91\x46\x9d\x87\x45\x29\x3d\x92\x78\x01\xa6\x51\x07\x4c\xd5\x2f\x17\x0a\xf8\xd9\xb8\x2a\xc6\xdc\x08\xeb\x04\xd4\x53\xd5\x26\xc6\xb1\xa8\x08\x85\x5b\xe2\x55\x49\x82\x0c\x03\xa0\x78\xa4\x05\xe1\x84\xca\xeb\x23\x86\x48\x0d\xe1\x8a\x1c\x58\x8d\xf0\x0d\xb9\x94\x91\x40\xe9\x54\xe6\xac\x0e\x20\xde\x16\xa3\x4c\x34\x55\x42\xaf\xd4\xf8\xa8\x46\x57\xf1\x9f\x72\x53\x6c\xee\x8a\x17\x73\xd9\xfb\xce\xda\x7b\x6f\x8d\xbe\x94\xf0\x66\xff\xde\xf3\x7d\x40\xca\x23\x09\x48\xbe\x0b\x1a\x29\xa7\xfa\x80\xff\xeb\x90\x78\x76\x06\xa0\xdb\xae\x84\x3f\xdc\x36\xb3\xc3\x26\x76\x83\x12\xfe\xf8\xc3\x3b\x33\x4d\x12\x3e\xe4\x97\x57\x53\x76\xee\xe3\x54\x71\x77\x7b\x27\xcd\xd5\xb8\xbd\x0f\x4d\x2c\x5b\x65\x47\xe9\xac\xc6\x66\x3a\x1e\x6f\xf6\x90\x48\xfb\x5e\x71\x5d\xc2\x1a\x59\x47\x2c\xaa\x35\x51\x2d\x53\x8b\x4f\x73\x14\x58\xdf\x3f\x8f\x83\x39\xa1\x03\xe3\x12\x3c\xcf\x29\xdd\x21\xaa\xd7\xb3\x57\x9d\x50\x50\xd5\x07\x67\x2f\x25\x70\xe8\x50\xb4\x49\x47\x8f\x0f\x6a\xd7\xf3\x90\x54\x40\x8b\x61\xef\x83\x46\x51\x9a\x5a\xb8\x74\xf0\xa7\x1c\xcf\xbb\xec\xdc\xf7\x93\x0a\xbd\xef\x49\xec\xdb\xdc\xcf\xca\xe9\x8d\xd3\xb6\x8b\x0f\x5d\x06\x91\xc4\xc7\x03\x09\xa4\x4e\xf7\x95\xc6\x3c\xb4\xe6\x1f\xe5\xea\x83\xa6\x39\x92\x01\x54\xa8\xad\x0a\x32\x80\xec\xfc\x29\xab\xd5\x2f\x74\xad\xf4\x9a\xf3\xe0\x83\xf7\xbc\x2e\x88\xea\x27\x03\x50\x6e\x66\x75\x31\x31\xea\x22\x59\x5e\x0e\x22\x99\x06\x74\x27\x13\xbc\x8b\xfc\x95\x5a\xc3\xe2\xed\xe7\xbf\xfd\xfd\xe5\x87\xf7\x3f\xbf\x79\xbd\x48\x8c\xb5\x14\x3c\xfc\x09\x43\x98\xb7\x97\x4c\x4d\x64\xe4\xdd\x25\x91\x3f\xdb\xc7\x62\xbc\xea\x0b\xd7\x31\x4e\xc5\x29\xc2\x4f\x06\x2a\x14\x2d\x63\xf4\x60\x4d\x18\x25\xeb\x9c\xbd\x77\x31\x27\x99\x8a\x87\xfd\x37\x4f\x7a\x6c\xbe\xc3\x20\xa9\x1c\x28\xcb\x18\x9c\x0c\x8a\x57\x1e\xef\x83\x6f\xa4\x2c\x86\x06\xbb\x04\x45\x52\x6e\x7d\x13\x10\x18\xac\xd7\x47\xba\x4e\x36\xba\x53\xf9\x08\x2e\x13\xdc\x33\x5c\x4e\xca\x76\x78\x85\xc9\xd7\x8a\xf8\x61\x0d\x0c\x2d\xe2\x0b\x15\x20\x1d\x6a\xde\x99\xbe\xd0\x9b\x9e\xa8\x4b\x91\x4a\xcd\x78\x26\x37\xe7\x87\xc9\x69\x31\x59\xce\x62\x48\x69\x48\x0b\x07\x56\xc2\x99\x5a\xe9\x1a\x2b\x41\x36\x4f\xed\x38\x04\x49\x12\x05\x96\x65\xa6\xc5\x87\x7e\xca\xc9\x2e\xf4\x0b\x53\xbc\xb8\x8c\x46\x64\xd0\xa7\xae\x6d\xed\x45\x80\xa0\x1c\x8a\x69\xd6\xe0\xb3\x17\x2f\x3b\x49\x69\x2c\xb8\xb8\xdd\xc5\x3c\x40\xed\xcf\x71\x99\xf1\xce\xa1\xe6\x38\x87\xf0\x1c\xba\xd5\x6a\x0c\x20\x4e\xa9\x62\x7c\x3b\x1e\x15\x7d\x8b\x2e\xe8\xa4\x0b\x6d\x3b\x99\x7c\x0b\xe1\x2f\x9b\x43\xf2\x99\xd2\x53\x9b\xa0\x78\x99\x44\xdf\xdc\xcf\x82\x92\x57\x47\xc8\x71\x59\x9a\x27\x76\xf2\x61\x90\x97\x95\x94\x83\x48\xc6\xf5\x25\x63\xe0\xdc\xe3\x5e\x7a\x7b\x33\x9b\x09\x0c\x41\xd3\x51\x5c\xe7\x22\x7a\x06\xab\x54\x4d\xbb\xc8\xeb\xb1\x1b\xc7\x2d\xee\xbb\x61\x35\xfa\x3e\xf7\x65\x78\x5b\xa9\x0a\x65\x88\xc8\x96\xb9\x99\x23\xc2\x85\x89\xdf\x57\x95\x09\xdb\x2b\xd6\xcf\xdd\xfa\xd8\xcf\x02\x3e\x40\xc0\xc6\x9f\x12\x64\x53\x1a\x3f\x7f\xfc\xa5\x98\x29\x97\x1e\xd3\x05\xbb\x3d\x18\xfe\xcb\xb4\x93\x94\x0f\xc6\x8e\xd5\x01\x79\x45\xac\x02\x63\x75\x75\x7d\x17\x94\xd3\xf5\x36\x6d\x2c\x99\x2f\xe6\x91\x66\x72\x56\x2e\x16\x48\x40\xc1\x5d\xa7\x11\xb1\x51\xce\xec\x65\x78\x90\x12\x22\x53\x61\x48\xdc\xf9\x60\x0c\x8b\xfb\x95\x27\x84\xce\x55\x18\x1e\x04\x16\xd0\x2a\x36\x27\x84\x56\x71\x4d\x43\x02\x0e\x86\xe3\xa2\x47\x86\x65\x01\x9d\x97\xa4\xf8\x2e\xd2\x5b\xea\x76\x95\x09\x9b\x65\xfa\xf7\xc5\xe3\x5c\x82\x52\x7e\x67\x2f\x5e\xa0\x8b\xfb\xbb\x28\x17\x92\x33\xfc\x60\xc4\xce\x0d\xf4\x74\xd1\x93\xc1\xf6\x0b\xec\x30\xdc\xe8\x75\xc9\xad\xed\x9f\x8f\x78\x01\x53\xfd\x34\x8a\x7d\xa1\x03\x64\x5e\x89\x0a\xc5\x5d\xc0\xd9\x9c\xff\x88\xad\xf8\xf9\xb2\x1a\xe5\xe9\xe9\xd8\x1d\xfe\xc6\x03\x00\xd9\x4b\x57\x0e\x16\x5d\x4b\x1c\x50\x35\x8b\xe1\x1d\x66\x4a\xbe\xc3\xe2\x50\x2c\xe1\xdf\x52\x4f\xf0\xd2\xfa\xae\xfa\xbe\x88\x6b\x0c\xfb\xa3\x8c\x25\x04\xad\x0a\x6c\x74\x67\x55\x80\x7e\x83\xee\xb5\x3c\xa4\x90\xde\xea\xf6\x4c\x32\x29\x6b\xd1\x55\xc4\x3a\x2d\x52\xa1\xaa\xd6\xac\x1f\x94\x8c\x5c\x8b\x86\xb6\x6a\xa7\x37\x2f\xee\xae\xff\x9f\x07\xfc\x09\xc3\xe9\x91\x1f\xa7\xa4\x9b\x4e\xfc\x29\x59\xfb\x31\x7f\xc8\xea\x28\x04\x10\x12\x99\x20\x67\xbf\x78\x3d\xcf\x7e\x34\xcb\x7e\xfd\x92\x10\xe3\x9a\x16\x3b\xda\xfc\x39\x5a\x43\x8c\x6e\xd5\xbb\xb0\x2d\xef\x6e\xef\x36\xd3\xfa\xf7\xa1\x4d\x83\x2f\xbc\x7a\xff\x69\xe0\x38\x5a\xf6\xad\xb7\x0b\x3d\xe3\x81\xab\x3c\x13\xf8\x28\x0c\x8d\xba\xc4\x89\xdd\x9e\xa6\xdd\xcd\x91\xf5\xfe\xd8\xb5\x60\x88\x3a\x24\xf0\x0e\xc8\x37\x08\x6f\xbb\x1d\x06\x87\x8c\x04\xf1\x87\x06\x9a\x56\xb3\xca\xd1\xb0\x14\x2c\xde\x7b\x87\x8b\xfc\xcb\xcb\xe8\x40\xbe\x9c\x25\xe3\x34\xdf\xd7\x86\x16\x1a\xfd\x9b\x7d\x19\xbb\xfb\x62\xb3\xb8\xf9\x7f\x00\x00\x00\xff\xff\xe2\xd9\xda\x0a\x2b\x15\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x6d\x6f\xdb\x46\xf2\x7f\xaf\x4f\x31\x50\x5e\x38\x01\x24\xca\xaa\xfb\xff\xe3\xc0\x9e\x0a\xa4\x49\x93\xf3\xa5\x76\x8c\xfa\x72\x87\x7b\x75\x5d\x2d\x47\xe2\x42\xcb\x5d\xde\xce\x52\x8a\x60\xf8\xbb\x1f\x66\x97\x0f\x4b\x4b\x76\x8a\xf4\x45\x63\x91\xf3\xfc\xf0\x9b\x19\xce\xe7\xf3\x89\xa8\xd5\x3f\xd1\x91\xb2\x26\x07\x51\xd7\xb4\xd8\x2f\x27\x3b\x65\x8a\x1c\xde\x63\xad\xed\xb1\x42\xe3\x27\x15\x7a\x51\x08\x2f\xf2\x09\x80\x11\x15\xe6\xb0\xd1\xcd\xd7\xf6\x07\xd5\x42\x62\x0e\x0f\x0f\x90\xdd\x76\x3f\xe1\xf1\x71\x42\x35\x4a\x66\x70\x58\x6b\x25\x05\xe5\xb0\x9c\x00\x10\x6a\x94\xde\x3a\x7e\x03\x50\x09\x2f\xcb\xdf\xc4\x1a\x35\xc5\x07\x4f\xe4\x93\x77\xc2\xe3\xf6\x18\x5f\xfa\x63\x8d\x39\xfc\x8e\xd2\xa1\xf0\x38\x01\xf0\x58\xd5\x5a\x78\x6c\x85\x25\x56\xf2\x7f\xc2\x18\xeb\x85\x57\xd6\xf4\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\xa6\x57\x97\x57\xcb\x29\xbc\x02\x8f\x5a\x27\x14\xe0\x2d\x90\x74\xa2\x46\x58\x54\xe8\x9d\x92\x04\x68\x8a\xda\x2a\xe3\x2f\x08\x98\x39\x6b\x05\xeb\x91\x0f\x4f\xbc\x00\xe8\x62\x11\xfe\x46\xb7\x57\x12\xdf\x4a\x69\x1b\xe3\x6f\xc7\x84\x00\x7b\xab\x9b\x0a\x7b\x51\xf3\x56\xd4\x56\xf9\xf9\x0e\x8f\xbd\x02\xe2\x28\xf8\x41\x61\xf7\x64\x90\x37\x67\x96\x22\x24\x31\xa1\x2a\x70\x23\x1a\xed\x6f\x6c\x81\x39\x5c\xfe\x78\x79\x09\xaf\xe0\x50\xa2\x81\x8a\xad\xc1\x02\x1c\x8a\x62\x6e\x8d\x3e\xce\xe0\x80\x70\xb0\xe6\xc2\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\x62\xd2\x0a\x7c\x05\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\xee\xef\xff\x06\x3b\x3c\x52\x06\xd7\x06\x3e\xfd\x85\xe0\xe7\x15\x2c\xb3\xe5\xe5\xac\x97\xd2\xe9\x8e\x2e\x10\x08\x87\xa9\x1d\x64\xd9\x14\x83\x58\x80\x00\xc2\x5a\x70\x51\xb4\x81\x82\x03\xf6\x62\xa4\x30\x70\x70\xca\xb3\xa1\xd9\xf9\xf8\x6d\xd1\xf4\xc1\xc0\xaa\xf6\xc7\xf7\xca\xa5\x41\xac\xb0\x50\x4d\x95\xc3\x0d\x56\xd6\x1d\x53\x3f\x11\x36\x56\x6b\x7b\x60\x8f\x5a\xd5\x8a\x82\xab\x0d\xf1\x33\x01\xb2\x21\x6f\x2b\xc5\x11\xd8\x19\x7b\x30\xff\x29\x2d\x79\xea\x45\x6c\x94\xc6\x19\x1c\x4a\x25\x4b\x38\xda\x06\x0e\x4a\xeb\xe8\x94\xb7\x50\x58\x50\x9b\xf0\x98\x99\xf8\x0f\x07\xf6\x60\xd8\xec\x5e\x80\xc3\xda\x82\x13\xbe\x44\x07\xbe\x14\xa6\x55\xbc\x55\xbe\x6c\xd6\x60\xf9\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\xb9\xd0\x1a\x84\x26\xdb\xa9\x18\x07\x1b\x94\x07\x65\xbc\x0d\x3c\xd2\x1a\x2f\x94\x41\x37\x83\x35\x6a\x7b\xc8\xe0\x1e\x87\xa8\x96\xde\xd7\x94\x2f\x16\x51\x4f\x26\x6d\xb5\x38\xa0\xd8\xe3\xc1\xba\x1d\x2d\xb8\xd2\x16\x6b\x6d\xd7\x8b\x4a\x90\x47\xb7\x20\xe5\x71\x41\x5e\x98\x42\x68\x6b\x70\x4e\xe8\x9b\x3a\xab\x8a\x57\xc1\xda\xb9\x98\xd7\x4e\xed\x85\xc7\x50\x9e\xec\x6c\xaf\xa8\x4b\x15\x51\x39\x97\xd6\x6c\xd4\xb6\x7f\x05\x10\x1f\xdc\x88\x3a\x4f\x1e\xa6\x7d\x36\x4f\xd8\xbe\x37\x6d\xd9\xae\x59\xe3\x22\x0a\x19\xaa\xf3\x9b\x29\x3b\x28\x2a\xf9\x49\x29\xf6\x08\x02\x0a\xb5\xd9\xa0\x63\xdc\xec\x24\xb4\x4d\x37\xc0\x65\xc8\x50\x14\x97\xe6\x88\xb1\x67\xaf\x0a\xec\xb2\xb2\x51\xdb\x4a\xd4\x83\x21\xca\x97\x20\x0c\xa0\xf1\xee\x18\x7c\xf8\x23\x12\xfd\x31\x03\x61\x0a\x68\x8c\xb4\x15\x03\x76\xe0\x8f\xde\xde\x84\x6c\x0b\x53\xf4\x52\xd0\xec\x83\x04\x85\xd4\xa6\xfb\x24\x03\x1c\x86\xef\xc8\x40\xc2\xf6\xcd\x0c\x04\xa0\xf0\x16\x54\xc5\x30\x0a\x1f\xef\x3e\x06\x8c\x80\xd7\xec\x16\xa9\xad\x51\x66\x50\xce\xce\xed\xd1\xa9\x8d\x92\x01\xcf\xa1\x6e\x5c\x6d\x09\xe9\xcd\x9f\x08\x64\x2f\x25\xa2\x4b\x8c\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xa1\x8b\x9f\x89\xd8\xb6\xde\x32\xbc\x50\x12\x9a\x31\x42\xbf\x7a\x06\xa3\x4f\xf9\xce\x60\x74\x17\xce\xbe\x51\x4f\xc6\x43\x32\x40\xda\xa8\x3b\x0c\x30\x6a\x2c\x4c\x73\x9e\x91\xe4\xa7\xa0\x2a\xb1\xc5\x58\xfd\xcc\x90\xc1\x07\x65\x8a\xe0\x73\xc5\xa8\xe3\x50\x0e\x55\x1b\x11\x47\xa3\x20\x64\x6c\x09\xac\x9c\x04\x5e\x15\x40\xf8\x1e\x16\x18\x13\x0a\x2b\x77\xe8\x02\x34\xb8\x13\x70\xf0\xa2\x0f\x5f\x97\x4b\x5e\x09\x78\x4b\x60\xcd\x5e\x6c\x81\xad\xcd\x7a\x9a\xa0\x2a\x87\x56\xa8\xb2\x41\x8c\x2c\xc2\x3f\xf9\x32\x5b\x5e\x65\x3f\x8c\x69\xef\x1a\xad\xef\xac\x56\xf2\x98\xc3\xf5\xe6\xd6\xfa\x3b\x87\x94\x7a\xe2\x90\x6c\xe3\x24\x52\x0a\xf5\x0e\xff\xdb\x20\xf9\xd1\x33\x00\x59\x37\x39\xfc\xdf\x65\x35\x7a\x58\x85\x69\x90\xc3\xff\xff\x78\xa3\x86\x4d\xc2\xba\x94\x79\x3e\x64\xe7\x2e\x6c\x15\x57\x97\x57\x3c\x5c\x95\xd9\x58\x57\x85\xb2\x15\xba\xa7\x4e\x6a\x6c\x24\xe3\xfc\xb0\x87\x08\xda\x77\xc2\x97\x39\x2c\xd0\xcb\x10\x8b\x62\x41\x54\xf2\xd6\x62\xe3\x1e\x05\xda\xb6\xed\xb1\x55\x7b\x34\xa0\x4c\x0c\xcf\x05\x45\x1e\xa2\x72\x31\xea\xea\x18\x05\x51\x7c\x36\xfa\x98\x83\x77\x0d\xb2\x34\x9e\xe8\xa1\xa1\xd6\x2d\x0e\x71\x05\xd4\xe8\x36\xd6\x49\x64\xa1\x71\x84\xf3\x04\x7f\xce\xf0\x74\xca\x8e\x6d\xdf\x0b\xd7\xda\x1e\xc9\xbe\xcf\xfc\xa4\x9c\xae\x8d\xd4\x4d\x68\x74\x5e\x44\x22\x1e\x77\x20\x10\x27\xdd\x37\x06\x73\x37\x9a\x7f\x62\xd6\x27\x43\xb3\x07\x03\x28\x50\x6a\xe1\x78\x01\x59\xdb\x7d\x52\xab\x2f\x4c\xad\xd8\xcd\xa9\xf3\xce\x5a\xbf\xc8\x88\xca\x67\x1d\x10\x66\xa4\x75\x3a\x20\xea\x34\x6a\x9e\x75\x24\x89\x04\x34\x7b\xe5\xac\x09\xf8\x15\x47\xc3\xf4\xd3\x97\x5f\x7e\x7d\xf7\xf9\xf6\xc3\xf5\xc7\x69\x44\xac\x19\xc7\xc3\xee\xd1\xb9\xf1\x78\x49\xc4\x04\x44\x5e\x1f\x23\xf8\x7b\x7d\xce\xc7\x93\xb9\x70\xea\xe3\x50\x9c\x4c\xfc\xac\xa3\x0c\xd1\xbc\x46\x77\xda\x18\x51\x92\xc9\xd9\x5a\x17\x72\x92\x88\x78\x3a\x7f\xd3\xa4\x87\xe1\xdb\x2d\x92\xc2\x80\xd0\x1e\x9d\xe1\x45\xf1\xc4\xe2\x8d\xb3\x15\x97\x45\x37\x60\x67\x20\x88\xcb\xad\x1d\x02\x1c\x06\x6d\xe5\x8e\x4e\x93\x8d\x66\x9f\x9f\x89\xcb\x10\xee\x51\x5c\xf6\x42\x37\x78\x12\x93\x6f\x15\xf1\xd3\x1a\xe8\x46\xc4\x0b\x15\xc0\x13\x6a\x3c\x99\x5e\x98\x4d\xcf\xd4\x25\x53\xc5\x61\x3c\xa2\x1b\xe3\xc3\x60\x34\xab\xcc\x47\x3e\xc4\x34\xc4\x83\x03\x0b\xc6\x4c\x29\x64\x89\x05\x47\x36\x4d\x6d\xbf\x04\x71\x12\x39\x2c\xb3\x44\x8a\x75\xed\x96\x93\x30\xb4\x07\x53\x60\x9c\x05\x25\xbc\xe8\x53\x53\xd7\xfa\xc8\x81\xa0\x34\x14\xc3\xae\xe1\x0f\x96\xad\x6c\x38\xa5\xa1\xe0\xc2\x75\x17\xf2\x00\xa5\x3d\x84\x63\xc6\x1a\x83\xd2\x87\x3d\xc4\x8f\x43\x37\x9f\xf7\x0e\x84\x2d\x95\x95\xaf\xfa\x47\x59\x3b\xa2\x33\xda\xcb\x4c\xea\x86\x37\xdf\x8c\xf1\x4b\xa7\x21\xf9\x42\xb1\xd5\x86\x50\xbc\x8b\xa4\xd7\x77\x23\xa7\xb8\xeb\x08\x7d\x38\x96\xc6\x89\x1d\x6c\xe8\xe8\xf9\x24\xf5\x8e\x29\xc3\xf9\x92\x20\x70\x6a\x71\x4b\xbd\x9a\x8c\x76\x02\x45\x50\x35\x14\xce\xb9\x10\x3d\x85\x45\xac\xa6\x75\xc0\xf5\x30\x8d\xc3\x15\xf7\xba\x3b\x8d\xde\xa4\xb6\x74\xbd\x15\xab\x90\x97\x88\xe4\x98\x1b\x19\xc2\x58\x18\xf1\x7d\x5e\x28\xb7\x3a\x41\xfd\xc9\x88\x9a\x87\x46\xe3\xf4\xea\xe1\x01\xb2\x8f\xca\x7f\xf9\xfd\x37\x78\x7c\x3c\xa1\x58\x3b\x61\x64\xd9\x11\xfd\x12\x7e\x9d\xa3\xab\x85\x0f\x54\xf7\x21\x4a\xf4\x77\xab\x4c\xe0\xe0\x5a\x27\x98\xce\xa6\xe7\x98\xc2\xf9\xde\xc9\x0e\xdf\x23\xce\x51\x35\x84\xae\xb7\x92\xd0\x9d\xa3\xc1\x4a\xa8\x5e\xd2\xaf\xfc\x23\xa5\x3a\xdb\xf3\xc8\x65\x72\xb0\x9c\x5a\x34\xe1\xce\xde\x2a\x1f\xc0\x48\xf9\x27\xab\x70\x57\x9b\xac\xa9\x6d\xeb\xb6\x69\x57\x2f\x74\x71\xc7\xd1\xca\x62\xae\xd5\x5f\x77\x78\x04\x55\xfc\xfc\xb2\x69\x11\xa9\x13\xab\x58\x84\xf0\x8d\xc3\xd1\x3e\x7e\x46\x57\x78\x7d\x9c\xf7\xf4\x74\x1e\xef\xd8\x77\x83\x5f\x7d\x17\x80\xa4\x23\x85\x81\x69\x53\x93\x77\x28\xaa\x69\xd7\x2f\x89\x90\xd7\x98\x6d\xb3\x19\xfc\x8b\xd7\x4d\x78\xa7\x6d\x53\xbc\xc9\xc2\xb9\xe1\xed\x8e\xd7\x07\x82\x5a\x38\xaf\x64\xa3\x85\x83\xf6\xd2\x6d\xa5\x3c\x6d\xf5\x56\xeb\xea\x40\xbc\xd1\x4a\x96\x95\x85\x35\x36\x8b\x7b\xac\xa8\xd5\xe2\xc9\x86\xcd\x6c\x41\xd1\x4a\xac\xe5\xf2\x87\xab\xd3\xff\xa7\x0e\xdf\xa3\xdb\x9f\xf9\x88\xc4\x53\x6f\xc0\x39\xce\xda\x4f\x69\xc3\x89\x1d\x37\xaa\x8b\x4d\x8f\x3e\xf9\x32\x75\x91\x7c\xdc\x4a\xbe\x52\xb1\x8b\xe1\x9c\x0a\x93\x27\x1b\x15\xa7\x56\xe4\xd1\xcc\x5b\x13\x56\xf9\xd5\xe5\xd5\x72\x32\x79\x78\x70\xc2\x6c\x11\xb2\xb7\x45\xa1\xe2\x8e\xfa\x41\x37\x5f\xdf\xf2\x40\x79\x7c\x1c\xf8\xb9\xa0\xb9\x90\x1f\x1e\xd0\x14\x8f\x8f\xc3\x7d\xf7\xb9\x8e\x5c\xf0\xfe\xf6\xbe\x03\x31\x9a\xb5\xb3\xb5\x71\x2d\xa4\x81\x29\xac\x27\xb0\x81\x18\x2a\x71\x0c\x2b\xb9\xde\x0f\xc7\x99\x21\x6d\xed\xae\xa9\x41\x11\x35\x48\x60\x0d\x90\xad\x10\x3e\x35\x6b\x74\x06\x3d\x12\x84\x2f\x09\x34\xdc\x5e\x85\xa1\x6e\xeb\x9f\xde\x5a\x83\xd3\xf4\xcd\xbb\x60\x40\x7a\x7d\x45\xe5\x34\x3e\xc8\xba\x19\x19\xec\x1b\xbd\xe9\xc7\xf7\x74\x39\x9d\xfc\x2f\x00\x00\xff\xff\xee\x1f\x18\x55\x2a\x15\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰FileInfo{
 			name:    "flux-secret.yaml.tmpl",
-			modTime: time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
-			content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x66\x6c\x75\x78\x2d\x67\x69\x74\x2d\x64\x65\x70\x6c\x6f\x79\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a"),
+			modTime: time.Date(2019, 7, 24, 14, 29, 53, 668285520, time.UTC),
+			content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x66\x6c\x75\x78\x2d\x67\x69\x74\x2d\x64\x65\x70\x6c\x6f\x79\x0a\x20\x20\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x3a\x20\x7b\x7b\x20\x2e\x4e\x61\x6d\x65\x73\x70\x61\x63\x65\x20\x7d\x7d\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
-			uncompressedSize: 816,
+			modTime:          time.Date(2019, 7, 24, 14, 32, 56, 924980880, time.UTC),
+			uncompressedSize: 846,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\x4f\x6f\xd3\x40\x10\xc5\xef\xfe\x14\x4f\xca\x15\x07\xb9\x52\x2e\xbe\x21\x0a\xa8\x12\xa0\x5c\xca\x7d\xb2\x9e\x38\x2b\x76\x77\x96\x9d\x71\x88\xf9\xf4\xc8\x49\xe3\x38\x6d\xe7\x64\xed\x7b\xbf\xf9\xe7\xa9\xeb\xba\x5a\x21\x72\x74\xe4\x0e\xdc\xa1\xe3\x1c\x64\x8c\x9c\x0c\x83\x72\x87\xdd\x88\xaf\x61\x38\xc1\x04\x67\x47\xb5\x82\x93\x64\xe4\x13\x17\xf8\x48\x3d\x23\xb2\x51\x47\x46\xeb\x8a\xb2\xff\xc5\x45\xbd\xa4\x16\x94\xb3\x7e\x3c\x36\xd5\x6f\x9f\xba\x16\x8f\x73\xda\xea\x6a\x6f\x2b\x20\x51\xe4\xf6\x56\xbd\xd2\xcc\x6e\x7a\x2f\x9c\x83\x77\xa4\x2d\x9a\x0a\x50\x0e\xec\x4c\xca\xa4\x00\x91\xcc\x1d\xbe\xd3\x8e\x83\x5e\x1e\xde\xa6\x01\x8c\x63\x0e\x64\xfc\x82\x2c\x4a\x4e\x11\xee\xe8\xf7\x78\xe0\xda\xca\x14\xf3\xc4\x33\x53\xbf\xcb\x4c\x71\xde\xc9\x42\x68\x9b\xf5\x66\xdd\x6c\xee\xf5\xed\x10\xc2\x56\x82\x77\x63\x8b\xa7\xfd\x4f\xb1\x6d\x61\x9d\x96\x73\x75\x51\xe9\x17\xfd\xd5\xa8\x23\x36\xcd\x03\x80\x15\x7e\xd0\xc9\xc7\x21\x4e\x15\xa4\x8c\xd3\x8f\x19\x94\x3f\xc0\x27\x44\xee\x69\x37\x1a\xeb\x12\x7c\xc2\x26\xe2\x0e\x54\xff\x8f\xb1\x97\x02\x49\x0c\x6f\x1c\x97\xf6\x8c\xa6\x79\x68\x1a\xac\xf0\xc8\x7b\x1a\x82\x21\x4b\xb9\xf5\xb5\x9a\x3c\xc7\xe3\xe5\xf3\x39\x39\x89\xe7\x53\x31\x41\xcf\x86\x20\xbd\x42\xf6\x60\x72\x07\x14\xfe\x33\xb0\x1a\x28\x75\x28\xac\x59\x92\xf2\x7a\x4e\x34\x65\xbd\x9b\xf0\xb2\x4f\x17\x3c\x27\xbb\x0d\xb0\xd8\xfd\x56\x8a\xb5\x97\xee\x66\x59\xd9\x0d\xc5\xdb\xf8\x59\x92\xf1\xc9\xda\x05\x57\x86\xf4\x49\x9f\x95\xcb\x6b\xe6\x45\xfa\x56\x64\xc8\x6f\x35\x0a\x41\xfe\x6e\x8b\x3f\xfa\xc0\x3d\x7f\x51\x47\x81\xec\x7c\xd0\x7b\x0a\xca\xd5\xff\x00\x00\x00\xff\xff\x55\xe1\x76\x95\x30\x03\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\xcd\x8e\xd3\x40\x10\x84\xef\x7e\x8a\x92\x72\xc5\x41\x5e\x29\x17\xdf\x10\x0b\x68\x25\x58\xe5\xb2\xdc\x3b\xe3\x8e\x33\x62\xfe\x98\x6e\x87\x98\xd5\xbe\x3b\x9a\xfc\x38\x0e\x9b\x3e\x25\x53\xfd\x75\xd7\x94\xa7\xae\xeb\x6a\x01\xcf\xde\x90\xd9\x71\x87\x8e\x93\x8b\xa3\xe7\xa0\x18\x84\x3b\x6c\x46\x7c\x75\xc3\x01\x1a\x71\xec\xa8\x16\x30\x31\x28\xd9\xc0\x19\xd6\x53\xcf\xf0\xac\xd4\x91\xd2\xb2\xa2\x64\x7f\x72\x16\x1b\x43\x0b\x4a\x49\x3e\xee\x9b\xea\x97\x0d\x5d\x8b\xc7\x69\x6c\x75\x69\x6f\x2b\x20\x90\xe7\xf6\xba\xfd\x7c\x22\x89\x0c\xb7\x78\x7d\xc5\xf2\xf9\xf2\x17\x6f\x6f\x95\x24\x36\x85\xca\x9c\x9c\x35\x24\x2d\x9a\x0a\x10\x76\x6c\x34\xe6\xa2\x00\x9e\xd4\xec\xbe\xd3\x86\x9d\x9c\x0e\xee\x2d\x51\xf6\xc9\x91\xf2\x19\x99\x19\x2a\xe5\x6e\xe8\x7b\x3c\x70\xb1\x52\x6a\xca\x63\x62\xea\xbb\x4c\xa9\x63\x62\x33\xa1\x6d\x96\xab\x65\xb3\xba\xd5\xd7\x83\x73\xeb\xe8\xac\x19\x5b\x3c\x6d\x9f\xa3\xae\x33\x4b\x89\xee\xd2\x45\xb9\x9f\xf9\xab\x51\x7b\xac\x9a\x07\x00\x0b\xfc\xa0\x83\xf5\x83\x2f\x1b\x62\x1e\xcb\x67\x1b\x84\x3f\xc0\x06\x78\xee\x69\x33\x2a\xcb\x1c\x7c\xc2\xca\xe3\x06\x14\xfb\x97\xb1\x8d\x19\x31\x30\xac\xb2\x9f\xb7\x27\x34\xcd\x43\xd3\x60\x81\x47\xde\xd2\xe0\x14\x29\xe6\xab\xaf\x45\xe9\xd9\xef\x4f\x3f\x5f\x82\x89\xfe\xf8\x90\x34\xa2\x67\x85\x8b\xbd\x20\x6e\xc1\x64\x76\xc8\xfc\x7b\x60\x51\x50\xe8\x90\x59\x52\x0c\xc2\xcb\x69\x50\x99\x7a\x73\xc3\x53\x9e\xc6\x59\x0e\x7a\xbd\xc0\x2c\xfb\x75\xcc\xda\x9e\xdc\x4d\xb2\xb0\x19\xb2\xd5\xf1\x73\x0c\xca\x07\x6d\x67\x5c\x1e\xc2\x27\x79\x11\xce\xff\x33\x67\xe9\x5b\x8e\x43\x7a\xaf\x91\x73\xf1\xcf\x3a\xdb\xbd\x75\xdc\xf3\x17\x31\xe4\x48\x8f\xcf\x7d\x4b\x4e\xb8\xfa\x17\x00\x00\xff\xff\xd9\x0a\x29\x86\x4e\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 12, 47, 49, 168867000, time.UTC),
-			uncompressedSize: 147,
+			modTime:          time.Date(2019, 7, 24, 14, 59, 5, 473563594, time.UTC),
+			uncompressedSize: 178,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8b\x3d\xaa\x83\x31\x0c\x04\x7b\x9d\x62\x2f\xe0\x42\xaf\xd4\x35\x1e\xa4\x17\xf2\x42\x4c\xe2\x1f\x6c\xf3\x9d\x3f\x38\xe9\x92\xad\x96\x61\x26\xa5\x24\x3e\xca\x8d\x73\x95\xde\x0c\x97\xca\xa3\xb4\x6c\xf8\xe7\xbc\x4a\x50\x2a\xb7\x67\xdf\x6e\x02\x34\xaf\x34\x54\xd6\xf0\xb8\x33\xcb\x1a\x8c\xc3\x47\x9f\x7b\x9d\x03\xa4\x1f\x09\xef\x1d\xc5\xa0\xfa\xa7\x2a\xc0\xe2\x93\xb1\xfb\xfc\x34\x5f\xc5\x2b\x00\x00\xff\xff\xa8\x56\xba\x05\x93\x00\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8c\x41\x0a\x02\x31\x14\x43\xf7\xff\x14\xb9\x40\x85\xba\xfc\x87\x70\x23\xb8\xff\xfc\x09\x58\xb4\xd3\xd2\x96\xd9\x0c\x73\x77\x29\xea\x46\xcc\x2a\x09\x79\x09\x21\x88\xd5\x74\x63\xeb\xa9\xac\x8a\x2d\xca\x23\xad\x8b\xe2\xca\xb6\x25\xa7\x64\x0e\x5b\x6c\x98\x0a\xb0\x5a\xa6\x22\x33\xbb\xf9\x9d\xcb\xa7\xe9\xd5\x9c\x8a\x7d\xc7\xe9\xf2\x8d\x38\x0e\xe9\x95\x3e\xa9\x5a\xda\xe8\xd3\x00\xe1\xcf\xc5\xd4\x9c\x28\x62\x3c\xc7\x28\x40\xe7\x93\x3e\x4a\x7b\x33\xbf\xc4\x2b\x00\x00\xff\xff\xa8\x2c\x5b\x6b\xb2\x00\x00\x00"),
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/cmd/fluxctl/install/install.go b/cmd/fluxctl/install/install.go
index b9a45a2ac..be012f365 100644
--- a/cmd/fluxctl/install/install.go
+++ b/cmd/fluxctl/install/install.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"strings"
 	"text/template"
 
 	"github.com/shurcooL/httpfs/vfsutil"
@@ -22,7 +23,7 @@ type TemplateParameters struct {
 	AdditionalFluxArgs []string
 }
 
-func FillInInstallTemplates(opts TemplateParameters) (io.Reader, error) {
+func FillInInstallTemplates(params TemplateParameters) (io.Reader, error) {
 	result := bytes.NewBuffer(nil)
 	err := vfsutil.WalkFiles(templates, "/", func(path string, info os.FileInfo, rs io.ReadSeeker, err error) error {
 		if err != nil {
@@ -31,15 +32,17 @@ func FillInInstallTemplates(opts TemplateParameters) (io.Reader, error) {
 		if info.IsDir() {
 			return nil
 		}
-		templateBytes, err := ioutil.ReadAll(rs)
+		manifestTemplateBytes, err := ioutil.ReadAll(rs)
 		if err != nil {
 			return fmt.Errorf("cannot read embedded file %q: %s", info.Name(), err)
 		}
-		template, err := template.New(info.Name()).Parse(string(templateBytes))
+		manifestTemplate, err := template.New(info.Name()).
+			Funcs(template.FuncMap{"StringsJoin": strings.Join}).
+			Parse(string(manifestTemplateBytes))
 		if err != nil {
 			return fmt.Errorf("cannot parse embedded file %q: %s", info.Name(), err)
 		}
-		if err := template.Execute(result, opts); err != nil {
+		if err := manifestTemplate.Execute(result, params); err != nil {
 			return fmt.Errorf("cannot execute template for embedded file %q: %s", info.Name(), err)
 		}
 		return nil
diff --git a/cmd/fluxctl/install/templates/flux-account.yaml.tmpl b/cmd/fluxctl/install/templates/flux-account.yaml.tmpl
index 4bf7702e2..22aff84d6 100644
--- a/cmd/fluxctl/install/templates/flux-account.yaml.tmpl
+++ b/cmd/fluxctl/install/templates/flux-account.yaml.tmpl
@@ -7,6 +7,7 @@ metadata:
   labels:
     name: flux
   name: flux
+  namespace: {{ .Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -34,4 +35,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: flux
-    namespace: default
+    namespace: {{ .Namespace }}
diff --git a/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl b/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
index 5285bd2db..81a41af55 100644
--- a/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
+++ b/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flux
+  namespace: {{ .Namespace }}
 spec:
   replicas: 1
   selector:
@@ -117,13 +118,13 @@ spec:
         # mounted above, for K8s >= 1.10
         - --ssh-keygen-dir=/var/fluxd/keygen
 
-        # Replace or remove the following URL.
-        - --git-url=git@github.com:weaveworks/flux-get-started
-        - --git-branch=master
-        # include this if you want to restrict the manifests considered by flux
-        # to those under the following relative paths in the git repository
-        # - --git-path=subdir1,subdir2
-
+        - --git-url={{ .GitURL }}
+        - --git-branch={{ .GitBranch }}
+        - --git-path={{ StringsJoin .GitPaths "," }}
+        - --git-label={{ .GitLabel }}
+        - --git-user={{ .GitUser }}
+        - --git-email={{ .GitEmail }}
+        
         # Include these two to enable git commit signing
         # - --git-gpg-key-import=/root/gpg-import
         # - --git-signing-key=<key id>
@@ -140,6 +141,9 @@ spec:
         # make sure to set prometheus' annotation to scrape the port value.
         - --listen-metrics=:3031
 
+{{range .AdditionalFluxArgs }}        - {{ . }}
+{{end}}
+
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
       # dnsPolicy: "None"
diff --git a/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl b/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
index f3c110ebf..6b2cdaf0e 100644
--- a/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
+++ b/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
@@ -3,4 +3,5 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: flux-git-deploy
+  namespace: {{ .Namespace }}
 type: Opaque
diff --git a/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl b/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
index 1e0728bc7..4df2581d5 100644
--- a/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
+++ b/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
@@ -5,6 +5,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: memcached
+  namespace: {{ .Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl b/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
index d90f0cd65..021690d76 100644
--- a/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
+++ b/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
@@ -3,9 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: memcached
+  namespace: {{ .Namespace }}
 spec:
   ports:
     - name: memcached
       port: 11211
   selector:
-    name: memcached
\ No newline at end of file
+    name: memcached
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index 795a66bce..b2f318f0f 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"os"
 
@@ -27,20 +28,25 @@ fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | ku
 		"URL of the Git repository to be used by Flux, e.g. git@github.com:<your username>/flux-get-started")
 	cmd.Flags().StringVarP(&opts.GitBranch, "git-branch", "", "master",
 		"Git branch to be used by Flux")
+	cmd.Flags().StringSliceVarP(&opts.GitPaths, "git-paths", "", []string{"/"},
+		"Relative paths within the Git repo for Flux to locate Kubernetes manifests")
 	cmd.Flags().StringVarP(&opts.GitLabel, "git-label", "", "flux",
 		"Git label to keep track of Flux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
 	cmd.Flags().StringVarP(&opts.GitUser, "git-user", "", "Flux",
 		"Username to use as git committer")
 	cmd.Flags().StringVarP(&opts.GitEmail, "git-email", "", "flux-dev@googlegroups.com",
 		"Email to use as git committer")
-	cmd.Flags().StringVarP(&opts.Namespace, "namespace", "", "flux",
+	cmd.Flags().StringVarP(&opts.Namespace, "namespace", "", getKubeConfigContextNamespace("default"),
 		"Cluster namespace where to install flux")
 	cmd.Flags().StringSliceVarP(&opts.AdditionalFluxArgs, "extra-flux-args", "", []string{},
-		"Additional arguments for Flux as CSVs, e.g. --extra-flux-arg='--manifest-generation=true,--sync-garbage-collection=true'")
+		"Additional arguments for Flux as CSVs, e.g. --extra-flux-args='--manifest-generation=true,--sync-garbage-collection=true'")
 	return cmd
 }
 
 func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
+	if opts.GitURL == "" {
+		fmt.Errorf("please supply a valid --git-url argument")
+	}
 	templates, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
 	if err != nil {
 		return err
diff --git a/go.mod b/go.mod
index 9b1f9102c..35be0bf6e 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/huandu/xstrings v1.2.0 // indirect
 	github.com/imdario/mergo v0.3.7
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/instrumenta/kubeval v0.0.0-20190720105720-70e32d660927
 	github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833
diff --git a/go.sum b/go.sum
index 7547385c4..1e00e682d 100644
--- a/go.sum
+++ b/go.sum
@@ -59,6 +59,8 @@ github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:gNh8
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
 github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -119,11 +121,17 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE=
 github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 h1:Rem2+U35z1QtPQc6r+WolF7yXiefXqDKyk+lN2pE164=
+github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 h1:j30noezaCfvNLcdMYSvHLv81DxYRSt1grlpseG67vhU=
+github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce h1:xdsDDbiBDQTKASoGEZ+pEmF1OnWuu8AQ9I8iNbHNeno=
+github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
@@ -133,6 +141,8 @@ github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
 github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/instrumenta/kubeval v0.0.0-20190720105720-70e32d660927 h1:r1cvxQYvoKyFHUbPpDRAJw4QRvfyWyR55cp3mS1fklc=
+github.com/instrumenta/kubeval v0.0.0-20190720105720-70e32d660927/go.mod h1:HeTbS2psckzaIy3V3lGbcCvSGP9f9MvrQV6s9IWGy0w=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE=
@@ -155,8 +165,16 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
+github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o=
+github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 h1:KXZJFdun9knAVAR8tg/aHJEr5DgtcbqyvzacK+CDCaI=
+github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
@@ -178,6 +196,8 @@ github.com/opentracing-contrib/go-stdlib v0.0.0-20190324214902-3020fec0e66b/go.m
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/pelletier/go-toml v0.0.0-20180724185102-c2dbbc24a979 h1:Uh8pTMDzw+nuDTW7lyxcpmYqQJFE8SnO93F3lyY4XzY=
+github.com/pelletier/go-toml v0.0.0-20180724185102-c2dbbc24a979/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
@@ -213,11 +233,21 @@ github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJV
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/spf13/afero v1.1.1 h1:Lt3ihYMlE+lreX1GS4Qw4ZsNpYQLxIXKBTEOXm3nt6I=
+github.com/spf13/afero v1.1.1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg=
+github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
+github.com/spf13/cobra v0.0.0-20180820174524-ff0d02e85550/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/jwalterweatherman v0.0.0-20180814060501-14d3d4c51834 h1:kJI9pPzfsULT/72wy7mxkRQZPtKWgFdCA2RTGZ4v8/E=
+github.com/spf13/jwalterweatherman v0.0.0-20180814060501-14d3d4c51834/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20180821114517-d929dcbb1086/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.1.0 h1:V7OZpY8i3C1x/pDmU0zNNlfVoDz112fSYvtWMjjS3f4=
+github.com/spf13/viper v1.1.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -235,6 +265,12 @@ github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZG
 github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
 github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa h1:rW+Lu6281ed/4XGuVIa4/YebTRNvoUJlfJ44ktEVwZk=
 github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa/go.mod h1:2rx5KE5FLD0HRfkkpyn8JwbVLBdhgeiOb2D2D9LLKM4=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v0.0.0-20180816142147-da425ebb7609 h1:BcMExZAULPkihVZ7UJXK7t8rwGqisXFw75tILnafhBY=
+github.com/xeipuuv/gojsonschema v0.0.0-20180816142147-da425ebb7609/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -273,6 +309,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180821044426-4ea2f632f6e9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -285,6 +322,7 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 h1:aBlRBZoCuZNRDClvfkDoklQqdLzBaA3uViASg2z2p24=
 golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20180810153555-6e3c4e7365dd/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

From 432ad2d9e649dc5530eda84876abfdf220896581 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 24 Jul 2019 17:39:49 +0200
Subject: [PATCH 070/158] Add test

---
 cmd/fluxctl/install/install_test.go | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 cmd/fluxctl/install/install_test.go

diff --git a/cmd/fluxctl/install/install_test.go b/cmd/fluxctl/install/install_test.go
new file mode 100644
index 000000000..aef99d07a
--- /dev/null
+++ b/cmd/fluxctl/install/install_test.go
@@ -0,0 +1,34 @@
+package install
+
+import (
+	"io/ioutil"
+	"testing"
+
+	"github.com/instrumenta/kubeval/kubeval"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFillInInstallTemplates(t *testing.T) {
+	params := TemplateParameters{
+		GitURL:             "git@github.com:fluxcd/flux-get-started",
+		GitBranch:          "branch",
+		GitPaths:           []string{"dir1", "dir2"},
+		GitLabel:           "label",
+		GitUser:            "User",
+		GitEmail:           "this.is@anemail.com",
+		Namespace:          "flux",
+		AdditionalFluxArgs: []string{"arg1=foo", "arg2=bar"},
+	}
+	reader, err := FillInInstallTemplates(params)
+	assert.NoError(t, err)
+	output, err := ioutil.ReadAll(reader)
+	assert.NoError(t, err)
+	validationResults, err := kubeval.Validate(output, "output")
+	assert.NoError(t, err)
+	assert.Len(t, validationResults, 7)
+	for _, result := range validationResults {
+		if len(result.Errors) > 0 {
+			t.Errorf("found problems with resource resource %s: %s", result.Kind, result.Errors)
+		}
+	}
+}

From 5cd49704bc3cd24f3cc5c0e3f9bc7f98dfdbff2b Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 15:24:09 +0200
Subject: [PATCH 071/158] Move cmd/fluxctl/install to install/

---
 Makefile                                             |  8 ++++----
 cmd/fluxctl/install_cmd.go                           |  2 +-
 {cmd/fluxctl/install => install}/generate.go         |  0
 .../install => install}/generated_templates.gogen.go | 12 ++++++------
 {cmd/fluxctl/install => install}/install.go          |  0
 {cmd/fluxctl/install => install}/install_test.go     |  0
 .../templates/flux-account.yaml.tmpl                 |  0
 .../templates/flux-deployment.yaml.tmpl              |  0
 .../templates/flux-secret.yaml.tmpl                  |  0
 .../templates/memcache-dep.yaml.tmpl                 |  0
 .../templates/memcache-svc.yaml.tmpl                 |  0
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename {cmd/fluxctl/install => install}/generate.go (100%)
 rename {cmd/fluxctl/install => install}/generated_templates.gogen.go (97%)
 rename {cmd/fluxctl/install => install}/install.go (100%)
 rename {cmd/fluxctl/install => install}/install_test.go (100%)
 rename {cmd/fluxctl/install => install}/templates/flux-account.yaml.tmpl (100%)
 rename {cmd/fluxctl/install => install}/templates/flux-deployment.yaml.tmpl (100%)
 rename {cmd/fluxctl/install => install}/templates/flux-secret.yaml.tmpl (100%)
 rename {cmd/fluxctl/install => install}/templates/memcache-dep.yaml.tmpl (100%)
 rename {cmd/fluxctl/install => install}/templates/memcache-svc.yaml.tmpl (100%)

diff --git a/Makefile b/Makefile
index f30a91ec0..993f74811 100644
--- a/Makefile
+++ b/Makefile
@@ -120,10 +120,10 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-cmd/fluxctl/install/generated_templates.gogen.go: cmd/fluxctl/install/templates/* cmd/fluxctl/install/generate.go
-	cd cmd/fluxctl/install && go run generate.go
+install/generated_templates.gogen.go: install/templates/*
+	cd install && go run generate.go
 
-check-generated: cmd/fluxctl/install/generated_templates.gogen.go
+check-generated: install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client cmd/fluxctl/install/generated_templates.gogen.go
+	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index b2f318f0f..25c2c8d08 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/weaveworks/flux/cmd/fluxctl/install"
+	"github.com/weaveworks/flux/install"
 )
 
 type installOpts install.TemplateParameters
diff --git a/cmd/fluxctl/install/generate.go b/install/generate.go
similarity index 100%
rename from cmd/fluxctl/install/generate.go
rename to install/generate.go
diff --git a/cmd/fluxctl/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
similarity index 97%
rename from cmd/fluxctl/install/generated_templates.gogen.go
rename to install/generated_templates.gogen.go
index bd2953232..bb01350b4 100644
--- a/cmd/fluxctl/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,37 +19,37 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 24, 14, 59, 5, 476026678, time.UTC),
+			modTime: time.Date(2019, 7, 25, 13, 14, 42, 628321870, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 14, 31, 52, 545386882, time.UTC),
+			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
 			uncompressedSize: 764,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x52\xbb\x6e\xc2\x30\x14\xdd\xfd\x15\x47\x62\xa0\xad\x48\x2a\xb6\x2a\x1b\x30\x74\x68\xd5\x21\x7d\x2c\x55\x87\x6b\xe7\x52\x5c\x8c\x1d\xf9\x91\x3e\x10\xff\x5e\x85\x80\x04\x82\x22\x21\x75\xcb\x3d\x3a\x37\xe7\x71\x9d\x65\x99\xe8\xe1\x69\xc6\x08\xec\x1b\xad\x18\xa4\x94\x4b\x36\x0e\xa0\x4c\x0a\x91\x3d\xbc\x33\x1c\x06\x20\x5b\xed\x41\x90\xda\x56\xda\xbe\x83\x3c\x8b\x1e\x9c\x35\xdf\xb0\xcc\x15\x57\x98\x3a\x8f\xbb\x24\xd9\x5b\x8e\x1c\xf0\xa9\xe3\x6c\xbd\x92\x49\x0a\x5c\xb5\x0a\x1c\x02\x94\xb3\xd1\x3b\x83\x8b\x72\x3c\x9a\x5c\xe6\x82\x6a\xfd\xc2\x3e\x68\x67\x0b\x34\x43\x31\xd7\xb6\x2a\xf0\xd8\xb9\x1a\x75\xa6\xc4\x82\x23\x55\x14\xa9\x10\x80\x21\xc9\x26\xb4\x5f\x80\xa5\x05\x17\x98\x9a\xf4\x25\x8e\x0c\xa1\x26\xc5\x05\x96\x4b\xe4\x0f\xdb\x11\xab\x95\x68\xc3\xef\xaa\x7a\x49\x2a\xa7\x14\x67\xce\xeb\x1f\x8a\xda\xd9\x7c\x7e\x13\x72\xed\xae\x9b\xa1\xe4\x48\x5b\x53\x93\xae\x86\xd2\x19\x3e\xdb\x91\x4f\x86\xd7\x94\x0c\x54\xeb\x5b\xef\x52\x1d\x0a\xbc\xf6\xaf\xfa\x6f\xeb\x3d\xcf\xc1\x25\xaf\x78\x0f\x6c\xd8\xcb\x1d\x20\x83\x75\xb6\xdc\x10\x9f\xcb\xfb\xbf\xb9\xff\x90\x70\xdc\x9d\xf9\xfc\xa0\xce\x70\xc9\xd3\x96\xb4\x0d\x7a\x42\x5f\x00\x87\xdd\xee\xfd\x2f\x24\xf9\xc1\x2a\x6e\xba\x3b\xfa\x3a\x0e\xec\x9c\x3e\xff\x6f\x00\x00\x00\xff\xff\xd0\x46\x0b\xa3\xfc\x02\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 14, 54, 42, 529577876, time.UTC),
+			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
 			uncompressedSize: 5418,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x6d\x6f\xdb\x46\xf2\x7f\xaf\x4f\x31\x50\x5e\x38\x01\x24\xca\xaa\xfb\xff\xe3\xc0\x9e\x0a\xa4\x49\x93\xf3\xa5\x76\x8c\xfa\x72\x87\x7b\x75\x5d\x2d\x47\xe2\x42\xcb\x5d\xde\xce\x52\x8a\x60\xf8\xbb\x1f\x66\x97\x0f\x4b\x4b\x76\x8a\xf4\x45\x63\x91\xf3\xfc\xf0\x9b\x19\xce\xe7\xf3\x89\xa8\xd5\x3f\xd1\x91\xb2\x26\x07\x51\xd7\xb4\xd8\x2f\x27\x3b\x65\x8a\x1c\xde\x63\xad\xed\xb1\x42\xe3\x27\x15\x7a\x51\x08\x2f\xf2\x09\x80\x11\x15\xe6\xb0\xd1\xcd\xd7\xf6\x07\xd5\x42\x62\x0e\x0f\x0f\x90\xdd\x76\x3f\xe1\xf1\x71\x42\x35\x4a\x66\x70\x58\x6b\x25\x05\xe5\xb0\x9c\x00\x10\x6a\x94\xde\x3a\x7e\x03\x50\x09\x2f\xcb\xdf\xc4\x1a\x35\xc5\x07\x4f\xe4\x93\x77\xc2\xe3\xf6\x18\x5f\xfa\x63\x8d\x39\xfc\x8e\xd2\xa1\xf0\x38\x01\xf0\x58\xd5\x5a\x78\x6c\x85\x25\x56\xf2\x7f\xc2\x18\xeb\x85\x57\xd6\xf4\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\xa6\x57\x97\x57\xcb\x29\xbc\x02\x8f\x5a\x27\x14\xe0\x2d\x90\x74\xa2\x46\x58\x54\xe8\x9d\x92\x04\x68\x8a\xda\x2a\xe3\x2f\x08\x98\x39\x6b\x05\xeb\x91\x0f\x4f\xbc\x00\xe8\x62\x11\xfe\x46\xb7\x57\x12\xdf\x4a\x69\x1b\xe3\x6f\xc7\x84\x00\x7b\xab\x9b\x0a\x7b\x51\xf3\x56\xd4\x56\xf9\xf9\x0e\x8f\xbd\x02\xe2\x28\xf8\x41\x61\xf7\x64\x90\x37\x67\x96\x22\x24\x31\xa1\x2a\x70\x23\x1a\xed\x6f\x6c\x81\x39\x5c\xfe\x78\x79\x09\xaf\xe0\x50\xa2\x81\x8a\xad\xc1\x02\x1c\x8a\x62\x6e\x8d\x3e\xce\xe0\x80\x70\xb0\xe6\xc2\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\x62\xd2\x0a\x7c\x05\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\xee\xef\xff\x06\x3b\x3c\x52\x06\xd7\x06\x3e\xfd\x85\xe0\xe7\x15\x2c\xb3\xe5\xe5\xac\x97\xd2\xe9\x8e\x2e\x10\x08\x87\xa9\x1d\x64\xd9\x14\x83\x58\x80\x00\xc2\x5a\x70\x51\xb4\x81\x82\x03\xf6\x62\xa4\x30\x70\x70\xca\xb3\xa1\xd9\xf9\xf8\x6d\xd1\xf4\xc1\xc0\xaa\xf6\xc7\xf7\xca\xa5\x41\xac\xb0\x50\x4d\x95\xc3\x0d\x56\xd6\x1d\x53\x3f\x11\x36\x56\x6b\x7b\x60\x8f\x5a\xd5\x8a\x82\xab\x0d\xf1\x33\x01\xb2\x21\x6f\x2b\xc5\x11\xd8\x19\x7b\x30\xff\x29\x2d\x79\xea\x45\x6c\x94\xc6\x19\x1c\x4a\x25\x4b\x38\xda\x06\x0e\x4a\xeb\xe8\x94\xb7\x50\x58\x50\x9b\xf0\x98\x99\xf8\x0f\x07\xf6\x60\xd8\xec\x5e\x80\xc3\xda\x82\x13\xbe\x44\x07\xbe\x14\xa6\x55\xbc\x55\xbe\x6c\xd6\x60\xf9\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\xb9\xd0\x1a\x84\x26\xdb\xa9\x18\x07\x1b\x94\x07\x65\xbc\x0d\x3c\xd2\x1a\x2f\x94\x41\x37\x83\x35\x6a\x7b\xc8\xe0\x1e\x87\xa8\x96\xde\xd7\x94\x2f\x16\x51\x4f\x26\x6d\xb5\x38\xa0\xd8\xe3\xc1\xba\x1d\x2d\xb8\xd2\x16\x6b\x6d\xd7\x8b\x4a\x90\x47\xb7\x20\xe5\x71\x41\x5e\x98\x42\x68\x6b\x70\x4e\xe8\x9b\x3a\xab\x8a\x57\xc1\xda\xb9\x98\xd7\x4e\xed\x85\xc7\x50\x9e\xec\x6c\xaf\xa8\x4b\x15\x51\x39\x97\xd6\x6c\xd4\xb6\x7f\x05\x10\x1f\xdc\x88\x3a\x4f\x1e\xa6\x7d\x36\x4f\xd8\xbe\x37\x6d\xd9\xae\x59\xe3\x22\x0a\x19\xaa\xf3\x9b\x29\x3b\x28\x2a\xf9\x49\x29\xf6\x08\x02\x0a\xb5\xd9\xa0\x63\xdc\xec\x24\xb4\x4d\x37\xc0\x65\xc8\x50\x14\x97\xe6\x88\xb1\x67\xaf\x0a\xec\xb2\xb2\x51\xdb\x4a\xd4\x83\x21\xca\x97\x20\x0c\xa0\xf1\xee\x18\x7c\xf8\x23\x12\xfd\x31\x03\x61\x0a\x68\x8c\xb4\x15\x03\x76\xe0\x8f\xde\xde\x84\x6c\x0b\x53\xf4\x52\xd0\xec\x83\x04\x85\xd4\xa6\xfb\x24\x03\x1c\x86\xef\xc8\x40\xc2\xf6\xcd\x0c\x04\xa0\xf0\x16\x54\xc5\x30\x0a\x1f\xef\x3e\x06\x8c\x80\xd7\xec\x16\xa9\xad\x51\x66\x50\xce\xce\xed\xd1\xa9\x8d\x92\x01\xcf\xa1\x6e\x5c\x6d\x09\xe9\xcd\x9f\x08\x64\x2f\x25\xa2\x4b\x8c\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xa1\x8b\x9f\x89\xd8\xb6\xde\x32\xbc\x50\x12\x9a\x31\x42\xbf\x7a\x06\xa3\x4f\xf9\xce\x60\x74\x17\xce\xbe\x51\x4f\xc6\x43\x32\x40\xda\xa8\x3b\x0c\x30\x6a\x2c\x4c\x73\x9e\x91\xe4\xa7\xa0\x2a\xb1\xc5\x58\xfd\xcc\x90\xc1\x07\x65\x8a\xe0\x73\xc5\xa8\xe3\x50\x0e\x55\x1b\x11\x47\xa3\x20\x64\x6c\x09\xac\x9c\x04\x5e\x15\x40\xf8\x1e\x16\x18\x13\x0a\x2b\x77\xe8\x02\x34\xb8\x13\x70\xf0\xa2\x0f\x5f\x97\x4b\x5e\x09\x78\x4b\x60\xcd\x5e\x6c\x81\xad\xcd\x7a\x9a\xa0\x2a\x87\x56\xa8\xb2\x41\x8c\x2c\xc2\x3f\xf9\x32\x5b\x5e\x65\x3f\x8c\x69\xef\x1a\xad\xef\xac\x56\xf2\x98\xc3\xf5\xe6\xd6\xfa\x3b\x87\x94\x7a\xe2\x90\x6c\xe3\x24\x52\x0a\xf5\x0e\xff\xdb\x20\xf9\xd1\x33\x00\x59\x37\x39\xfc\xdf\x65\x35\x7a\x58\x85\x69\x90\xc3\xff\xff\x78\xa3\x86\x4d\xc2\xba\x94\x79\x3e\x64\xe7\x2e\x6c\x15\x57\x97\x57\x3c\x5c\x95\xd9\x58\x57\x85\xb2\x15\xba\xa7\x4e\x6a\x6c\x24\xe3\xfc\xb0\x87\x08\xda\x77\xc2\x97\x39\x2c\xd0\xcb\x10\x8b\x62\x41\x54\xf2\xd6\x62\xe3\x1e\x05\xda\xb6\xed\xb1\x55\x7b\x34\xa0\x4c\x0c\xcf\x05\x45\x1e\xa2\x72\x31\xea\xea\x18\x05\x51\x7c\x36\xfa\x98\x83\x77\x0d\xb2\x34\x9e\xe8\xa1\xa1\xd6\x2d\x0e\x71\x05\xd4\xe8\x36\xd6\x49\x64\xa1\x71\x84\xf3\x04\x7f\xce\xf0\x74\xca\x8e\x6d\xdf\x0b\xd7\xda\x1e\xc9\xbe\xcf\xfc\xa4\x9c\xae\x8d\xd4\x4d\x68\x74\x5e\x44\x22\x1e\x77\x20\x10\x27\xdd\x37\x06\x73\x37\x9a\x7f\x62\xd6\x27\x43\xb3\x07\x03\x28\x50\x6a\xe1\x78\x01\x59\xdb\x7d\x52\xab\x2f\x4c\xad\xd8\xcd\xa9\xf3\xce\x5a\xbf\xc8\x88\xca\x67\x1d\x10\x66\xa4\x75\x3a\x20\xea\x34\x6a\x9e\x75\x24\x89\x04\x34\x7b\xe5\xac\x09\xf8\x15\x47\xc3\xf4\xd3\x97\x5f\x7e\x7d\xf7\xf9\xf6\xc3\xf5\xc7\x69\x44\xac\x19\xc7\xc3\xee\xd1\xb9\xf1\x78\x49\xc4\x04\x44\x5e\x1f\x23\xf8\x7b\x7d\xce\xc7\x93\xb9\x70\xea\xe3\x50\x9c\x4c\xfc\xac\xa3\x0c\xd1\xbc\x46\x77\xda\x18\x51\x92\xc9\xd9\x5a\x17\x72\x92\x88\x78\x3a\x7f\xd3\xa4\x87\xe1\xdb\x2d\x92\xc2\x80\xd0\x1e\x9d\xe1\x45\xf1\xc4\xe2\x8d\xb3\x15\x97\x45\x37\x60\x67\x20\x88\xcb\xad\x1d\x02\x1c\x06\x6d\xe5\x8e\x4e\x93\x8d\x66\x9f\x9f\x89\xcb\x10\xee\x51\x5c\xf6\x42\x37\x78\x12\x93\x6f\x15\xf1\xd3\x1a\xe8\x46\xc4\x0b\x15\xc0\x13\x6a\x3c\x99\x5e\x98\x4d\xcf\xd4\x25\x53\xc5\x61\x3c\xa2\x1b\xe3\xc3\x60\x34\xab\xcc\x47\x3e\xc4\x34\xc4\x83\x03\x0b\xc6\x4c\x29\x64\x89\x05\x47\x36\x4d\x6d\xbf\x04\x71\x12\x39\x2c\xb3\x44\x8a\x75\xed\x96\x93\x30\xb4\x07\x53\x60\x9c\x05\x25\xbc\xe8\x53\x53\xd7\xfa\xc8\x81\xa0\x34\x14\xc3\xae\xe1\x0f\x96\xad\x6c\x38\xa5\xa1\xe0\xc2\x75\x17\xf2\x00\xa5\x3d\x84\x63\xc6\x1a\x83\xd2\x87\x3d\xc4\x8f\x43\x37\x9f\xf7\x0e\x84\x2d\x95\x95\xaf\xfa\x47\x59\x3b\xa2\x33\xda\xcb\x4c\xea\x86\x37\xdf\x8c\xf1\x4b\xa7\x21\xf9\x42\xb1\xd5\x86\x50\xbc\x8b\xa4\xd7\x77\x23\xa7\xb8\xeb\x08\x7d\x38\x96\xc6\x89\x1d\x6c\xe8\xe8\xf9\x24\xf5\x8e\x29\xc3\xf9\x92\x20\x70\x6a\x71\x4b\xbd\x9a\x8c\x76\x02\x45\x50\x35\x14\xce\xb9\x10\x3d\x85\x45\xac\xa6\x75\xc0\xf5\x30\x8d\xc3\x15\xf7\xba\x3b\x8d\xde\xa4\xb6\x74\xbd\x15\xab\x90\x97\x88\xe4\x98\x1b\x19\xc2\x58\x18\xf1\x7d\x5e\x28\xb7\x3a\x41\xfd\xc9\x88\x9a\x87\x46\xe3\xf4\xea\xe1\x01\xb2\x8f\xca\x7f\xf9\xfd\x37\x78\x7c\x3c\xa1\x58\x3b\x61\x64\xd9\x11\xfd\x12\x7e\x9d\xa3\xab\x85\x0f\x54\xf7\x21\x4a\xf4\x77\xab\x4c\xe0\xe0\x5a\x27\x98\xce\xa6\xe7\x98\xc2\xf9\xde\xc9\x0e\xdf\x23\xce\x51\x35\x84\xae\xb7\x92\xd0\x9d\xa3\xc1\x4a\xa8\x5e\xd2\xaf\xfc\x23\xa5\x3a\xdb\xf3\xc8\x65\x72\xb0\x9c\x5a\x34\xe1\xce\xde\x2a\x1f\xc0\x48\xf9\x27\xab\x70\x57\x9b\xac\xa9\x6d\xeb\xb6\x69\x57\x2f\x74\x71\xc7\xd1\xca\x62\xae\xd5\x5f\x77\x78\x04\x55\xfc\xfc\xb2\x69\x11\xa9\x13\xab\x58\x84\xf0\x8d\xc3\xd1\x3e\x7e\x46\x57\x78\x7d\x9c\xf7\xf4\x74\x1e\xef\xd8\x77\x83\x5f\x7d\x17\x80\xa4\x23\x85\x81\x69\x53\x93\x77\x28\xaa\x69\xd7\x2f\x89\x90\xd7\x98\x6d\xb3\x19\xfc\x8b\xd7\x4d\x78\xa7\x6d\x53\xbc\xc9\xc2\xb9\xe1\xed\x8e\xd7\x07\x82\x5a\x38\xaf\x64\xa3\x85\x83\xf6\xd2\x6d\xa5\x3c\x6d\xf5\x56\xeb\xea\x40\xbc\xd1\x4a\x96\x95\x85\x35\x36\x8b\x7b\xac\xa8\xd5\xe2\xc9\x86\xcd\x6c\x41\xd1\x4a\xac\xe5\xf2\x87\xab\xd3\xff\xa7\x0e\xdf\xa3\xdb\x9f\xf9\x88\xc4\x53\x6f\xc0\x39\xce\xda\x4f\x69\xc3\x89\x1d\x37\xaa\x8b\x4d\x8f\x3e\xf9\x32\x75\x91\x7c\xdc\x4a\xbe\x52\xb1\x8b\xe1\x9c\x0a\x93\x27\x1b\x15\xa7\x56\xe4\xd1\xcc\x5b\x13\x56\xf9\xd5\xe5\xd5\x72\x32\x79\x78\x70\xc2\x6c\x11\xb2\xb7\x45\xa1\xe2\x8e\xfa\x41\x37\x5f\xdf\xf2\x40\x79\x7c\x1c\xf8\xb9\xa0\xb9\x90\x1f\x1e\xd0\x14\x8f\x8f\xc3\x7d\xf7\xb9\x8e\x5c\xf0\xfe\xf6\xbe\x03\x31\x9a\xb5\xb3\xb5\x71\x2d\xa4\x81\x29\xac\x27\xb0\x81\x18\x2a\x71\x0c\x2b\xb9\xde\x0f\xc7\x99\x21\x6d\xed\xae\xa9\x41\x11\x35\x48\x60\x0d\x90\xad\x10\x3e\x35\x6b\x74\x06\x3d\x12\x84\x2f\x09\x34\xdc\x5e\x85\xa1\x6e\xeb\x9f\xde\x5a\x83\xd3\xf4\xcd\xbb\x60\x40\x7a\x7d\x45\xe5\x34\x3e\xc8\xba\x19\x19\xec\x1b\xbd\xe9\xc7\xf7\x74\x39\x9d\xfc\x2f\x00\x00\xff\xff\xee\x1f\x18\x55\x2a\x15\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰FileInfo{
 			name:    "flux-secret.yaml.tmpl",
-			modTime: time.Date(2019, 7, 24, 14, 29, 53, 668285520, time.UTC),
+			modTime: time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
 			content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x66\x6c\x75\x78\x2d\x67\x69\x74\x2d\x64\x65\x70\x6c\x6f\x79\x0a\x20\x20\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x3a\x20\x7b\x7b\x20\x2e\x4e\x61\x6d\x65\x73\x70\x61\x63\x65\x20\x7d\x7d\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 14, 32, 56, 924980880, time.UTC),
+			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
 			uncompressedSize: 846,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\xcd\x8e\xd3\x40\x10\x84\xef\x7e\x8a\x92\x72\xc5\x41\x5e\x29\x17\xdf\x10\x0b\x68\x25\x58\xe5\xb2\xdc\x3b\xe3\x8e\x33\x62\xfe\x98\x6e\x87\x98\xd5\xbe\x3b\x9a\xfc\x38\x0e\x9b\x3e\x25\x53\xfd\x75\xd7\x94\xa7\xae\xeb\x6a\x01\xcf\xde\x90\xd9\x71\x87\x8e\x93\x8b\xa3\xe7\xa0\x18\x84\x3b\x6c\x46\x7c\x75\xc3\x01\x1a\x71\xec\xa8\x16\x30\x31\x28\xd9\xc0\x19\xd6\x53\xcf\xf0\xac\xd4\x91\xd2\xb2\xa2\x64\x7f\x72\x16\x1b\x43\x0b\x4a\x49\x3e\xee\x9b\xea\x97\x0d\x5d\x8b\xc7\x69\x6c\x75\x69\x6f\x2b\x20\x90\xe7\xf6\xba\xfd\x7c\x22\x89\x0c\xb7\x78\x7d\xc5\xf2\xf9\xf2\x17\x6f\x6f\x95\x24\x36\x85\xca\x9c\x9c\x35\x24\x2d\x9a\x0a\x10\x76\x6c\x34\xe6\xa2\x00\x9e\xd4\xec\xbe\xd3\x86\x9d\x9c\x0e\xee\x2d\x51\xf6\xc9\x91\xf2\x19\x99\x19\x2a\xe5\x6e\xe8\x7b\x3c\x70\xb1\x52\x6a\xca\x63\x62\xea\xbb\x4c\xa9\x63\x62\x33\xa1\x6d\x96\xab\x65\xb3\xba\xd5\xd7\x83\x73\xeb\xe8\xac\x19\x5b\x3c\x6d\x9f\xa3\xae\x33\x4b\x89\xee\xd2\x45\xb9\x9f\xf9\xab\x51\x7b\xac\x9a\x07\x00\x0b\xfc\xa0\x83\xf5\x83\x2f\x1b\x62\x1e\xcb\x67\x1b\x84\x3f\xc0\x06\x78\xee\x69\x33\x2a\xcb\x1c\x7c\xc2\xca\xe3\x06\x14\xfb\x97\xb1\x8d\x19\x31\x30\xac\xb2\x9f\xb7\x27\x34\xcd\x43\xd3\x60\x81\x47\xde\xd2\xe0\x14\x29\xe6\xab\xaf\x45\xe9\xd9\xef\x4f\x3f\x5f\x82\x89\xfe\xf8\x90\x34\xa2\x67\x85\x8b\xbd\x20\x6e\xc1\x64\x76\xc8\xfc\x7b\x60\x51\x50\xe8\x90\x59\x52\x0c\xc2\xcb\x69\x50\x99\x7a\x73\xc3\x53\x9e\xc6\x59\x0e\x7a\xbd\xc0\x2c\xfb\x75\xcc\xda\x9e\xdc\x4d\xb2\xb0\x19\xb2\xd5\xf1\x73\x0c\xca\x07\x6d\x67\x5c\x1e\xc2\x27\x79\x11\xce\xff\x33\x67\xe9\x5b\x8e\x43\x7a\xaf\x91\x73\xf1\xcf\x3a\xdb\xbd\x75\xdc\xf3\x17\x31\xe4\x48\x8f\xcf\x7d\x4b\x4e\xb8\xfa\x17\x00\x00\xff\xff\xd9\x0a\x29\x86\x4e\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 24, 14, 59, 5, 473563594, time.UTC),
+			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
 			uncompressedSize: 178,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8c\x41\x0a\x02\x31\x14\x43\xf7\xff\x14\xb9\x40\x85\xba\xfc\x87\x70\x23\xb8\xff\xfc\x09\x58\xb4\xd3\xd2\x96\xd9\x0c\x73\x77\x29\xea\x46\xcc\x2a\x09\x79\x09\x21\x88\xd5\x74\x63\xeb\xa9\xac\x8a\x2d\xca\x23\xad\x8b\xe2\xca\xb6\x25\xa7\x64\x0e\x5b\x6c\x98\x0a\xb0\x5a\xa6\x22\x33\xbb\xf9\x9d\xcb\xa7\xe9\xd5\x9c\x8a\x7d\xc7\xe9\xf2\x8d\x38\x0e\xe9\x95\x3e\xa9\x5a\xda\xe8\xd3\x00\xe1\xcf\xc5\xd4\x9c\x28\x62\x3c\xc7\x28\x40\xe7\x93\x3e\x4a\x7b\x33\xbf\xc4\x2b\x00\x00\xff\xff\xa8\x2c\x5b\x6b\xb2\x00\x00\x00"),
diff --git a/cmd/fluxctl/install/install.go b/install/install.go
similarity index 100%
rename from cmd/fluxctl/install/install.go
rename to install/install.go
diff --git a/cmd/fluxctl/install/install_test.go b/install/install_test.go
similarity index 100%
rename from cmd/fluxctl/install/install_test.go
rename to install/install_test.go
diff --git a/cmd/fluxctl/install/templates/flux-account.yaml.tmpl b/install/templates/flux-account.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install/templates/flux-account.yaml.tmpl
rename to install/templates/flux-account.yaml.tmpl
diff --git a/cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install/templates/flux-deployment.yaml.tmpl
rename to install/templates/flux-deployment.yaml.tmpl
diff --git a/cmd/fluxctl/install/templates/flux-secret.yaml.tmpl b/install/templates/flux-secret.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install/templates/flux-secret.yaml.tmpl
rename to install/templates/flux-secret.yaml.tmpl
diff --git a/cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl b/install/templates/memcache-dep.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install/templates/memcache-dep.yaml.tmpl
rename to install/templates/memcache-dep.yaml.tmpl
diff --git a/cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl b/install/templates/memcache-svc.yaml.tmpl
similarity index 100%
rename from cmd/fluxctl/install/templates/memcache-svc.yaml.tmpl
rename to install/templates/memcache-svc.yaml.tmpl

From 027bcceecdb136a29f775ae2c5ddbd688b0a42a5 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 16:15:55 +0200
Subject: [PATCH 072/158] Generate deploy/ automatically

---
 Makefile                                    |  11 +-
 cmd/fluxctl/install_cmd.go                  |  13 +-
 deploy/flux-account.yaml                    |  37 +++++
 deploy/flux-deployment.yaml                 | 150 ++++++++++++++++++++
 deploy/flux-secret.yaml                     |   6 +
 deploy/memcache-dep.yaml                    |  33 +++++
 deploy/memcache-svc.yaml                    |  11 ++
 install/generate.go                         |  50 +++++--
 install/generated_templates.gogen.go        |  72 +++-------
 install/install.go                          |   8 +-
 install/install_test.go                     |  49 ++++---
 install/templates/flux-account.yaml.tmpl    |   6 +-
 install/templates/flux-deployment.yaml.tmpl |  26 ++--
 install/templates/flux-secret.yaml.tmpl     |   4 +-
 install/templates/memcache-dep.yaml.tmpl    |   4 +-
 install/templates/memcache-svc.yaml.tmpl    |   4 +-
 16 files changed, 376 insertions(+), 108 deletions(-)
 create mode 100644 deploy/flux-account.yaml
 create mode 100644 deploy/flux-deployment.yaml
 create mode 100644 deploy/flux-secret.yaml
 create mode 100644 deploy/memcache-dep.yaml
 create mode 100644 deploy/memcache-svc.yaml

diff --git a/Makefile b/Makefile
index 993f74811..7b72a19cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .DEFAULT: all
-.PHONY: all release-bins clean realclean test integration-test check-generated
+.PHONY: all release-bins clean realclean test integration-test generate-deploy check-generated
 
 SUDO := $(shell docker info > /dev/null 2> /dev/null || echo "sudo")
 
@@ -120,10 +120,15 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
+
+
+generate-deploy: install/generated_templates.gogen.go
+	cd deploy && go run ../install/generate.go deploy
+
 install/generated_templates.gogen.go: install/templates/*
-	cd install && go run generate.go
+	cd install && go run generate.go embedded-templates
 
-check-generated: install/generated_templates.gogen.go
+check-generated: generate-deploy install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
 	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index 25c2c8d08..d7d181f67 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -28,7 +27,7 @@ fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | ku
 		"URL of the Git repository to be used by Flux, e.g. git@github.com:<your username>/flux-get-started")
 	cmd.Flags().StringVarP(&opts.GitBranch, "git-branch", "", "master",
 		"Git branch to be used by Flux")
-	cmd.Flags().StringSliceVarP(&opts.GitPaths, "git-paths", "", []string{"/"},
+	cmd.Flags().StringSliceVarP(&opts.GitPaths, "git-paths", "", []string{},
 		"Relative paths within the Git repo for Flux to locate Kubernetes manifests")
 	cmd.Flags().StringVarP(&opts.GitLabel, "git-label", "", "flux",
 		"Git label to keep track of Flux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
@@ -47,12 +46,16 @@ func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	if opts.GitURL == "" {
 		fmt.Errorf("please supply a valid --git-url argument")
 	}
-	templates, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
+	manifests, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
 	if err != nil {
 		return err
 	}
-	_, err = io.Copy(os.Stdout, templates)
-	return err
+	for fileName, content := range manifests {
+		if _, err := os.Stdout.Write(content); err != nil {
+			fmt.Errorf("cannot output manifest file %s: %s", fileName, err)
+		}
+
+	}
 
 	return nil
 }
diff --git a/deploy/flux-account.yaml b/deploy/flux-account.yaml
new file mode 100644
index 000000000..4bf7702e2
--- /dev/null
+++ b/deploy/flux-account.yaml
@@ -0,0 +1,37 @@
+---
+# The service account, cluster roles, and cluster role binding are
+# only needed for Kubernetes with role-based access control (RBAC).
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    name: flux
+  name: flux
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  labels:
+    name: flux
+  name: flux
+rules:
+  - apiGroups: ['*']
+    resources: ['*']
+    verbs: ['*']
+  - nonResourceURLs: ['*']
+    verbs: ['*']
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    name: flux
+  name: flux
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: flux
+subjects:
+  - kind: ServiceAccount
+    name: flux
+    namespace: default
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
new file mode 100644
index 000000000..5224f5a54
--- /dev/null
+++ b/deploy/flux-deployment.yaml
@@ -0,0 +1,150 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: flux
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: flux
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        prometheus.io.port: "3031" # tell prometheus to scrape /metrics endpoint's port.
+      labels:
+        name: flux
+    spec:
+      serviceAccountName: flux
+      volumes:
+      - name: git-key
+        secret:
+          secretName: flux-git-deploy
+          defaultMode: 0400 # when mounted read-only, we won't be able to chmod
+
+      # This is a tmpfs used for generating SSH keys. In K8s >= 1.10,
+      # mounted secrets are read-only, so we need a separate volume we
+      # can write to.
+      - name: git-keygen
+        emptyDir:
+          medium: Memory
+
+      # The following volume is for using a customised known_hosts
+      # file, which you will need to do if you host your own git
+      # repo rather than using github or the like. You'll also need to
+      # mount it into the container, below. See
+      # https://github.com/weaveworks/flux/blob/master/site/standalone-setup.md#using-a-private-git-host
+      # - name: ssh-config
+      #   configMap:
+      #     name: flux-ssh-config
+
+      # The following volume is for using a customised .kube/config,
+      # which you will need to do if you wish to have a different
+      # default namespace. You will also need to provide the configmap
+      # with an entry for `config`, and uncomment the volumeMount and
+      # env entries below.
+      # - name: kubeconfig
+      #   configMap:
+      #     name: flux-kubeconfig
+
+      # The following volume is used to import GPG keys (for signing
+      # and verification purposes). You will also need to provide the
+      # secret with the keys, and uncomment the volumeMount and args
+      # below.
+      # - name: gpg-keys
+      #   secret:
+      #     secretName: flux-gpg-keys
+      #     defaultMode: 0400
+
+      containers:
+      - name: flux
+        # There are no ":latest" images for flux. Find the most recent
+        # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
+        # and replace the tag here.
+        image: docker.io/fluxcd/flux:1.13.2
+        imagePullPolicy: IfNotPresent
+        resources:
+          requests:
+            cpu: 50m
+            memory: 64Mi
+        ports:
+        - containerPort: 3030 # informational
+        volumeMounts:
+        - name: git-key
+          mountPath: /etc/fluxd/ssh # to match location given in image's /etc/ssh/config
+          readOnly: true # this will be the case perforce in K8s >=1.10
+        - name: git-keygen
+          mountPath: /var/fluxd/keygen # to match location given in image's /etc/ssh/config
+
+        # Include this if you need to mount a customised known_hosts
+        # file; you'll also need the volume declared above.
+        # - name: ssh-config
+        #   mountPath: /root/.ssh
+
+        # Include this and the volume "kubeconfig" above, and the
+        # environment entry "KUBECONFIG" below, to override the config
+        # used by kubectl.
+        # - name: kubeconfig
+        #   mountPath: /etc/fluxd/kube
+
+        # Include this to point kubectl at a different config; you
+        # will need to do this if you have mounted an alternate config
+        # from a configmap, as in commented blocks above.
+        # env:
+        # - name: KUBECONFIG
+        #   value: /etc/fluxd/kube/config
+
+        # Include this and the volume "gpg-keys" above, and the
+        # args below.
+        # - name: gpg-keys
+        #   mountPath: /root/gpg-import
+        #   readOnly: true
+
+        args:
+
+        # If you deployed memcached in a different namespace to flux,
+        # or with a different service name, you can supply these
+        # following two arguments to tell fluxd how to connect to it.
+        # - --memcached-hostname=memcached.default.svc.cluster.local
+
+        # Use the memcached ClusterIP service name by setting the
+        # memcached-service to string empty
+        - --memcached-service=
+
+        # This must be supplied, and be in the tmpfs (emptyDir)
+        # mounted above, for K8s >= 1.10
+        - --ssh-keygen-dir=/var/fluxd/keygen
+
+        # Replace the following URL to change the Git repository used by Flux.
+        - --git-url=git@github.com:weaveworks/flux-get-started
+        - --git-branch=master
+        # include this if you want to restrict the manifests considered by flux
+        # to those under the following relative paths in the git repository
+        # - --git-path=subdir1,subdir2
+
+        # Include these two to enable git commit signing
+        # - --git-gpg-key-import=/root/gpg-import
+        # - --git-signing-key=<key id>
+        
+        # Include this to enable git signature verification
+        # - --git-verify-signatures
+
+        # Include these next two to connect to an "upstream" service
+        # (e.g., Weave Cloud). The token is particular to the service.
+        # - --connect=wss://cloud.weave.works/api/flux
+        # - --token=abc123abc123abc123abc123
+
+        # Serve /metrics endpoint at different port;
+        # make sure to set prometheus' annotation to scrape the port value.
+        - --listen-metrics=:3031
+
+
+      # Optional DNS settings, configuring the ndots option may resolve
+      # nslookup issues on some Kubernetes setups.
+      # dnsPolicy: "None"
+      # dnsConfig:
+      #   options:
+      #     - name: ndots
+      #       value: "1"
diff --git a/deploy/flux-secret.yaml b/deploy/flux-secret.yaml
new file mode 100644
index 000000000..f3c110ebf
--- /dev/null
+++ b/deploy/flux-secret.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: flux-git-deploy
+type: Opaque
diff --git a/deploy/memcache-dep.yaml b/deploy/memcache-dep.yaml
new file mode 100644
index 000000000..1e0728bc7
--- /dev/null
+++ b/deploy/memcache-dep.yaml
@@ -0,0 +1,33 @@
+---
+# memcached deployment used by Flux to cache
+# container image metadata.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: memcached
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: memcached
+  template:
+    metadata:
+      labels:
+        name: memcached
+    spec:
+      containers:
+      - name: memcached
+        image: memcached:1.5.15
+        imagePullPolicy: IfNotPresent
+        args:
+        - -m 512   # Maximum memory to use, in megabytes
+        - -I 5m    # Maximum size for one item
+        - -p 11211 # Default port
+        # - -vv    # Uncomment to get logs of each request and response.
+        ports:
+        - name: clients
+          containerPort: 11211
+        securityContext:
+          runAsUser: 11211
+          runAsGroup: 11211
+          allowPrivilegeEscalation: false
diff --git a/deploy/memcache-svc.yaml b/deploy/memcache-svc.yaml
new file mode 100644
index 000000000..ab01cf718
--- /dev/null
+++ b/deploy/memcache-svc.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: memcached
+spec:
+  ports:
+    - name: memcached
+      port: 11211
+  selector:
+    name: memcached
diff --git a/install/generate.go b/install/generate.go
index 5991238f8..2e9acebd2 100644
--- a/install/generate.go
+++ b/install/generate.go
@@ -3,20 +3,54 @@
 package main
 
 import (
+	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 
 	"github.com/shurcooL/vfsgen"
+
+	"github.com/weaveworks/flux/install"
 )
 
 func main() {
-	var fs http.FileSystem = http.Dir("templates/")
-	err := vfsgen.Generate(fs, vfsgen.Options{
-		Filename:     "generated_templates.gogen.go",
-		PackageName:  "install",
-		VariableName: "templates",
-	})
-	if err != nil {
-		log.Fatalln(err)
+	usage := func() {
+		fmt.Fprintf(os.Stderr, "usage: %s {embedded-templates,deploy}\n", os.Args[0])
+		os.Exit(1)
+	}
+	if len(os.Args) != 2 {
+		usage()
+	}
+	switch os.Args[1] {
+	case "embedded-templates":
+		var fs http.FileSystem = http.Dir("templates/")
+		err := vfsgen.Generate(fs, vfsgen.Options{
+			Filename:     "generated_templates.gogen.go",
+			PackageName:  "install",
+			VariableName: "templates",
+		})
+		if err != nil {
+			log.Fatalln(err)
+		}
+	case "deploy":
+		params := install.TemplateParameters{
+			GitURL:    "git@github.com:weaveworks/flux-get-started",
+			GitBranch: "master",
+		}
+		manifests, err := install.FillInInstallTemplates(params)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "error: failed to fill in templates: %s\n", err)
+			os.Exit(1)
+		}
+		for fileName, contents := range manifests {
+			if err := ioutil.WriteFile(fileName, contents, 0600); err != nil {
+				fmt.Fprintf(os.Stderr, "error: failed to write deploy file %s: %s\n", fileName, err)
+				os.Exit(1)
+			}
+		}
+
+	default:
+		usage()
 	}
 }
diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index bb01350b4..46c2fca78 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,40 +19,42 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 25, 13, 14, 42, 628321870, time.UTC),
+			modTime: time.Date(2019, 7, 25, 14, 38, 46, 214627251, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
-			uncompressedSize: 764,
+			modTime:          time.Date(2019, 7, 25, 13, 36, 31, 869053652, time.UTC),
+			uncompressedSize: 836,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x52\xbb\x6e\xc2\x30\x14\xdd\xfd\x15\x47\x62\xa0\xad\x48\x2a\xb6\x2a\x1b\x30\x74\x68\xd5\x21\x7d\x2c\x55\x87\x6b\xe7\x52\x5c\x8c\x1d\xf9\x91\x3e\x10\xff\x5e\x85\x80\x04\x82\x22\x21\x75\xcb\x3d\x3a\x37\xe7\x71\x9d\x65\x99\xe8\xe1\x69\xc6\x08\xec\x1b\xad\x18\xa4\x94\x4b\x36\x0e\xa0\x4c\x0a\x91\x3d\xbc\x33\x1c\x06\x20\x5b\xed\x41\x90\xda\x56\xda\xbe\x83\x3c\x8b\x1e\x9c\x35\xdf\xb0\xcc\x15\x57\x98\x3a\x8f\xbb\x24\xd9\x5b\x8e\x1c\xf0\xa9\xe3\x6c\xbd\x92\x49\x0a\x5c\xb5\x0a\x1c\x02\x94\xb3\xd1\x3b\x83\x8b\x72\x3c\x9a\x5c\xe6\x82\x6a\xfd\xc2\x3e\x68\x67\x0b\x34\x43\x31\xd7\xb6\x2a\xf0\xd8\xb9\x1a\x75\xa6\xc4\x82\x23\x55\x14\xa9\x10\x80\x21\xc9\x26\xb4\x5f\x80\xa5\x05\x17\x98\x9a\xf4\x25\x8e\x0c\xa1\x26\xc5\x05\x96\x4b\xe4\x0f\xdb\x11\xab\x95\x68\xc3\xef\xaa\x7a\x49\x2a\xa7\x14\x67\xce\xeb\x1f\x8a\xda\xd9\x7c\x7e\x13\x72\xed\xae\x9b\xa1\xe4\x48\x5b\x53\x93\xae\x86\xd2\x19\x3e\xdb\x91\x4f\x86\xd7\x94\x0c\x54\xeb\x5b\xef\x52\x1d\x0a\xbc\xf6\xaf\xfa\x6f\xeb\x3d\xcf\xc1\x25\xaf\x78\x0f\x6c\xd8\xcb\x1d\x20\x83\x75\xb6\xdc\x10\x9f\xcb\xfb\xbf\xb9\xff\x90\x70\xdc\x9d\xf9\xfc\xa0\xce\x70\xc9\xd3\x96\xb4\x0d\x7a\x42\x5f\x00\x87\xdd\xee\xfd\x2f\x24\xf9\xc1\x2a\x6e\xba\x3b\xfa\x3a\x0e\xec\x9c\x3e\xff\x6f\x00\x00\x00\xff\xff\xd0\x46\x0b\xa3\xfc\x02\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x92\x4b\xaf\xd3\x30\x10\x85\xf7\xfe\x15\x47\xba\x8b\x0b\xe8\x26\xa8\x3b\x94\x5d\xdb\x05\x0b\x10\x8b\xf0\xd8\x20\x16\x63\x7b\x42\x4d\x5d\x3b\xf2\x23\x3c\xa2\xfc\x77\x94\xa4\x95\x9a\xb6\x20\x55\xba\x3b\x7b\x7c\xc6\x73\xe6\xe8\x2b\x8a\x42\x3c\xe0\xd3\x8e\x11\x39\x74\x46\x31\x48\x29\x9f\x5d\x7a\x82\xb2\x39\x26\x0e\x08\xde\x72\x7c\x02\x39\xbd\x28\x41\x1a\xa7\x8d\xfb\x0e\x0a\x2c\x1e\xe0\x9d\xfd\x0d\xc7\xac\x59\xa3\xf1\x01\xef\xb2\xe4\xe0\x38\x71\xc4\x4f\x93\x76\x53\x4b\x21\x29\xb2\x1e\x27\x70\x8c\x50\xde\xa5\xe0\x2d\x5e\xd4\x9b\xf5\xf6\x65\x29\xa8\x35\x5f\x38\x44\xe3\x5d\x85\x6e\x25\xf6\xc6\xe9\x0a\x1f\x67\x57\xeb\xd9\x94\x38\x70\x22\x4d\x89\x2a\x01\x58\x92\x6c\xe3\x78\x02\x1c\x1d\xb8\x42\x63\xf3\x2f\x71\x7e\xe9\x7b\x98\x06\xe5\x07\x3a\x70\x6c\x49\x31\x86\xe1\xf8\x3e\x5d\x2b\xf4\xfd\xf2\xb5\xef\xc1\x4e\x0f\x83\x18\x73\x39\x37\x14\x24\xa9\x92\x72\xda\xf9\x60\xfe\x50\x32\xde\x95\xfb\x37\xb1\x34\xfe\x75\xb7\x92\x9c\xe8\xe4\x77\x3b\x27\x54\x7b\xcb\xf7\x9a\x15\x21\x5b\x9e\x24\x05\xa8\x35\x6f\x83\xcf\x6d\xac\xf0\xf5\xf1\xd5\xe3\xb7\xa9\x2f\x70\xf4\x39\x28\x5e\x14\x3b\x0e\xf2\xac\x50\xc0\x79\x57\x1f\x85\x9f\xeb\xf7\xff\xd6\x3e\xc3\x86\x9b\x99\x80\xfb\x17\xf5\x96\x6b\x6e\x46\xd1\x69\xd1\xff\xcc\x17\xc0\x75\xb6\x8b\xff\x62\x96\x3f\x58\xa5\x63\x76\x37\xc1\xb9\xb2\x73\x89\xc1\x25\x27\xb7\xc8\xb0\x71\x3c\x69\x6e\x28\xdb\x34\xa3\x32\x12\xf5\x37\x00\x00\xff\xff\xfd\x7f\x67\x6a\x44\x03\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
-			uncompressedSize: 5418,
+			modTime:          time.Date(2019, 7, 25, 14, 38, 46, 213126179, time.UTC),
+			uncompressedSize: 5899,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x6d\x6f\xdb\x46\xf2\x7f\xaf\x4f\x31\x50\x5e\x38\x01\x24\xca\xaa\xfb\xff\xe3\xc0\x9e\x0a\xa4\x49\x93\xf3\xa5\x76\x8c\xfa\x72\x87\x7b\x75\x5d\x2d\x47\xe2\x42\xcb\x5d\xde\xce\x52\x8a\x60\xf8\xbb\x1f\x66\x97\x0f\x4b\x4b\x76\x8a\xf4\x45\x63\x91\xf3\xfc\xf0\x9b\x19\xce\xe7\xf3\x89\xa8\xd5\x3f\xd1\x91\xb2\x26\x07\x51\xd7\xb4\xd8\x2f\x27\x3b\x65\x8a\x1c\xde\x63\xad\xed\xb1\x42\xe3\x27\x15\x7a\x51\x08\x2f\xf2\x09\x80\x11\x15\xe6\xb0\xd1\xcd\xd7\xf6\x07\xd5\x42\x62\x0e\x0f\x0f\x90\xdd\x76\x3f\xe1\xf1\x71\x42\x35\x4a\x66\x70\x58\x6b\x25\x05\xe5\xb0\x9c\x00\x10\x6a\x94\xde\x3a\x7e\x03\x50\x09\x2f\xcb\xdf\xc4\x1a\x35\xc5\x07\x4f\xe4\x93\x77\xc2\xe3\xf6\x18\x5f\xfa\x63\x8d\x39\xfc\x8e\xd2\xa1\xf0\x38\x01\xf0\x58\xd5\x5a\x78\x6c\x85\x25\x56\xf2\x7f\xc2\x18\xeb\x85\x57\xd6\xf4\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\xa6\x57\x97\x57\xcb\x29\xbc\x02\x8f\x5a\x27\x14\xe0\x2d\x90\x74\xa2\x46\x58\x54\xe8\x9d\x92\x04\x68\x8a\xda\x2a\xe3\x2f\x08\x98\x39\x6b\x05\xeb\x91\x0f\x4f\xbc\x00\xe8\x62\x11\xfe\x46\xb7\x57\x12\xdf\x4a\x69\x1b\xe3\x6f\xc7\x84\x00\x7b\xab\x9b\x0a\x7b\x51\xf3\x56\xd4\x56\xf9\xf9\x0e\x8f\xbd\x02\xe2\x28\xf8\x41\x61\xf7\x64\x90\x37\x67\x96\x22\x24\x31\xa1\x2a\x70\x23\x1a\xed\x6f\x6c\x81\x39\x5c\xfe\x78\x79\x09\xaf\xe0\x50\xa2\x81\x8a\xad\xc1\x02\x1c\x8a\x62\x6e\x8d\x3e\xce\xe0\x80\x70\xb0\xe6\xc2\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\x62\xd2\x0a\x7c\x05\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\xee\xef\xff\x06\x3b\x3c\x52\x06\xd7\x06\x3e\xfd\x85\xe0\xe7\x15\x2c\xb3\xe5\xe5\xac\x97\xd2\xe9\x8e\x2e\x10\x08\x87\xa9\x1d\x64\xd9\x14\x83\x58\x80\x00\xc2\x5a\x70\x51\xb4\x81\x82\x03\xf6\x62\xa4\x30\x70\x70\xca\xb3\xa1\xd9\xf9\xf8\x6d\xd1\xf4\xc1\xc0\xaa\xf6\xc7\xf7\xca\xa5\x41\xac\xb0\x50\x4d\x95\xc3\x0d\x56\xd6\x1d\x53\x3f\x11\x36\x56\x6b\x7b\x60\x8f\x5a\xd5\x8a\x82\xab\x0d\xf1\x33\x01\xb2\x21\x6f\x2b\xc5\x11\xd8\x19\x7b\x30\xff\x29\x2d\x79\xea\x45\x6c\x94\xc6\x19\x1c\x4a\x25\x4b\x38\xda\x06\x0e\x4a\xeb\xe8\x94\xb7\x50\x58\x50\x9b\xf0\x98\x99\xf8\x0f\x07\xf6\x60\xd8\xec\x5e\x80\xc3\xda\x82\x13\xbe\x44\x07\xbe\x14\xa6\x55\xbc\x55\xbe\x6c\xd6\x60\xf9\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\xb9\xd0\x1a\x84\x26\xdb\xa9\x18\x07\x1b\x94\x07\x65\xbc\x0d\x3c\xd2\x1a\x2f\x94\x41\x37\x83\x35\x6a\x7b\xc8\xe0\x1e\x87\xa8\x96\xde\xd7\x94\x2f\x16\x51\x4f\x26\x6d\xb5\x38\xa0\xd8\xe3\xc1\xba\x1d\x2d\xb8\xd2\x16\x6b\x6d\xd7\x8b\x4a\x90\x47\xb7\x20\xe5\x71\x41\x5e\x98\x42\x68\x6b\x70\x4e\xe8\x9b\x3a\xab\x8a\x57\xc1\xda\xb9\x98\xd7\x4e\xed\x85\xc7\x50\x9e\xec\x6c\xaf\xa8\x4b\x15\x51\x39\x97\xd6\x6c\xd4\xb6\x7f\x05\x10\x1f\xdc\x88\x3a\x4f\x1e\xa6\x7d\x36\x4f\xd8\xbe\x37\x6d\xd9\xae\x59\xe3\x22\x0a\x19\xaa\xf3\x9b\x29\x3b\x28\x2a\xf9\x49\x29\xf6\x08\x02\x0a\xb5\xd9\xa0\x63\xdc\xec\x24\xb4\x4d\x37\xc0\x65\xc8\x50\x14\x97\xe6\x88\xb1\x67\xaf\x0a\xec\xb2\xb2\x51\xdb\x4a\xd4\x83\x21\xca\x97\x20\x0c\xa0\xf1\xee\x18\x7c\xf8\x23\x12\xfd\x31\x03\x61\x0a\x68\x8c\xb4\x15\x03\x76\xe0\x8f\xde\xde\x84\x6c\x0b\x53\xf4\x52\xd0\xec\x83\x04\x85\xd4\xa6\xfb\x24\x03\x1c\x86\xef\xc8\x40\xc2\xf6\xcd\x0c\x04\xa0\xf0\x16\x54\xc5\x30\x0a\x1f\xef\x3e\x06\x8c\x80\xd7\xec\x16\xa9\xad\x51\x66\x50\xce\xce\xed\xd1\xa9\x8d\x92\x01\xcf\xa1\x6e\x5c\x6d\x09\xe9\xcd\x9f\x08\x64\x2f\x25\xa2\x4b\x8c\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xa1\x8b\x9f\x89\xd8\xb6\xde\x32\xbc\x50\x12\x9a\x31\x42\xbf\x7a\x06\xa3\x4f\xf9\xce\x60\x74\x17\xce\xbe\x51\x4f\xc6\x43\x32\x40\xda\xa8\x3b\x0c\x30\x6a\x2c\x4c\x73\x9e\x91\xe4\xa7\xa0\x2a\xb1\xc5\x58\xfd\xcc\x90\xc1\x07\x65\x8a\xe0\x73\xc5\xa8\xe3\x50\x0e\x55\x1b\x11\x47\xa3\x20\x64\x6c\x09\xac\x9c\x04\x5e\x15\x40\xf8\x1e\x16\x18\x13\x0a\x2b\x77\xe8\x02\x34\xb8\x13\x70\xf0\xa2\x0f\x5f\x97\x4b\x5e\x09\x78\x4b\x60\xcd\x5e\x6c\x81\xad\xcd\x7a\x9a\xa0\x2a\x87\x56\xa8\xb2\x41\x8c\x2c\xc2\x3f\xf9\x32\x5b\x5e\x65\x3f\x8c\x69\xef\x1a\xad\xef\xac\x56\xf2\x98\xc3\xf5\xe6\xd6\xfa\x3b\x87\x94\x7a\xe2\x90\x6c\xe3\x24\x52\x0a\xf5\x0e\xff\xdb\x20\xf9\xd1\x33\x00\x59\x37\x39\xfc\xdf\x65\x35\x7a\x58\x85\x69\x90\xc3\xff\xff\x78\xa3\x86\x4d\xc2\xba\x94\x79\x3e\x64\xe7\x2e\x6c\x15\x57\x97\x57\x3c\x5c\x95\xd9\x58\x57\x85\xb2\x15\xba\xa7\x4e\x6a\x6c\x24\xe3\xfc\xb0\x87\x08\xda\x77\xc2\x97\x39\x2c\xd0\xcb\x10\x8b\x62\x41\x54\xf2\xd6\x62\xe3\x1e\x05\xda\xb6\xed\xb1\x55\x7b\x34\xa0\x4c\x0c\xcf\x05\x45\x1e\xa2\x72\x31\xea\xea\x18\x05\x51\x7c\x36\xfa\x98\x83\x77\x0d\xb2\x34\x9e\xe8\xa1\xa1\xd6\x2d\x0e\x71\x05\xd4\xe8\x36\xd6\x49\x64\xa1\x71\x84\xf3\x04\x7f\xce\xf0\x74\xca\x8e\x6d\xdf\x0b\xd7\xda\x1e\xc9\xbe\xcf\xfc\xa4\x9c\xae\x8d\xd4\x4d\x68\x74\x5e\x44\x22\x1e\x77\x20\x10\x27\xdd\x37\x06\x73\x37\x9a\x7f\x62\xd6\x27\x43\xb3\x07\x03\x28\x50\x6a\xe1\x78\x01\x59\xdb\x7d\x52\xab\x2f\x4c\xad\xd8\xcd\xa9\xf3\xce\x5a\xbf\xc8\x88\xca\x67\x1d\x10\x66\xa4\x75\x3a\x20\xea\x34\x6a\x9e\x75\x24\x89\x04\x34\x7b\xe5\xac\x09\xf8\x15\x47\xc3\xf4\xd3\x97\x5f\x7e\x7d\xf7\xf9\xf6\xc3\xf5\xc7\x69\x44\xac\x19\xc7\xc3\xee\xd1\xb9\xf1\x78\x49\xc4\x04\x44\x5e\x1f\x23\xf8\x7b\x7d\xce\xc7\x93\xb9\x70\xea\xe3\x50\x9c\x4c\xfc\xac\xa3\x0c\xd1\xbc\x46\x77\xda\x18\x51\x92\xc9\xd9\x5a\x17\x72\x92\x88\x78\x3a\x7f\xd3\xa4\x87\xe1\xdb\x2d\x92\xc2\x80\xd0\x1e\x9d\xe1\x45\xf1\xc4\xe2\x8d\xb3\x15\x97\x45\x37\x60\x67\x20\x88\xcb\xad\x1d\x02\x1c\x06\x6d\xe5\x8e\x4e\x93\x8d\x66\x9f\x9f\x89\xcb\x10\xee\x51\x5c\xf6\x42\x37\x78\x12\x93\x6f\x15\xf1\xd3\x1a\xe8\x46\xc4\x0b\x15\xc0\x13\x6a\x3c\x99\x5e\x98\x4d\xcf\xd4\x25\x53\xc5\x61\x3c\xa2\x1b\xe3\xc3\x60\x34\xab\xcc\x47\x3e\xc4\x34\xc4\x83\x03\x0b\xc6\x4c\x29\x64\x89\x05\x47\x36\x4d\x6d\xbf\x04\x71\x12\x39\x2c\xb3\x44\x8a\x75\xed\x96\x93\x30\xb4\x07\x53\x60\x9c\x05\x25\xbc\xe8\x53\x53\xd7\xfa\xc8\x81\xa0\x34\x14\xc3\xae\xe1\x0f\x96\xad\x6c\x38\xa5\xa1\xe0\xc2\x75\x17\xf2\x00\xa5\x3d\x84\x63\xc6\x1a\x83\xd2\x87\x3d\xc4\x8f\x43\x37\x9f\xf7\x0e\x84\x2d\x95\x95\xaf\xfa\x47\x59\x3b\xa2\x33\xda\xcb\x4c\xea\x86\x37\xdf\x8c\xf1\x4b\xa7\x21\xf9\x42\xb1\xd5\x86\x50\xbc\x8b\xa4\xd7\x77\x23\xa7\xb8\xeb\x08\x7d\x38\x96\xc6\x89\x1d\x6c\xe8\xe8\xf9\x24\xf5\x8e\x29\xc3\xf9\x92\x20\x70\x6a\x71\x4b\xbd\x9a\x8c\x76\x02\x45\x50\x35\x14\xce\xb9\x10\x3d\x85\x45\xac\xa6\x75\xc0\xf5\x30\x8d\xc3\x15\xf7\xba\x3b\x8d\xde\xa4\xb6\x74\xbd\x15\xab\x90\x97\x88\xe4\x98\x1b\x19\xc2\x58\x18\xf1\x7d\x5e\x28\xb7\x3a\x41\xfd\xc9\x88\x9a\x87\x46\xe3\xf4\xea\xe1\x01\xb2\x8f\xca\x7f\xf9\xfd\x37\x78\x7c\x3c\xa1\x58\x3b\x61\x64\xd9\x11\xfd\x12\x7e\x9d\xa3\xab\x85\x0f\x54\xf7\x21\x4a\xf4\x77\xab\x4c\xe0\xe0\x5a\x27\x98\xce\xa6\xe7\x98\xc2\xf9\xde\xc9\x0e\xdf\x23\xce\x51\x35\x84\xae\xb7\x92\xd0\x9d\xa3\xc1\x4a\xa8\x5e\xd2\xaf\xfc\x23\xa5\x3a\xdb\xf3\xc8\x65\x72\xb0\x9c\x5a\x34\xe1\xce\xde\x2a\x1f\xc0\x48\xf9\x27\xab\x70\x57\x9b\xac\xa9\x6d\xeb\xb6\x69\x57\x2f\x74\x71\xc7\xd1\xca\x62\xae\xd5\x5f\x77\x78\x04\x55\xfc\xfc\xb2\x69\x11\xa9\x13\xab\x58\x84\xf0\x8d\xc3\xd1\x3e\x7e\x46\x57\x78\x7d\x9c\xf7\xf4\x74\x1e\xef\xd8\x77\x83\x5f\x7d\x17\x80\xa4\x23\x85\x81\x69\x53\x93\x77\x28\xaa\x69\xd7\x2f\x89\x90\xd7\x98\x6d\xb3\x19\xfc\x8b\xd7\x4d\x78\xa7\x6d\x53\xbc\xc9\xc2\xb9\xe1\xed\x8e\xd7\x07\x82\x5a\x38\xaf\x64\xa3\x85\x83\xf6\xd2\x6d\xa5\x3c\x6d\xf5\x56\xeb\xea\x40\xbc\xd1\x4a\x96\x95\x85\x35\x36\x8b\x7b\xac\xa8\xd5\xe2\xc9\x86\xcd\x6c\x41\xd1\x4a\xac\xe5\xf2\x87\xab\xd3\xff\xa7\x0e\xdf\xa3\xdb\x9f\xf9\x88\xc4\x53\x6f\xc0\x39\xce\xda\x4f\x69\xc3\x89\x1d\x37\xaa\x8b\x4d\x8f\x3e\xf9\x32\x75\x91\x7c\xdc\x4a\xbe\x52\xb1\x8b\xe1\x9c\x0a\x93\x27\x1b\x15\xa7\x56\xe4\xd1\xcc\x5b\x13\x56\xf9\xd5\xe5\xd5\x72\x32\x79\x78\x70\xc2\x6c\x11\xb2\xb7\x45\xa1\xe2\x8e\xfa\x41\x37\x5f\xdf\xf2\x40\x79\x7c\x1c\xf8\xb9\xa0\xb9\x90\x1f\x1e\xd0\x14\x8f\x8f\xc3\x7d\xf7\xb9\x8e\x5c\xf0\xfe\xf6\xbe\x03\x31\x9a\xb5\xb3\xb5\x71\x2d\xa4\x81\x29\xac\x27\xb0\x81\x18\x2a\x71\x0c\x2b\xb9\xde\x0f\xc7\x99\x21\x6d\xed\xae\xa9\x41\x11\x35\x48\x60\x0d\x90\xad\x10\x3e\x35\x6b\x74\x06\x3d\x12\x84\x2f\x09\x34\xdc\x5e\x85\xa1\x6e\xeb\x9f\xde\x5a\x83\xd3\xf4\xcd\xbb\x60\x40\x7a\x7d\x45\xe5\x34\x3e\xc8\xba\x19\x19\xec\x1b\xbd\xe9\xc7\xf7\x74\x39\x9d\xfc\x2f\x00\x00\xff\xff\xee\x1f\x18\x55\x2a\x15\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\xdf\x6f\x1b\xb9\xf1\x7f\xf7\x5f\x31\x90\x1f\x92\x00\xd2\xca\x8a\xef\xfb\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\xb3\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xdc\xd5\x09\xc6\xfd\xef\xc5\x90\xfb\x83\x2b\xc9\xce\x21\x79\x88\x6d\xee\xfc\x9e\xe1\x67\x66\xb8\x58\x2c\x2e\x44\xad\xfe\x89\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xd8\x29\x53\xe4\xf0\x0e\x6b\x6d\x0f\x15\x1a\x7f\x51\xa1\x17\x85\xf0\x22\xbf\x00\x30\xa2\xc2\x1c\x36\xba\xf9\xfd\xf1\x11\xd4\x06\xb2\x3b\x51\x21\xd5\x42\x22\xfc\xf1\x47\xf7\x3d\xfc\x99\xc3\xe3\xe3\xf4\xeb\xe3\x23\xa0\x29\x98\x8c\x6a\x94\x2c\xcc\x61\xad\x95\x14\x94\xc3\xea\x02\x80\x50\xa3\xf4\xd6\xf1\x17\x80\x4a\x78\x59\xfe\x2a\xd6\xa8\x29\x1e\xa4\xba\x99\xda\x3b\xe1\x71\x7b\x88\x1f\xfd\xa1\xc6\x1c\xbe\xa0\x74\x28\x3c\x5e\x00\x78\xac\x6a\x2d\x3c\x76\xc2\x12\x0f\xf8\x9f\x30\xc6\x7a\xe1\x95\x35\x83\x70\x80\xda\xd9\x0a\x7d\x89\x0d\x65\xca\x66\xb5\x75\x3e\x87\xd9\xf5\xd5\xf5\x6a\x06\x97\xe0\x51\xeb\x84\x02\xbc\x05\x92\x4e\xd4\x08\xcb\x0a\xbd\x53\x92\xd8\xb9\xda\x2a\xe3\x5f\x10\x30\x73\xd6\x09\xd6\x13\x1f\x8e\xbc\x00\xe8\x63\x11\x7e\x47\xd7\x2a\x89\x6f\xa4\xb4\x8d\xf1\x77\x53\x42\x80\xd6\xea\xa6\xc2\x41\xd4\xa2\x13\xb5\x55\x7e\xb1\xc3\xc3\xa0\x80\x38\x0a\x7e\x54\xd8\x9f\x8c\xf2\x16\xcc\x52\x84\x04\x27\x54\x05\x6e\x44\xa3\xfd\xad\x2d\x30\x87\xab\x1f\xae\xae\xe0\x12\xf6\x25\x1a\xa8\xd8\x1a\x2c\xc0\xa1\x28\x16\xd6\xe8\xc3\x1c\xf6\x08\x7b\x6b\x5e\x78\x58\x23\x88\xb5\x46\x8e\x87\x2c\x2b\x5b\x5c\x74\x02\x2f\xe1\x1f\xa5\x22\x50\x04\x02\x7c\x55\x6f\x08\x1a\xc2\x02\x36\xd6\xc1\x16\x0d\x3a\xe1\x95\xd9\xc2\xc3\xc3\xdf\x60\x87\x07\xca\xe0\xa3\x81\x4f\x7f\x21\xf8\xe9\x06\x56\xd9\xea\x6a\x3e\x48\xe9\x75\x47\x17\x08\x84\xc3\xd4\x0e\xb2\x6c\x8a\x41\x2c\x40\x00\x61\x2d\xb8\x28\xba\x40\xc1\x1e\x07\x31\x52\x18\xd8\x3b\xe5\xd9\xd0\xec\x7c\xfc\xb6\x68\x86\x60\x60\x55\xfb\xc3\x3b\xe5\xd2\x20\x56\x58\xa8\xa6\xca\xe1\x16\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\x7f\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6d\x9b\x17\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\x4b\x52\x1e\x97\xe4\x85\x29\x84\xb6\x06\x17\x84\xbe\xa9\xb3\xaa\xb8\x0c\xd6\x2e\xc4\xa2\x76\xaa\x15\x1e\x43\x79\xb2\xb3\x83\xa2\x3e\x55\x44\xe5\x42\x5a\xb3\x51\xdb\xe1\x13\x40\x3c\xb8\x15\x75\x9e\x1c\xa6\xf7\x6c\x91\xb0\x7d\x6f\xda\xb2\x5d\xb3\xc6\x65\x14\x32\x56\xe7\x37\x53\xb6\x57\x54\xf2\x49\x29\x5a\x04\x01\x85\xda\x6c\xd0\x31\xa6\xf6\x12\xba\x4b\x37\xe2\x66\xc8\x50\x14\x97\xe6\x88\xb1\xa7\x55\x05\xf6\x59\xd9\xa8\x6d\x25\xea\xd1\x10\xe5\x4b\x10\x06\xd0\x78\x77\x08\x3e\xfc\x16\x89\x7e\x9b\x83\x30\x05\x34\x46\xda\x8a\xc1\x3c\xf0\x47\x6f\x6f\x43\xb6\x85\x29\x06\x29\x68\xda\x20\x41\x21\x75\xe9\x3e\xc9\x00\x87\xe1\x3b\x32\x90\xb0\x7d\x33\x03\x01\x28\xbc\x05\x55\x31\x8c\xc2\x87\xfb\x0f\x01\x23\xe0\x25\xbb\x45\x6a\x6b\x94\x19\x95\xb3\x73\x2d\x3a\xb5\x51\x32\xe0\x39\xd4\x8d\xab\x2d\x21\xbd\xfa\x13\x81\x1c\xa4\x44\x74\x89\x51\xe4\x00\xb1\xbe\x3f\x11\x38\x10\x6e\x3b\xde\xe2\x27\x22\xb6\xad\xb7\x0c\x2f\x94\x84\x66\x8a\xd0\x97\x4f\x60\xf4\x29\xdf\x19\x8c\xee\xc3\x39\x5c\xd4\x93\xf6\x90\x34\x90\x2e\xea\x0e\x03\x8c\x1a\x0b\xb3\x9c\x7b\x24\xf9\x19\xa8\x4a\x6c\x31\x56\x3f\x33\x64\xf0\x5e\x99\x22\xf8\x5c\x31\xea\x38\x94\x63\xd5\x46\xc4\xd1\x28\x08\x19\x5b\x02\x2b\x27\x81\xc7\x08\x10\x7e\x80\x05\xc6\x84\xc2\xca\x1d\xba\x00\x0d\xee\x04\x1c\xbc\x18\xc2\xd7\xe7\x92\x47\x02\x1e\x17\x58\xb3\x17\x5b\x60\x6b\xb3\x81\x26\xa8\xca\xa1\x13\xaa\x6c\x10\x23\x8b\xf0\x23\x5f\x65\xab\xeb\xec\xf5\x94\xf6\xbe\xd1\xfa\xde\x6a\x25\x0f\x39\x7c\xdc\xdc\x59\x7f\xef\x90\x52\x4f\x1c\x92\x6d\x9c\x44\x4a\xa1\xde\xe1\x7f\x1b\x24\x3f\x39\x03\x90\x75\x93\xc3\xff\x5d\x55\x93\xc3\x2a\x74\x83\x1c\xfe\xff\x87\x5b\x35\x4e\x12\xd6\xa5\xcc\x8b\x31\x3b\xf7\x61\xaa\xb8\xbe\xba\xe6\xe6\xaa\xcc\xc6\xba\x2a\x94\xad\xd0\x03\x75\x52\x63\x13\x19\xe7\x9b\x3d\x44\xd0\xbe\x17\xbe\xcc\x61\x89\x5e\x86\x58\x14\x4b\xa2\x92\xa7\x16\x1b\xe7\x28\xd0\xb6\xbb\x1e\x5b\xd5\xa2\x01\x65\x62\x78\x5e\x50\xe4\x21\x2a\x97\x93\x5b\x1d\xa3\x20\x8a\xcf\x46\x1f\x72\xf0\xae\x41\x96\xc6\x1d\x3d\x5c\xa8\x75\x87\x43\x5c\x01\x35\xba\x8d\x75\x12\x59\x68\x6c\xe1\xdc\xc1\x9f\x32\x3c\xed\xb2\x53\xdb\x5b\xe1\x3a\xdb\x23\xd9\xf7\x99\x9f\x94\xd3\x47\x23\x75\x13\x2e\x3a\x0f\x22\x11\x8f\x7b\x10\x88\x9d\xee\x1b\x8d\xb9\x6f\xcd\x3f\x32\xeb\x51\xd3\x1c\xc0\x00\x0a\x94\x5a\x38\x1e\x40\xd6\xb6\x4d\x6a\xf5\x99\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x49\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xfa\xfa\xf3\x2f\x6f\x3f\xdf\xbd\xff\xf8\x61\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\xcf\xf9\x78\xd2\x17\x4e\x7d\x1c\x8b\x93\x89\x9f\x74\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xc7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\x4f\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x34\xd9\x68\xda\xfc\x4c\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x49\x4c\xbe\x55\xc4\xc7\x35\xd0\xb7\x88\x67\x2a\x80\x3b\xd4\xb4\x33\x3d\xd3\x9b\x9e\xa8\x4b\xa6\x8a\xcd\x78\x42\x37\xc5\x87\xd1\x68\x56\x99\x4f\x7c\x88\x69\x88\x0b\x07\x16\x8c\x99\x52\xc8\x12\x0b\x8e\x6c\x9a\xda\x61\x08\xe2\x24\x72\x58\xe6\x89\x14\xeb\xba\x29\x27\x61\xe8\x16\xa6\xc0\x38\x0f\x4a\x78\xd0\xa7\xa6\xae\xf5\x81\x03\x41\x69\x28\xc6\x59\xc3\xef\x2d\x5b\xd9\x70\x4a\x43\xc1\x85\xed\x2e\xe4\x01\x4a\xbb\x0f\xcb\x8c\x35\x06\xa5\x0f\x73\x88\x9f\x86\x6e\xb1\x18\x1c\x08\x53\x2a\x2b\xbf\x19\x8e\xb2\xae\x45\x67\xd4\xca\x4c\xea\x86\x27\xdf\x8c\xf1\x4b\xa7\x21\xf9\x4a\xf1\xaa\x8d\xa1\x78\x1b\x49\x3f\xde\x4f\x9c\xe2\x5b\x47\xe8\xc3\xb2\x34\x4d\xec\x68\x43\x4f\xcf\x2b\xa9\x77\x4c\x19\xd6\x97\x04\x81\x53\x8b\x3b\xea\x9b\x8b\xc9\x4c\xa0\x08\xaa\x86\xc2\x3a\x17\xa2\xa7\xb0\x88\xd5\xb4\x0e\xb8\x1e\xba\x71\xd8\xe2\x5e\xf6\xab\xd1\xab\xd4\x96\xfe\x6e\xc5\x2a\xe4\x21\x22\x59\xe6\x26\x86\x30\x16\x46\x7c\x5f\x14\xca\xdd\x9c\xa0\x7e\x6a\xd6\x97\x64\x16\x18\x93\xf7\xf5\xcb\xaf\x71\xdb\x14\x66\x1b\xbf\x7d\x50\x3e\x6c\x40\xa4\xbc\x75\x87\x01\xad\xde\xf3\x1c\x33\x51\xce\x3d\xa8\x71\xfa\xe6\xf1\x11\xb2\x0f\xca\xb3\xa4\xf0\x68\x31\xa5\x58\x3b\x61\x64\xd9\x13\xfd\x1c\xfe\x8a\xcf\x17\x6a\x13\x8e\xf8\x6e\xd0\x39\xce\x5a\xf8\xc0\xf7\x10\xd2\x40\x7f\xb7\xca\x24\x0c\xb3\xf9\xac\x7b\x05\xd1\x84\x29\x3b\x4f\x02\xa7\xad\x6a\x2f\x4c\x28\x3f\x87\x9c\x55\x19\x07\xd0\x4a\x18\xb5\xe1\xd1\x84\x0b\x94\x54\x81\x2e\xfa\x7a\x34\xe4\x85\xed\xcd\x12\x42\x63\x0a\x74\x47\x01\x74\xa8\x85\x57\x2d\x42\x1d\xcc\xea\xd2\xbb\x9d\x04\xf1\xa8\xe0\x07\xe7\xa8\x59\x17\xca\xad\xe6\xf1\xe7\xeb\xe1\x49\x67\x0c\x4e\x78\xb2\x39\x17\x9c\xf0\x0e\xd2\x47\xb5\xa7\x3a\x23\xe0\x2b\xa1\x3b\xc7\xdf\x10\xba\x21\x73\x4c\x03\xe7\xf9\x7f\xa9\x84\x3a\x6b\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x9d\x05\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\xa3\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x3c\x03\xa3\x3d\x47\x27\x8b\xb9\x6e\xfe\xba\xc3\x03\xa8\xe2\xa7\x81\xec\x99\x56\x99\x58\xc5\x22\x84\x6f\x1c\x4e\x16\xa2\x33\xba\xc2\xe7\xc3\x62\xa0\xa7\xa7\x7d\x37\xf8\xbb\xef\x03\x90\x40\xa2\x30\x30\x6b\x6a\xf2\x0e\x45\x35\xeb\x01\x2b\x11\xf2\x12\xb3\x6d\x36\x87\x7f\xf1\xbc\x0f\x6f\xb5\x6d\x8a\x57\x59\xd8\xf7\xbc\xdd\xf1\xfc\x46\x50\x0b\xe7\x95\x6c\xb4\x70\xd0\x3d\x35\x74\x52\x8e\xb1\xb6\xd3\x7a\xb3\x27\x5e\x29\x24\xcb\xca\xc2\x1e\x91\xc5\x45\x42\xd4\x6a\x79\x54\xfd\xcc\x16\x14\xdd\x88\xb5\x5c\xbd\xbe\x3e\xfd\x3f\x75\xf8\x01\x5d\x7b\xe6\x15\x8f\xc7\x8e\xb1\xd1\x70\xd6\x7e\x4c\x11\x4f\xec\x18\x29\x5d\x44\x5d\xf4\xc9\xd3\xe0\x8b\xe4\x75\x31\x79\x26\x64\x17\xc3\x3e\x1b\x5a\xff\x14\x97\xb4\x22\x8f\x66\xd1\x99\x70\x93\x5f\x5f\x5d\xaf\x2e\xba\x8a\x7e\x53\x14\x2a\x6e\x08\x8c\x67\x6f\xb8\x9d\x8f\xb5\x7d\x09\xe3\xe7\xb1\xa3\x3d\x3e\x82\x0b\xe0\xf8\x3c\xf3\x22\xbc\xd0\x1e\x5d\xa2\xe9\x65\xb8\x84\xcf\x75\x27\xfd\xdd\xdd\x43\xdf\x89\x68\xde\x0d\x48\x8d\xeb\xfa\x12\x98\xc2\x7a\x02\x1b\x88\xa1\x12\x87\xb0\x57\xe9\x76\xdc\xb0\x0d\x69\x6b\x77\x4d\x0d\x8a\xa8\x41\x02\x6b\x80\x6c\x85\xf0\xa9\x59\xa3\x33\xe8\x91\x20\x3c\x07\xd1\xb8\x40\x17\x86\xfa\xd5\x6d\x76\x67\x0d\xce\xd2\x2f\x6f\x83\x01\xe9\x0a\x1d\x95\xd3\x74\xab\xee\x07\x9d\x60\xdf\xe4\xcb\x30\x83\xcd\x56\xb3\x8b\xff\x05\x00\x00\xff\xff\x9e\xf6\xc5\xc2\x0b\x17\x00\x00"),
 		},
-		"/flux-secret.yaml.tmpl": &vfsgen۰FileInfo{
-			name:    "flux-secret.yaml.tmpl",
-			modTime: time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
-			content: []byte("\x2d\x2d\x2d\x0a\x61\x70\x69\x56\x65\x72\x73\x69\x6f\x6e\x3a\x20\x76\x31\x0a\x6b\x69\x6e\x64\x3a\x20\x53\x65\x63\x72\x65\x74\x0a\x6d\x65\x74\x61\x64\x61\x74\x61\x3a\x0a\x20\x20\x6e\x61\x6d\x65\x3a\x20\x66\x6c\x75\x78\x2d\x67\x69\x74\x2d\x64\x65\x70\x6c\x6f\x79\x0a\x20\x20\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x3a\x20\x7b\x7b\x20\x2e\x4e\x61\x6d\x65\x73\x70\x61\x63\x65\x20\x7d\x7d\x0a\x74\x79\x70\x65\x3a\x20\x4f\x70\x61\x71\x75\x65\x0a"),
+		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
+			name:             "flux-secret.yaml.tmpl",
+			modTime:          time.Date(2019, 7, 25, 13, 37, 39, 999312835, time.UTC),
+			uncompressedSize: 137,
+
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xca\x31\x0a\xc2\x40\x10\x85\xe1\x7e\x4f\xf1\x2e\xb0\x82\xed\x1c\x42\x0b\xc1\x7e\xc8\xbe\xc8\x62\xb2\x19\x93\x89\x18\x86\xdc\x5d\x14\x1b\xcb\x9f\xff\xcb\x39\x27\xb5\x7a\xe5\xbc\xd4\xa9\x09\x9e\xc7\x74\xaf\xad\x08\x2e\xec\x66\x7a\x1a\xe9\x5a\xd4\x55\x12\xd0\x74\xa4\xa0\x1f\xd6\x57\xbe\x55\xcf\x85\x36\x4c\x5b\x04\x6a\x8f\xc3\x49\x47\x2e\xa6\x1d\xb1\xef\x3f\xfa\x4d\x41\xc4\xff\x8d\x00\x5b\xf9\x30\xdf\x8c\x82\xb3\xe9\x63\x65\x7a\x07\x00\x00\xff\xff\x40\x21\xa1\xbb\x89\x00\x00\x00"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
-			uncompressedSize: 846,
+			modTime:          time.Date(2019, 7, 25, 14, 18, 1, 501573117, time.UTC),
+			uncompressedSize: 874,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\xcd\x8e\xd3\x40\x10\x84\xef\x7e\x8a\x92\x72\xc5\x41\x5e\x29\x17\xdf\x10\x0b\x68\x25\x58\xe5\xb2\xdc\x3b\xe3\x8e\x33\x62\xfe\x98\x6e\x87\x98\xd5\xbe\x3b\x9a\xfc\x38\x0e\x9b\x3e\x25\x53\xfd\x75\xd7\x94\xa7\xae\xeb\x6a\x01\xcf\xde\x90\xd9\x71\x87\x8e\x93\x8b\xa3\xe7\xa0\x18\x84\x3b\x6c\x46\x7c\x75\xc3\x01\x1a\x71\xec\xa8\x16\x30\x31\x28\xd9\xc0\x19\xd6\x53\xcf\xf0\xac\xd4\x91\xd2\xb2\xa2\x64\x7f\x72\x16\x1b\x43\x0b\x4a\x49\x3e\xee\x9b\xea\x97\x0d\x5d\x8b\xc7\x69\x6c\x75\x69\x6f\x2b\x20\x90\xe7\xf6\xba\xfd\x7c\x22\x89\x0c\xb7\x78\x7d\xc5\xf2\xf9\xf2\x17\x6f\x6f\x95\x24\x36\x85\xca\x9c\x9c\x35\x24\x2d\x9a\x0a\x10\x76\x6c\x34\xe6\xa2\x00\x9e\xd4\xec\xbe\xd3\x86\x9d\x9c\x0e\xee\x2d\x51\xf6\xc9\x91\xf2\x19\x99\x19\x2a\xe5\x6e\xe8\x7b\x3c\x70\xb1\x52\x6a\xca\x63\x62\xea\xbb\x4c\xa9\x63\x62\x33\xa1\x6d\x96\xab\x65\xb3\xba\xd5\xd7\x83\x73\xeb\xe8\xac\x19\x5b\x3c\x6d\x9f\xa3\xae\x33\x4b\x89\xee\xd2\x45\xb9\x9f\xf9\xab\x51\x7b\xac\x9a\x07\x00\x0b\xfc\xa0\x83\xf5\x83\x2f\x1b\x62\x1e\xcb\x67\x1b\x84\x3f\xc0\x06\x78\xee\x69\x33\x2a\xcb\x1c\x7c\xc2\xca\xe3\x06\x14\xfb\x97\xb1\x8d\x19\x31\x30\xac\xb2\x9f\xb7\x27\x34\xcd\x43\xd3\x60\x81\x47\xde\xd2\xe0\x14\x29\xe6\xab\xaf\x45\xe9\xd9\xef\x4f\x3f\x5f\x82\x89\xfe\xf8\x90\x34\xa2\x67\x85\x8b\xbd\x20\x6e\xc1\x64\x76\xc8\xfc\x7b\x60\x51\x50\xe8\x90\x59\x52\x0c\xc2\xcb\x69\x50\x99\x7a\x73\xc3\x53\x9e\xc6\x59\x0e\x7a\xbd\xc0\x2c\xfb\x75\xcc\xda\x9e\xdc\x4d\xb2\xb0\x19\xb2\xd5\xf1\x73\x0c\xca\x07\x6d\x67\x5c\x1e\xc2\x27\x79\x11\xce\xff\x33\x67\xe9\x5b\x8e\x43\x7a\xaf\x91\x73\xf1\xcf\x3a\xdb\xbd\x75\xdc\xf3\x17\x31\xe4\x48\x8f\xcf\x7d\x4b\x4e\xb8\xfa\x17\x00\x00\xff\xff\xd9\x0a\x29\x86\x4e\x03\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x93\xcd\x6e\x9c\x40\x10\x84\xef\x3c\x45\x49\x7b\x0d\x1b\x61\x69\x2f\xdc\xa2\x38\x89\x2c\x25\xd6\x5e\x9c\x7b\x7b\x68\xf0\x28\xf3\x97\xe9\x66\xb3\x04\xf9\xdd\xa3\xd9\x5f\x36\xf6\x9c\x80\xaa\xaf\xa7\xa6\x80\xba\xae\xab\x15\x3c\x7b\x43\xe6\x85\x3b\x74\x9c\x5c\x9c\x3c\x07\xc5\x28\xdc\xe1\x79\xc2\x57\x37\xee\xa1\x11\x07\x47\xb5\x82\x89\x41\xc9\x06\xce\xb0\x9e\x06\x86\x67\xa5\x8e\x94\xd6\x15\x25\xfb\x93\xb3\xd8\x18\x5a\x50\x4a\xf2\x71\xd7\x54\xbf\x6c\xe8\x5a\xdc\x5f\xc6\x56\x67\x7b\x5b\x01\x81\x3c\xb7\xd7\xdd\xe7\x19\xb6\xc7\xfa\x91\x3c\x4b\x22\xc3\x78\x7d\x3d\x99\x0e\xb7\x2d\xe6\xf9\x56\x9d\x67\x70\xe8\x8a\x4d\x12\x9b\x32\x31\x73\x72\xd6\x90\xb4\x68\x2a\x40\xd8\xb1\xd1\x98\x8b\x02\x78\x52\xf3\xf2\x9d\x9e\xd9\xc9\xf1\xc1\x9b\x00\x15\xa0\xec\x93\x23\xe5\x13\xb2\x08\x5b\x96\xbb\xa1\xdf\xe3\x81\x73\x94\xb2\x2e\x5d\x5d\x98\xfa\x5d\xa6\xac\x43\x9b\x0b\xa1\x6d\xd6\x9b\x75\xb3\xb9\xd5\xb7\xa3\x73\xdb\xe8\xac\x99\x5a\x3c\xf4\x8f\x51\xb7\x99\xa5\xd4\x7a\x76\x51\x1e\x16\xf9\x6a\xd4\x1e\x9b\xe6\x0e\xc0\x0a\x3f\x68\x6f\xfd\xe8\xcb\x0e\x31\x4f\xe5\x95\x8e\xc2\x1f\x60\x03\x3c\x0f\xf4\x3c\x29\xcb\x12\x7c\xc0\xc6\xe3\x06\x14\xfb\x97\xd1\xc7\x8c\x18\x18\x56\xd9\x2f\xed\x09\x4d\x73\xd7\x34\x58\xe1\x9e\x7b\x1a\x9d\x22\xc5\x7c\xcd\xb5\x2a\x9e\xdd\xee\x78\xf9\x14\x4c\xf4\x87\x8f\x4c\x23\x06\x56\xb8\x38\x08\x62\x0f\x26\xf3\x82\xcc\xbf\x47\x16\x05\x85\x0e\x99\x25\xc5\x20\xbc\xbe\x0c\x2a\x53\x6f\x4e\x78\xec\xd3\x38\xcb\x41\xaf\x07\x58\x74\xbf\x8d\x59\xdb\x63\xba\x8b\x2c\x6c\xc6\x6c\x75\xfa\x1c\x83\xf2\x5e\xdb\x05\x97\xc7\xf0\x49\x9e\x84\xf3\xff\xcc\x49\xfa\x96\xe3\x98\xde\x6a\xe4\x5c\xfc\xb3\xcd\x76\x67\x1d\x0f\xfc\x45\x0c\x39\xd2\xc3\xaf\xd0\x93\x13\xae\xfe\x05\x00\x00\xff\xff\x5d\x9a\x63\xab\x6a\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 22, 10, 499650000, time.UTC),
-			uncompressedSize: 178,
+			modTime:          time.Date(2019, 7, 25, 13, 37, 39, 995569443, time.UTC),
+			uncompressedSize: 206,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x8c\x41\x0a\x02\x31\x14\x43\xf7\xff\x14\xb9\x40\x85\xba\xfc\x87\x70\x23\xb8\xff\xfc\x09\x58\xb4\xd3\xd2\x96\xd9\x0c\x73\x77\x29\xea\x46\xcc\x2a\x09\x79\x09\x21\x88\xd5\x74\x63\xeb\xa9\xac\x8a\x2d\xca\x23\xad\x8b\xe2\xca\xb6\x25\xa7\x64\x0e\x5b\x6c\x98\x0a\xb0\x5a\xa6\x22\x33\xbb\xf9\x9d\xcb\xa7\xe9\xd5\x9c\x8a\x7d\xc7\xe9\xf2\x8d\x38\x0e\xe9\x95\x3e\xa9\x5a\xda\xe8\xd3\x00\xe1\xcf\xc5\xd4\x9c\x28\x62\x3c\xc7\x28\x40\xe7\x93\x3e\x4a\x7b\x33\xbf\xc4\x2b\x00\x00\xff\xff\xa8\x2c\x5b\x6b\xb2\x00\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8c\x3d\x0e\x02\x21\x10\x46\x7b\x4e\xf1\x5d\x00\x13\x2c\x39\x84\x8d\x89\xfd\x04\x3e\x23\x51\x58\x02\x64\x9b\xc9\xde\xdd\xb0\x6b\xe3\x76\xf3\xf3\xde\xb3\xd6\x1a\xa9\xe9\xc1\xd6\xd3\x52\x3c\x56\x67\xde\xa9\x44\x8f\x3b\xdb\x9a\x02\x4d\xe6\x90\x28\x43\xbc\x01\x8a\x64\x7a\x64\xe6\x20\xe1\xc5\xa8\x8a\xf4\xc4\xe5\x26\x99\xbd\x4a\x20\xb6\xed\x07\xed\xab\x87\xea\xff\x57\x15\x2c\x71\x62\xbd\x32\xcc\x62\x5d\xda\xe8\x73\x00\xec\x39\xbf\x5f\x0f\xc4\xc3\xb9\xab\x73\x06\xe8\xfc\x30\x8c\xa5\x1d\xce\xd9\xf8\x06\x00\x00\xff\xff\x20\x2f\xef\xba\xce\x00\x00\x00"),
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
@@ -86,11 +88,6 @@ func (fs vfsgen۰FS) Open(path string) (http.File, error) {
 			vfsgen۰CompressedFileInfo: f,
 			gr:                        gr,
 		}, nil
-	case *vfsgen۰FileInfo:
-		return &vfsgen۰File{
-			vfsgen۰FileInfo: f,
-			Reader:          bytes.NewReader(f.content),
-		}, nil
 	case *vfsgen۰DirInfo:
 		return &vfsgen۰Dir{
 			vfsgen۰DirInfo: f,
@@ -172,37 +169,6 @@ func (f *vfsgen۰CompressedFile) Close() error {
 	return f.gr.Close()
 }
 
-// vfsgen۰FileInfo is a static definition of an uncompressed file (because it's not worth gzip compressing).
-type vfsgen۰FileInfo struct {
-	name    string
-	modTime time.Time
-	content []byte
-}
-
-func (f *vfsgen۰FileInfo) Readdir(count int) ([]os.FileInfo, error) {
-	return nil, fmt.Errorf("cannot Readdir from file %s", f.name)
-}
-func (f *vfsgen۰FileInfo) Stat() (os.FileInfo, error) { return f, nil }
-
-func (f *vfsgen۰FileInfo) NotWorthGzipCompressing() {}
-
-func (f *vfsgen۰FileInfo) Name() string       { return f.name }
-func (f *vfsgen۰FileInfo) Size() int64        { return int64(len(f.content)) }
-func (f *vfsgen۰FileInfo) Mode() os.FileMode  { return 0444 }
-func (f *vfsgen۰FileInfo) ModTime() time.Time { return f.modTime }
-func (f *vfsgen۰FileInfo) IsDir() bool        { return false }
-func (f *vfsgen۰FileInfo) Sys() interface{}   { return nil }
-
-// vfsgen۰File is an opened file instance.
-type vfsgen۰File struct {
-	*vfsgen۰FileInfo
-	*bytes.Reader
-}
-
-func (f *vfsgen۰File) Close() error {
-	return nil
-}
-
 // vfsgen۰DirInfo is a static definition of a directory.
 type vfsgen۰DirInfo struct {
 	name    string
diff --git a/install/install.go b/install/install.go
index be012f365..327bdb561 100644
--- a/install/install.go
+++ b/install/install.go
@@ -23,8 +23,8 @@ type TemplateParameters struct {
 	AdditionalFluxArgs []string
 }
 
-func FillInInstallTemplates(params TemplateParameters) (io.Reader, error) {
-	result := bytes.NewBuffer(nil)
+func FillInInstallTemplates(params TemplateParameters) (map[string][]byte, error) {
+	result := map[string][]byte{}
 	err := vfsutil.WalkFiles(templates, "/", func(path string, info os.FileInfo, rs io.ReadSeeker, err error) error {
 		if err != nil {
 			return fmt.Errorf("cannot walk embedded files: %s", err)
@@ -42,9 +42,11 @@ func FillInInstallTemplates(params TemplateParameters) (io.Reader, error) {
 		if err != nil {
 			return fmt.Errorf("cannot parse embedded file %q: %s", info.Name(), err)
 		}
-		if err := manifestTemplate.Execute(result, params); err != nil {
+		out := bytes.NewBuffer(nil)
+		if err := manifestTemplate.Execute(out, params); err != nil {
 			return fmt.Errorf("cannot execute template for embedded file %q: %s", info.Name(), err)
 		}
+		result[strings.TrimSuffix(info.Name(), ".tmpl")] = out.Bytes()
 		return nil
 	})
 	if err != nil {
diff --git a/install/install_test.go b/install/install_test.go
index aef99d07a..89bc940f6 100644
--- a/install/install_test.go
+++ b/install/install_test.go
@@ -1,15 +1,34 @@
 package install
 
 import (
-	"io/ioutil"
 	"testing"
 
 	"github.com/instrumenta/kubeval/kubeval"
 	"github.com/stretchr/testify/assert"
 )
 
-func TestFillInInstallTemplates(t *testing.T) {
-	params := TemplateParameters{
+func testFillInInstallTemplates(t *testing.T, params TemplateParameters) {
+	manifests, err := FillInInstallTemplates(params)
+	assert.NoError(t, err)
+	assert.Len(t, manifests, 5)
+	for fileName, contents := range manifests {
+		validationResults, err := kubeval.Validate(contents, fileName)
+		assert.NoError(t, err)
+		assert.Len(t, validationResults, 1)
+		for _, result := range validationResults {
+			if len(result.Errors) > 0 {
+				t.Errorf("found problems with manifest %s (Kind %s):\ncontent:\n%s\nerrors: %s",
+					fileName,
+					result.Kind,
+					string(contents),
+					result.Errors)
+			}
+		}
+	}
+}
+
+func TestFillInInstallTemplatesAllParameters(t *testing.T) {
+	testFillInInstallTemplates(t, TemplateParameters{
 		GitURL:             "git@github.com:fluxcd/flux-get-started",
 		GitBranch:          "branch",
 		GitPaths:           []string{"dir1", "dir2"},
@@ -18,17 +37,15 @@ func TestFillInInstallTemplates(t *testing.T) {
 		GitEmail:           "this.is@anemail.com",
 		Namespace:          "flux",
 		AdditionalFluxArgs: []string{"arg1=foo", "arg2=bar"},
-	}
-	reader, err := FillInInstallTemplates(params)
-	assert.NoError(t, err)
-	output, err := ioutil.ReadAll(reader)
-	assert.NoError(t, err)
-	validationResults, err := kubeval.Validate(output, "output")
-	assert.NoError(t, err)
-	assert.Len(t, validationResults, 7)
-	for _, result := range validationResults {
-		if len(result.Errors) > 0 {
-			t.Errorf("found problems with resource resource %s: %s", result.Kind, result.Errors)
-		}
-	}
+	})
+
+}
+
+func TestFillInInstallTemplatesMissingValues(t *testing.T) {
+	testFillInInstallTemplates(t, TemplateParameters{
+		GitURL:    "git@github.com:fluxcd/flux-get-started",
+		GitBranch: "branch",
+		GitPaths:  []string{},
+		GitLabel:  "label",
+	})
 }
diff --git a/install/templates/flux-account.yaml.tmpl b/install/templates/flux-account.yaml.tmpl
index 22aff84d6..9aae38f80 100644
--- a/install/templates/flux-account.yaml.tmpl
+++ b/install/templates/flux-account.yaml.tmpl
@@ -6,8 +6,8 @@ kind: ServiceAccount
 metadata:
   labels:
     name: flux
-  name: flux
-  namespace: {{ .Namespace }}
+  name: flux{{ if .Namespace }}
+  namespace: {{ .Namespace }}{{ end}}
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
@@ -35,4 +35,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: flux
-    namespace: {{ .Namespace }}
+    namespace: {{ if .Namespace }}{{ .Namespace }}{{ else }}default{{ end }}
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
index 81a41af55..7a680fbbb 100644
--- a/install/templates/flux-deployment.yaml.tmpl
+++ b/install/templates/flux-deployment.yaml.tmpl
@@ -2,8 +2,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: flux
-  namespace: {{ .Namespace }}
+  name: flux{{ if .Namespace }}
+  namespace: {{ .Namespace }}{{ end }}
 spec:
   replicas: 1
   selector:
@@ -118,13 +118,17 @@ spec:
         # mounted above, for K8s >= 1.10
         - --ssh-keygen-dir=/var/fluxd/keygen
 
+        # Replace the following URL to change the Git repository used by Flux.
         - --git-url={{ .GitURL }}
-        - --git-branch={{ .GitBranch }}
-        - --git-path={{ StringsJoin .GitPaths "," }}
-        - --git-label={{ .GitLabel }}
-        - --git-user={{ .GitUser }}
-        - --git-email={{ .GitEmail }}
-        
+        - --git-branch={{ .GitBranch }}{{ if .GitPaths }}
+        - --git-path={{ StringsJoin .GitPaths "," }}{{ else }}
+        # include this if you want to restrict the manifests considered by flux
+        # to those under the following relative paths in the git repository
+        # - --git-path=subdir1,subdir2{{ end }}{{ if .GitLabel }}
+        - --git-label={{ .GitLabel }}{{ end }}{{ if .GitUser }}
+        - --git-user={{ .GitUser   }}{{ end }}{{ if .GitEmail }}
+        - --git-email={{ .GitEmail }}{{ end }}
+
         # Include these two to enable git commit signing
         # - --git-gpg-key-import=/root/gpg-import
         # - --git-signing-key=<key id>
@@ -140,9 +144,9 @@ spec:
         # Serve /metrics endpoint at different port;
         # make sure to set prometheus' annotation to scrape the port value.
         - --listen-metrics=:3031
-
-{{range .AdditionalFluxArgs }}        - {{ . }}
-{{end}}
+{{ if .AdditionalFluxArgs }}
+        # Additional arguments{{ range .AdditionalFluxArgs }}
+        - {{ . }}{{ end }}{{ end }}
 
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
diff --git a/install/templates/flux-secret.yaml.tmpl b/install/templates/flux-secret.yaml.tmpl
index 6b2cdaf0e..d7e3f21ff 100644
--- a/install/templates/flux-secret.yaml.tmpl
+++ b/install/templates/flux-secret.yaml.tmpl
@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: flux-git-deploy
-  namespace: {{ .Namespace }}
+  name: flux-git-deploy{{ if .Namespace }}
+  namespace: {{ .Namespace }}{{ end }}
 type: Opaque
diff --git a/install/templates/memcache-dep.yaml.tmpl b/install/templates/memcache-dep.yaml.tmpl
index 4df2581d5..e099f6b1f 100644
--- a/install/templates/memcache-dep.yaml.tmpl
+++ b/install/templates/memcache-dep.yaml.tmpl
@@ -4,8 +4,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: memcached
-  namespace: {{ .Namespace }}
+  name: memcached{{ if .Namespace }}
+  namespace: {{ .Namespace }}{{ end }}
 spec:
   replicas: 1
   selector:
diff --git a/install/templates/memcache-svc.yaml.tmpl b/install/templates/memcache-svc.yaml.tmpl
index 021690d76..8c8f51b5b 100644
--- a/install/templates/memcache-svc.yaml.tmpl
+++ b/install/templates/memcache-svc.yaml.tmpl
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: memcached
-  namespace: {{ .Namespace }}
+  name: memcached{{ if .Namespace }}
+  namespace: {{ .Namespace }}{{ end }}
 spec:
   ports:
     - name: memcached

From 89dc5b82543ca1013ea49bd8c160679829be1688 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 16:58:09 +0200
Subject: [PATCH 073/158] Make --git-email mandatory

---
 cmd/fluxctl/install_cmd.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index d7d181f67..7e6b13d00 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -33,7 +33,7 @@ fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | ku
 		"Git label to keep track of Flux's sync progress; overrides both --git-sync-tag and --git-notes-ref")
 	cmd.Flags().StringVarP(&opts.GitUser, "git-user", "", "Flux",
 		"Username to use as git committer")
-	cmd.Flags().StringVarP(&opts.GitEmail, "git-email", "", "flux-dev@googlegroups.com",
+	cmd.Flags().StringVarP(&opts.GitEmail, "git-email", "", "",
 		"Email to use as git committer")
 	cmd.Flags().StringVarP(&opts.Namespace, "namespace", "", getKubeConfigContextNamespace("default"),
 		"Cluster namespace where to install flux")
@@ -46,6 +46,9 @@ func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	if opts.GitURL == "" {
 		fmt.Errorf("please supply a valid --git-url argument")
 	}
+	if opts.GitEmail == "" {
+		fmt.Errorf("please supply a valid --git-email argument")
+	}
 	manifests, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
 	if err != nil {
 		return err

From 3bd89a4ccbc9a3fc515e2efa685afb700ecdc4e0 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 16:59:14 +0200
Subject: [PATCH 074/158] Stop exposing additional args through `fluxctl
 install`

---
 cmd/fluxctl/install_cmd.go           | 2 --
 install/generated_templates.gogen.go | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index 7e6b13d00..c410235af 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -37,8 +37,6 @@ fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | ku
 		"Email to use as git committer")
 	cmd.Flags().StringVarP(&opts.Namespace, "namespace", "", getKubeConfigContextNamespace("default"),
 		"Cluster namespace where to install flux")
-	cmd.Flags().StringSliceVarP(&opts.AdditionalFluxArgs, "extra-flux-args", "", []string{},
-		"Additional arguments for Flux as CSVs, e.g. --extra-flux-args='--manifest-generation=true,--sync-garbage-collection=true'")
 	return cmd
 }
 
diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index 46c2fca78..5abce3f6b 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,7 +19,7 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 25, 14, 38, 46, 214627251, time.UTC),
+			modTime: time.Date(2019, 7, 25, 14, 39, 51, 981008862, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
@@ -30,10 +30,10 @@ var templates = func() http.FileSystem {
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 14, 38, 46, 213126179, time.UTC),
-			uncompressedSize: 5899,
+			modTime:          time.Date(2019, 7, 25, 14, 39, 51, 979604581, time.UTC),
+			uncompressedSize: 5901,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\xdf\x6f\x1b\xb9\xf1\x7f\xf7\x5f\x31\x90\x1f\x92\x00\xd2\xca\x8a\xef\xfb\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\xb3\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xdc\xd5\x09\xc6\xfd\xef\xc5\x90\xfb\x83\x2b\xc9\xce\x21\x79\x88\x6d\xee\xfc\x9e\xe1\x67\x66\xb8\x58\x2c\x2e\x44\xad\xfe\x89\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xd8\x29\x53\xe4\xf0\x0e\x6b\x6d\x0f\x15\x1a\x7f\x51\xa1\x17\x85\xf0\x22\xbf\x00\x30\xa2\xc2\x1c\x36\xba\xf9\xfd\xf1\x11\xd4\x06\xb2\x3b\x51\x21\xd5\x42\x22\xfc\xf1\x47\xf7\x3d\xfc\x99\xc3\xe3\xe3\xf4\xeb\xe3\x23\xa0\x29\x98\x8c\x6a\x94\x2c\xcc\x61\xad\x95\x14\x94\xc3\xea\x02\x80\x50\xa3\xf4\xd6\xf1\x17\x80\x4a\x78\x59\xfe\x2a\xd6\xa8\x29\x1e\xa4\xba\x99\xda\x3b\xe1\x71\x7b\x88\x1f\xfd\xa1\xc6\x1c\xbe\xa0\x74\x28\x3c\x5e\x00\x78\xac\x6a\x2d\x3c\x76\xc2\x12\x0f\xf8\x9f\x30\xc6\x7a\xe1\x95\x35\x83\x70\x80\xda\xd9\x0a\x7d\x89\x0d\x65\xca\x66\xb5\x75\x3e\x87\xd9\xf5\xd5\xf5\x6a\x06\x97\xe0\x51\xeb\x84\x02\xbc\x05\x92\x4e\xd4\x08\xcb\x0a\xbd\x53\x92\xd8\xb9\xda\x2a\xe3\x5f\x10\x30\x73\xd6\x09\xd6\x13\x1f\x8e\xbc\x00\xe8\x63\x11\x7e\x47\xd7\x2a\x89\x6f\xa4\xb4\x8d\xf1\x77\x53\x42\x80\xd6\xea\xa6\xc2\x41\xd4\xa2\x13\xb5\x55\x7e\xb1\xc3\xc3\xa0\x80\x38\x0a\x7e\x54\xd8\x9f\x8c\xf2\x16\xcc\x52\x84\x04\x27\x54\x05\x6e\x44\xa3\xfd\xad\x2d\x30\x87\xab\x1f\xae\xae\xe0\x12\xf6\x25\x1a\xa8\xd8\x1a\x2c\xc0\xa1\x28\x16\xd6\xe8\xc3\x1c\xf6\x08\x7b\x6b\x5e\x78\x58\x23\x88\xb5\x46\x8e\x87\x2c\x2b\x5b\x5c\x74\x02\x2f\xe1\x1f\xa5\x22\x50\x04\x02\x7c\x55\x6f\x08\x1a\xc2\x02\x36\xd6\xc1\x16\x0d\x3a\xe1\x95\xd9\xc2\xc3\xc3\xdf\x60\x87\x07\xca\xe0\xa3\x81\x4f\x7f\x21\xf8\xe9\x06\x56\xd9\xea\x6a\x3e\x48\xe9\x75\x47\x17\x08\x84\xc3\xd4\x0e\xb2\x6c\x8a\x41\x2c\x40\x00\x61\x2d\xb8\x28\xba\x40\xc1\x1e\x07\x31\x52\x18\xd8\x3b\xe5\xd9\xd0\xec\x7c\xfc\xb6\x68\x86\x60\x60\x55\xfb\xc3\x3b\xe5\xd2\x20\x56\x58\xa8\xa6\xca\xe1\x16\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\x7f\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6d\x9b\x17\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\x4b\x52\x1e\x97\xe4\x85\x29\x84\xb6\x06\x17\x84\xbe\xa9\xb3\xaa\xb8\x0c\xd6\x2e\xc4\xa2\x76\xaa\x15\x1e\x43\x79\xb2\xb3\x83\xa2\x3e\x55\x44\xe5\x42\x5a\xb3\x51\xdb\xe1\x13\x40\x3c\xb8\x15\x75\x9e\x1c\xa6\xf7\x6c\x91\xb0\x7d\x6f\xda\xb2\x5d\xb3\xc6\x65\x14\x32\x56\xe7\x37\x53\xb6\x57\x54\xf2\x49\x29\x5a\x04\x01\x85\xda\x6c\xd0\x31\xa6\xf6\x12\xba\x4b\x37\xe2\x66\xc8\x50\x14\x97\xe6\x88\xb1\xa7\x55\x05\xf6\x59\xd9\xa8\x6d\x25\xea\xd1\x10\xe5\x4b\x10\x06\xd0\x78\x77\x08\x3e\xfc\x16\x89\x7e\x9b\x83\x30\x05\x34\x46\xda\x8a\xc1\x3c\xf0\x47\x6f\x6f\x43\xb6\x85\x29\x06\x29\x68\xda\x20\x41\x21\x75\xe9\x3e\xc9\x00\x87\xe1\x3b\x32\x90\xb0\x7d\x33\x03\x01\x28\xbc\x05\x55\x31\x8c\xc2\x87\xfb\x0f\x01\x23\xe0\x25\xbb\x45\x6a\x6b\x94\x19\x95\xb3\x73\x2d\x3a\xb5\x51\x32\xe0\x39\xd4\x8d\xab\x2d\x21\xbd\xfa\x13\x81\x1c\xa4\x44\x74\x89\x51\xe4\x00\xb1\xbe\x3f\x11\x38\x10\x6e\x3b\xde\xe2\x27\x22\xb6\xad\xb7\x0c\x2f\x94\x84\x66\x8a\xd0\x97\x4f\x60\xf4\x29\xdf\x19\x8c\xee\xc3\x39\x5c\xd4\x93\xf6\x90\x34\x90\x2e\xea\x0e\x03\x8c\x1a\x0b\xb3\x9c\x7b\x24\xf9\x19\xa8\x4a\x6c\x31\x56\x3f\x33\x64\xf0\x5e\x99\x22\xf8\x5c\x31\xea\x38\x94\x63\xd5\x46\xc4\xd1\x28\x08\x19\x5b\x02\x2b\x27\x81\xc7\x08\x10\x7e\x80\x05\xc6\x84\xc2\xca\x1d\xba\x00\x0d\xee\x04\x1c\xbc\x18\xc2\xd7\xe7\x92\x47\x02\x1e\x17\x58\xb3\x17\x5b\x60\x6b\xb3\x81\x26\xa8\xca\xa1\x13\xaa\x6c\x10\x23\x8b\xf0\x23\x5f\x65\xab\xeb\xec\xf5\x94\xf6\xbe\xd1\xfa\xde\x6a\x25\x0f\x39\x7c\xdc\xdc\x59\x7f\xef\x90\x52\x4f\x1c\x92\x6d\x9c\x44\x4a\xa1\xde\xe1\x7f\x1b\x24\x3f\x39\x03\x90\x75\x93\xc3\xff\x5d\x55\x93\xc3\x2a\x74\x83\x1c\xfe\xff\x87\x5b\x35\x4e\x12\xd6\xa5\xcc\x8b\x31\x3b\xf7\x61\xaa\xb8\xbe\xba\xe6\xe6\xaa\xcc\xc6\xba\x2a\x94\xad\xd0\x03\x75\x52\x63\x13\x19\xe7\x9b\x3d\x44\xd0\xbe\x17\xbe\xcc\x61\x89\x5e\x86\x58\x14\x4b\xa2\x92\xa7\x16\x1b\xe7\x28\xd0\xb6\xbb\x1e\x5b\xd5\xa2\x01\x65\x62\x78\x5e\x50\xe4\x21\x2a\x97\x93\x5b\x1d\xa3\x20\x8a\xcf\x46\x1f\x72\xf0\xae\x41\x96\xc6\x1d\x3d\x5c\xa8\x75\x87\x43\x5c\x01\x35\xba\x8d\x75\x12\x59\x68\x6c\xe1\xdc\xc1\x9f\x32\x3c\xed\xb2\x53\xdb\x5b\xe1\x3a\xdb\x23\xd9\xf7\x99\x9f\x94\xd3\x47\x23\x75\x13\x2e\x3a\x0f\x22\x11\x8f\x7b\x10\x88\x9d\xee\x1b\x8d\xb9\x6f\xcd\x3f\x32\xeb\x51\xd3\x1c\xc0\x00\x0a\x94\x5a\x38\x1e\x40\xd6\xb6\x4d\x6a\xf5\x99\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x49\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xfa\xfa\xf3\x2f\x6f\x3f\xdf\xbd\xff\xf8\x61\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\xcf\xf9\x78\xd2\x17\x4e\x7d\x1c\x8b\x93\x89\x9f\x74\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xc7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\x4f\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x34\xd9\x68\xda\xfc\x4c\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x49\x4c\xbe\x55\xc4\xc7\x35\xd0\xb7\x88\x67\x2a\x80\x3b\xd4\xb4\x33\x3d\xd3\x9b\x9e\xa8\x4b\xa6\x8a\xcd\x78\x42\x37\xc5\x87\xd1\x68\x56\x99\x4f\x7c\x88\x69\x88\x0b\x07\x16\x8c\x99\x52\xc8\x12\x0b\x8e\x6c\x9a\xda\x61\x08\xe2\x24\x72\x58\xe6\x89\x14\xeb\xba\x29\x27\x61\xe8\x16\xa6\xc0\x38\x0f\x4a\x78\xd0\xa7\xa6\xae\xf5\x81\x03\x41\x69\x28\xc6\x59\xc3\xef\x2d\x5b\xd9\x70\x4a\x43\xc1\x85\xed\x2e\xe4\x01\x4a\xbb\x0f\xcb\x8c\x35\x06\xa5\x0f\x73\x88\x9f\x86\x6e\xb1\x18\x1c\x08\x53\x2a\x2b\xbf\x19\x8e\xb2\xae\x45\x67\xd4\xca\x4c\xea\x86\x27\xdf\x8c\xf1\x4b\xa7\x21\xf9\x4a\xf1\xaa\x8d\xa1\x78\x1b\x49\x3f\xde\x4f\x9c\xe2\x5b\x47\xe8\xc3\xb2\x34\x4d\xec\x68\x43\x4f\xcf\x2b\xa9\x77\x4c\x19\xd6\x97\x04\x81\x53\x8b\x3b\xea\x9b\x8b\xc9\x4c\xa0\x08\xaa\x86\xc2\x3a\x17\xa2\xa7\xb0\x88\xd5\xb4\x0e\xb8\x1e\xba\x71\xd8\xe2\x5e\xf6\xab\xd1\xab\xd4\x96\xfe\x6e\xc5\x2a\xe4\x21\x22\x59\xe6\x26\x86\x30\x16\x46\x7c\x5f\x14\xca\xdd\x9c\xa0\x7e\x6a\xd6\x97\x64\x16\x18\x93\xf7\xf5\xcb\xaf\x71\xdb\x14\x66\x1b\xbf\x7d\x50\x3e\x6c\x40\xa4\xbc\x75\x87\x01\xad\xde\xf3\x1c\x33\x51\xce\x3d\xa8\x71\xfa\xe6\xf1\x11\xb2\x0f\xca\xb3\xa4\xf0\x68\x31\xa5\x58\x3b\x61\x64\xd9\x13\xfd\x1c\xfe\x8a\xcf\x17\x6a\x13\x8e\xf8\x6e\xd0\x39\xce\x5a\xf8\xc0\xf7\x10\xd2\x40\x7f\xb7\xca\x24\x0c\xb3\xf9\xac\x7b\x05\xd1\x84\x29\x3b\x4f\x02\xa7\xad\x6a\x2f\x4c\x28\x3f\x87\x9c\x55\x19\x07\xd0\x4a\x18\xb5\xe1\xd1\x84\x0b\x94\x54\x81\x2e\xfa\x7a\x34\xe4\x85\xed\xcd\x12\x42\x63\x0a\x74\x47\x01\x74\xa8\x85\x57\x2d\x42\x1d\xcc\xea\xd2\xbb\x9d\x04\xf1\xa8\xe0\x07\xe7\xa8\x59\x17\xca\xad\xe6\xf1\xe7\xeb\xe1\x49\x67\x0c\x4e\x78\xb2\x39\x17\x9c\xf0\x0e\xd2\x47\xb5\xa7\x3a\x23\xe0\x2b\xa1\x3b\xc7\xdf\x10\xba\x21\x73\x4c\x03\xe7\xf9\x7f\xa9\x84\x3a\x6b\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x9d\x05\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\xa3\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x3c\x03\xa3\x3d\x47\x27\x8b\xb9\x6e\xfe\xba\xc3\x03\xa8\xe2\xa7\x81\xec\x99\x56\x99\x58\xc5\x22\x84\x6f\x1c\x4e\x16\xa2\x33\xba\xc2\xe7\xc3\x62\xa0\xa7\xa7\x7d\x37\xf8\xbb\xef\x03\x90\x40\xa2\x30\x30\x6b\x6a\xf2\x0e\x45\x35\xeb\x01\x2b\x11\xf2\x12\xb3\x6d\x36\x87\x7f\xf1\xbc\x0f\x6f\xb5\x6d\x8a\x57\x59\xd8\xf7\xbc\xdd\xf1\xfc\x46\x50\x0b\xe7\x95\x6c\xb4\x70\xd0\x3d\x35\x74\x52\x8e\xb1\xb6\xd3\x7a\xb3\x27\x5e\x29\x24\xcb\xca\xc2\x1e\x91\xc5\x45\x42\xd4\x6a\x79\x54\xfd\xcc\x16\x14\xdd\x88\xb5\x5c\xbd\xbe\x3e\xfd\x3f\x75\xf8\x01\x5d\x7b\xe6\x15\x8f\xc7\x8e\xb1\xd1\x70\xd6\x7e\x4c\x11\x4f\xec\x18\x29\x5d\x44\x5d\xf4\xc9\xd3\xe0\x8b\xe4\x75\x31\x79\x26\x64\x17\xc3\x3e\x1b\x5a\xff\x14\x97\xb4\x22\x8f\x66\xd1\x99\x70\x93\x5f\x5f\x5d\xaf\x2e\xba\x8a\x7e\x53\x14\x2a\x6e\x08\x8c\x67\x6f\xb8\x9d\x8f\xb5\x7d\x09\xe3\xe7\xb1\xa3\x3d\x3e\x82\x0b\xe0\xf8\x3c\xf3\x22\xbc\xd0\x1e\x5d\xa2\xe9\x65\xb8\x84\xcf\x75\x27\xfd\xdd\xdd\x43\xdf\x89\x68\xde\x0d\x48\x8d\xeb\xfa\x12\x98\xc2\x7a\x02\x1b\x88\xa1\x12\x87\xb0\x57\xe9\x76\xdc\xb0\x0d\x69\x6b\x77\x4d\x0d\x8a\xa8\x41\x02\x6b\x80\x6c\x85\xf0\xa9\x59\xa3\x33\xe8\x91\x20\x3c\x07\xd1\xb8\x40\x17\x86\xfa\xd5\x6d\x76\x67\x0d\xce\xd2\x2f\x6f\x83\x01\xe9\x0a\x1d\x95\xd3\x74\xab\xee\x07\x9d\x60\xdf\xe4\xcb\x30\x83\xcd\x56\xb3\x8b\xff\x05\x00\x00\xff\xff\x9e\xf6\xc5\xc2\x0b\x17\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\xdf\x6f\x1b\xb9\xf1\x7f\xf7\x5f\x31\x90\x1f\x92\x00\xd2\xca\x8a\xef\xfb\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\x8b\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xdc\xd5\x09\xc2\xfd\xef\xc5\x90\xfb\x83\x2b\xc9\xc9\x21\x79\x88\x6d\xee\xfc\x9e\xe1\x67\x66\xb8\x58\x2c\xae\x44\xad\xfe\x89\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xfd\x78\x04\xb5\x81\xec\x5e\x54\x48\xb5\x90\x08\x7f\xfc\xd1\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\xab\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\x66\xb7\x37\xb7\xab\x19\x5c\x83\x47\xad\x13\x0a\xf0\x16\x48\x3a\x51\x23\x2c\x2b\xf4\x4e\x49\x62\xe7\x6a\xab\x8c\x7f\x46\xc0\xcc\x59\x27\x58\x4f\x7c\x38\xf1\x02\xa0\x8f\x45\xf8\x1d\x5d\xab\x24\xbe\x92\xd2\x36\xc6\xdf\x4f\x09\x01\x5a\xab\x9b\x0a\x07\x51\x8b\x4e\xd4\x56\xf9\xc5\x0e\x0f\x83\x02\xe2\x28\xf8\x51\x61\x7f\x32\xca\x5b\x30\x4b\x11\x12\x9c\x50\x15\xb8\x11\x8d\xf6\x1f\x6d\x81\x39\xdc\xfc\x70\x73\x03\xd7\xb0\x2f\xd1\x40\xc5\xd6\x60\x01\x0e\x45\xb1\xb0\x46\x1f\xe6\xb0\x47\xd8\x5b\xf3\xcc\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\xe2\xaa\x13\x78\x0d\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\x1e\x1f\xff\x06\x3b\x3c\x50\x06\xef\x0d\x7c\xf8\x0b\xc1\x4f\x77\xb0\xca\x56\x37\xf3\x41\x4a\xaf\x3b\xba\x40\x20\x1c\xa6\x76\x90\x65\x53\x0c\x62\x01\x02\x08\x6b\xc1\x45\xd1\x05\x0a\xf6\x38\x88\x91\xc2\xc0\xde\x29\xcf\x86\x66\x97\xe3\xb7\x45\x33\x04\x03\xab\xda\x1f\xde\x28\x97\x06\xb1\xc2\x42\x35\x55\x0e\x1f\xb1\xb2\xee\x90\xfa\x89\xb0\xb1\x5a\xdb\x3d\x7b\xd4\xa9\x56\x14\x5c\x6d\x88\xcf\x04\xc8\x86\xbc\xad\x14\x47\x60\x67\xec\xde\xfc\xa7\xb4\xe4\x69\x10\xb1\x51\x1a\xe7\xb0\x2f\x95\x2c\xe1\x60\x1b\xd8\x2b\xad\xa3\x53\xde\x42\x61\xf9\x9e\xf1\x31\x33\xf1\x2f\x0e\xec\xde\xb0\xd9\x83\x00\x87\xb5\x05\x27\x7c\x89\x0e\x7c\x29\x4c\xa7\x78\xab\x7c\xd9\xac\xc1\xf2\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\x79\xa6\x35\x08\x4d\xb6\x57\x31\x0d\x36\x28\x0f\xca\x78\x1b\x78\xa4\x35\x5e\x28\x83\x6e\x0e\x6b\xd4\x76\x9f\xc1\x23\x8e\x51\x2d\xbd\xaf\x29\x5f\x2e\xa3\x9e\x4c\xda\x6a\xb9\x47\xd1\xe2\xde\xba\x1d\x2d\xb9\xd2\x96\x6b\x6d\xd7\xcb\x4a\x90\x47\xb7\x24\xe5\x71\x49\x5e\x98\x42\x68\x6b\x70\x41\xe8\x9b\x3a\xab\x8a\xeb\x60\xed\x42\x2c\x6a\xa7\x5a\xe1\x31\x94\x27\x3b\x3b\x28\xea\x53\x45\x54\x2e\xa4\x35\x1b\xb5\x1d\x3e\x01\xc4\x83\x8f\xa2\xce\x93\xc3\xf4\x9e\x2d\x12\xb6\xef\x4d\x5b\xb6\x6b\xd6\xb8\x8c\x42\xc6\xea\xfc\x66\xca\xf6\x8a\x4a\x3e\x29\x45\x8b\x20\xa0\x50\x9b\x0d\x3a\xc6\xd4\x5e\x42\x77\xe9\x46\xdc\x0c\x19\x8a\xe2\xd2\x1c\x31\xf6\xb4\xaa\xc0\x3e\x2b\x1b\xb5\xad\x44\x3d\x1a\xa2\x7c\x09\xc2\x00\x1a\xef\x0e\xc1\x87\xdf\x22\xd1\x6f\x73\x10\xa6\x80\xc6\x48\x5b\x31\x98\x07\xfe\xe8\xed\xc7\x90\x6d\x61\x8a\x41\x0a\x9a\x36\x48\x50\x48\x5d\xba\xcf\x32\xc0\x61\xf8\x8e\x0c\x24\x6c\xdf\xcc\x40\x00\x0a\x6f\x41\x55\x0c\xa3\xf0\xee\xe1\x5d\xc0\x08\x78\xce\x6e\x91\xda\x1a\x65\x46\xe5\xec\x5c\x8b\x4e\x6d\x94\x0c\x78\x0e\x75\xe3\x6a\x4b\x48\x2f\xfe\x44\x20\x07\x29\x11\x5d\x62\x14\x39\x40\xac\xef\x4f\x04\x0e\x84\xdb\x8e\xb7\xf8\x89\x88\x6d\xeb\x2d\xc3\x0b\x25\xa1\x99\x22\xf4\xf5\x13\x18\x7d\xce\x77\x01\xa3\xfb\x70\x0e\x17\xf5\xac\x3d\x24\x0d\xa4\x8b\xba\xc3\x00\xa3\xc6\xc2\x2c\xe7\x1e\x49\x7e\x06\xaa\x12\x5b\x8c\xd5\xcf\x0c\x19\xbc\x55\xa6\x08\x3e\x57\x8c\x3a\x0e\xe5\x58\xb5\x11\x71\x34\x0a\x42\xc6\x96\xc0\xca\x49\xe0\x31\x02\x84\x1f\x60\x81\x31\xa1\xb0\x72\x87\x2e\x40\x83\x3b\x03\x07\x2f\x86\xf0\xf5\xb9\xe4\x91\x80\xc7\x05\xd6\xec\xc5\x16\xd8\xda\x6c\xa0\x09\xaa\x72\xe8\x84\x2a\x1b\xc4\xc8\x22\xfc\xc8\x57\xd9\xea\x36\x7b\x39\xa5\x7d\x68\xb4\x7e\xb0\x5a\xc9\x43\x0e\xef\x37\xf7\xd6\x3f\x38\xa4\xd4\x13\x87\x64\x1b\x27\x91\x52\xa8\x77\xf8\xdf\x06\xc9\x4f\xce\x00\x64\xdd\xe4\xf0\x7f\x37\xd5\xe4\xb0\x0a\xdd\x20\x87\xff\xff\xe1\xa3\x1a\x27\x09\xeb\x52\xe6\xc5\x98\x9d\x87\x30\x55\xdc\xde\xdc\x72\x73\x55\x66\x63\x5d\x15\xca\x56\xe8\x81\x3a\xa9\xb1\x89\x8c\xcb\xcd\x1e\x22\x68\x3f\x08\x5f\xe6\xb0\x44\x2f\x43\x2c\x8a\x25\x51\xc9\x53\x8b\x8d\x73\x14\x68\xdb\x5d\x8f\xad\x6a\xd1\x80\x32\x31\x3c\xcf\x28\xf2\x10\x95\xcb\xc9\xad\x8e\x51\x10\xc5\x27\xa3\x0f\x39\x78\xd7\x20\x4b\xe3\x8e\x1e\x2e\xd4\xba\xc3\x21\xae\x80\x1a\xdd\xc6\x3a\x89\x2c\x34\xb6\x70\xee\xe0\x4f\x19\x9e\x76\xd9\xa9\xed\xad\x70\x9d\xed\x91\xec\xfb\xcc\x4f\xca\xe9\xbd\x91\xba\x09\x17\x9d\x07\x91\x88\xc7\x3d\x08\xc4\x4e\xf7\x8d\xc6\xdc\xb7\xe6\x1f\x99\xf5\xa4\x69\x0e\x60\x00\x05\x4a\x2d\x1c\x0f\x20\x6b\xdb\x26\xb5\xfa\x95\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x49\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xf8\xf2\xf3\x2f\xaf\x3f\xdd\xbf\x7d\xff\x6e\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\x2f\xf9\x78\xd6\x17\xce\x7d\x1c\x8b\x93\x89\x9f\x74\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xa7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\xcf\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x3c\xd9\x68\xda\xfc\x42\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x59\x4c\xbe\x55\xc4\xa7\x35\xd0\xb7\x88\xaf\x54\x00\x77\xa8\x69\x67\xfa\x4a\x6f\x7a\xa2\x2e\x99\x2a\x36\xe3\x09\xdd\x14\x1f\x46\xa3\x59\x65\x3e\xf1\x21\xa6\x21\x2e\x1c\x58\x30\x66\x4a\x21\x4b\x2c\x38\xb2\x69\x6a\x87\x21\x88\x93\xc8\x61\x99\x27\x52\xac\xeb\xa6\x9c\x84\xa1\x5b\x98\x02\xe3\x3c\x28\xe1\x41\x9f\x9a\xba\xd6\x07\x0e\x04\xa5\xa1\x18\x67\x0d\xbf\xb7\x6c\x65\xc3\x29\x0d\x05\x17\xb6\xbb\x90\x07\x28\xed\x3e\x2c\x33\xd6\x18\x94\x3e\xcc\x21\x7e\x1a\xba\xc5\x62\x70\x20\x4c\xa9\xac\xfc\x6e\x38\xca\xba\x16\x9d\x51\x2b\x33\xa9\x1b\x9e\x7c\x33\xc6\x2f\x9d\x86\xe4\x0b\xc5\xab\x36\x86\xe2\x75\x24\x7d\xff\x30\x71\x8a\x6f\x1d\xa1\x0f\xcb\xd2\x34\xb1\xa3\x0d\x3d\x3d\xaf\xa4\xde\x31\x65\x58\x5f\x12\x04\x4e\x2d\xee\xa8\xef\xae\x26\x33\x81\x22\xa8\x1a\x0a\xeb\x5c\x88\x9e\xc2\x22\x56\xd3\x3a\xe0\x7a\xe8\xc6\x61\x8b\x7b\xde\xaf\x46\x2f\x52\x5b\xfa\xbb\x15\xab\x90\x87\x88\x64\x99\x9b\x18\xc2\x58\x18\xf1\x7d\x51\x28\x77\x77\x86\xfa\xa9\x59\x9f\x93\x59\x60\x4c\xde\x97\xcf\xbf\xc6\x6d\x53\x98\x6d\xfc\xf6\x4e\xf9\xb0\x01\x91\xf2\xd6\x1d\x06\xb4\x7a\xcb\x73\xcc\x44\x39\xf7\xa0\xc6\xe9\xbb\xe3\x11\xb2\x77\xca\xb3\xa4\xf0\x68\x31\xa5\x58\x3b\x61\x64\xd9\x13\xfd\x1c\xfe\x8a\xcf\x17\x6a\x13\x8e\xf8\x6e\xd0\x25\xce\x5a\xf8\xc0\xf7\x18\xd2\x40\x7f\xb7\xca\x24\x0c\xb3\xf9\xac\x7b\x05\xd1\x84\x29\x3b\x4f\x02\xe7\xad\x6a\x2f\x4c\x28\x3f\x87\x9c\x55\x19\x07\xd0\x4a\x18\xb5\xe1\xd1\x84\x0b\x94\x54\x81\x2e\xfa\x7a\x32\xe4\x85\xed\xcd\x12\x42\x63\x0a\x74\x27\x01\x74\xa8\x85\x57\x2d\x42\x1d\xcc\xea\xd2\xbb\x9d\x04\xf1\xa4\xe0\x07\xe7\xa8\x59\x17\xca\xad\xe6\xf1\xe7\xcb\xe1\x49\x67\x0c\x4e\x78\xb2\xb9\x14\x9c\xf0\x0e\xd2\x47\xb5\xa7\xba\x20\xe0\x0b\xa1\xbb\xc4\xdf\x10\xba\x21\x73\x4c\x03\x97\xf9\x7f\xa9\x84\xba\x68\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x5d\x04\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\x93\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x7d\x05\x46\x7b\x8e\x4e\x16\x73\xdd\xfd\x75\x87\x07\x50\xc5\x4f\x03\xd9\x57\x5a\x65\x62\x15\x8b\x10\xbe\x71\x38\x59\x88\x2e\xe8\x0a\x9f\x0f\x8b\x81\x9e\x9e\xf6\xdd\xe0\xef\xbe\x0f\x40\x02\x89\xc2\xc0\xac\xa9\xc9\x3b\x14\xd5\xac\x07\xac\x44\xc8\x73\xcc\xb6\xd9\x1c\xfe\xc5\xf3\x3e\xbc\xd6\xb6\x29\x5e\x64\x61\xdf\xf3\x76\xc7\xf3\x1b\x41\x2d\x9c\x57\xb2\xd1\xc2\x41\xf7\xd4\xd0\x49\x39\xc5\xda\x4e\xeb\xdd\x9e\x78\xa5\x90\x2c\x2b\x0b\x7b\x44\x16\x17\x09\x51\xab\xe5\x49\xf5\x33\x5b\x50\x74\x27\xd6\x72\xf5\xf2\xf6\xfc\xff\xd4\xe1\x47\x74\xed\x85\x57\x3c\x1e\x3b\xc6\x46\xc3\x59\xfb\x31\x45\x3c\xb1\x63\xa4\x74\x11\x75\xd1\x27\x4f\x83\xcf\x92\xd7\xc5\xe4\x99\x90\x5d\x0c\xfb\x6c\x68\xfd\x53\x5c\xd2\x8a\x3c\x9a\x45\x67\xc2\x5d\x7e\x7b\x73\xbb\xba\xea\x2a\xfa\x55\x51\xa8\xb8\x21\x30\x9e\xbd\xe2\x76\x3e\x81\x8e\xf1\xfb\xd8\xd2\x8e\x47\x70\x01\x1d\xbf\xc1\xbd\x08\x6f\xb4\x27\xd7\x68\x7a\x1d\xae\xe1\x53\xdd\x89\x7f\x73\xff\xd8\xf7\x22\x9a\x77\x23\x52\xe3\xba\xce\x04\xa6\xb0\x9e\xc0\x06\x62\xa8\xc4\x21\x6c\x56\xba\x1d\x77\x6c\x43\xda\xda\x5d\x53\x83\x22\x6a\x90\xc0\x1a\x20\x5b\x21\x7c\x68\xd6\xe8\x0c\x7a\x24\x08\x0f\x42\x34\xae\xd0\x85\xa1\x7e\x79\x9b\xdd\x5b\x83\xb3\xf4\xcb\xeb\x60\x40\xba\x44\x47\xe5\x34\xdd\xab\xfb\x51\x27\xd8\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xea\x7f\x01\x00\x00\xff\xff\xe5\xd1\xec\xd3\x0d\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",

From e849e7fe204773ae4369072c60ed0008c2ce8b88 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 17:04:25 +0200
Subject: [PATCH 075/158] Forgot to return errors :S

---
 cmd/fluxctl/install_cmd.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index c410235af..f4cdfa5a2 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -42,10 +42,10 @@ fluxctl install --git-url 'git@github.com:<your username>/flux-get-started' | ku
 
 func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	if opts.GitURL == "" {
-		fmt.Errorf("please supply a valid --git-url argument")
+		return fmt.Errorf("please supply a valid --git-url argument")
 	}
 	if opts.GitEmail == "" {
-		fmt.Errorf("please supply a valid --git-email argument")
+		return fmt.Errorf("please supply a valid --git-email argument")
 	}
 	manifests, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
 	if err != nil {
@@ -53,7 +53,7 @@ func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	}
 	for fileName, content := range manifests {
 		if _, err := os.Stdout.Write(content); err != nil {
-			fmt.Errorf("cannot output manifest file %s: %s", fileName, err)
+			return fmt.Errorf("cannot output manifest file %s: %s", fileName, err)
 		}
 
 	}

From 07f68cd930702fe8f2e852f067adb5b2deca26a8 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 25 Jul 2019 17:12:41 +0200
Subject: [PATCH 076/158] Rename FillInInstallTemplates to FillInTemplates

---
 cmd/fluxctl/install_cmd.go |  2 +-
 install/generate.go        |  2 +-
 install/install.go         |  2 +-
 install/install_test.go    | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/fluxctl/install_cmd.go b/cmd/fluxctl/install_cmd.go
index f4cdfa5a2..0c504fb0a 100644
--- a/cmd/fluxctl/install_cmd.go
+++ b/cmd/fluxctl/install_cmd.go
@@ -47,7 +47,7 @@ func (opts *installOpts) RunE(cmd *cobra.Command, args []string) error {
 	if opts.GitEmail == "" {
 		return fmt.Errorf("please supply a valid --git-email argument")
 	}
-	manifests, err := install.FillInInstallTemplates(install.TemplateParameters(*opts))
+	manifests, err := install.FillInTemplates(install.TemplateParameters(*opts))
 	if err != nil {
 		return err
 	}
diff --git a/install/generate.go b/install/generate.go
index 2e9acebd2..f9ae3d981 100644
--- a/install/generate.go
+++ b/install/generate.go
@@ -38,7 +38,7 @@ func main() {
 			GitURL:    "git@github.com:weaveworks/flux-get-started",
 			GitBranch: "master",
 		}
-		manifests, err := install.FillInInstallTemplates(params)
+		manifests, err := install.FillInTemplates(params)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error: failed to fill in templates: %s\n", err)
 			os.Exit(1)
diff --git a/install/install.go b/install/install.go
index 327bdb561..29a32ff7b 100644
--- a/install/install.go
+++ b/install/install.go
@@ -23,7 +23,7 @@ type TemplateParameters struct {
 	AdditionalFluxArgs []string
 }
 
-func FillInInstallTemplates(params TemplateParameters) (map[string][]byte, error) {
+func FillInTemplates(params TemplateParameters) (map[string][]byte, error) {
 	result := map[string][]byte{}
 	err := vfsutil.WalkFiles(templates, "/", func(path string, info os.FileInfo, rs io.ReadSeeker, err error) error {
 		if err != nil {
diff --git a/install/install_test.go b/install/install_test.go
index 89bc940f6..4d0304ee5 100644
--- a/install/install_test.go
+++ b/install/install_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func testFillInInstallTemplates(t *testing.T, params TemplateParameters) {
-	manifests, err := FillInInstallTemplates(params)
+func testFillInTemplates(t *testing.T, params TemplateParameters) {
+	manifests, err := FillInTemplates(params)
 	assert.NoError(t, err)
 	assert.Len(t, manifests, 5)
 	for fileName, contents := range manifests {
@@ -27,8 +27,8 @@ func testFillInInstallTemplates(t *testing.T, params TemplateParameters) {
 	}
 }
 
-func TestFillInInstallTemplatesAllParameters(t *testing.T) {
-	testFillInInstallTemplates(t, TemplateParameters{
+func TestFillInTemplatesAllParameters(t *testing.T) {
+	testFillInTemplates(t, TemplateParameters{
 		GitURL:             "git@github.com:fluxcd/flux-get-started",
 		GitBranch:          "branch",
 		GitPaths:           []string{"dir1", "dir2"},
@@ -41,8 +41,8 @@ func TestFillInInstallTemplatesAllParameters(t *testing.T) {
 
 }
 
-func TestFillInInstallTemplatesMissingValues(t *testing.T) {
-	testFillInInstallTemplates(t, TemplateParameters{
+func TestFillInTemplatesMissingValues(t *testing.T) {
+	testFillInTemplates(t, TemplateParameters{
 		GitURL:    "git@github.com:fluxcd/flux-get-started",
 		GitBranch: "branch",
 		GitPaths:  []string{},

From 179c2c6393ca0c871e86a394efef3b8af6dc4942 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Fri, 26 Jul 2019 10:53:22 +0200
Subject: [PATCH 077/158] Fix check-generated by refreshing the generated
 templates

Also, fix bin/helm/update_codegen.sh when there is no GOPATH defined
---
 bin/helm/update_codegen.sh           |  2 +-
 install/generated_templates.gogen.go | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/helm/update_codegen.sh b/bin/helm/update_codegen.sh
index 8f0b9f2fa..5b123e366 100755
--- a/bin/helm/update_codegen.sh
+++ b/bin/helm/update_codegen.sh
@@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
 CODEGEN_PKG=${CODEGEN_PKG:-$(echo `go env GOPATH`'/pkg/mod/k8s.io/code-generator@v0.0.0-20190511023357-639c964206c2')}
 
 go mod download # make sure the code-generator is downloaded
-bash ${CODEGEN_PKG}/generate-groups.sh all github.com/weaveworks/flux/integrations/client \
+env GOPATH=`go env GOPATH` bash ${CODEGEN_PKG}/generate-groups.sh all github.com/weaveworks/flux/integrations/client \
               github.com/weaveworks/flux/integrations/apis \
               "flux.weave.works:v1beta1 helm.integrations.flux.weave.works:v1alpha2" \
   --go-header-file "${SCRIPT_ROOT}/bin/helm/custom-boilerplate.go.txt"
diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index 5abce3f6b..c346e22e3 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,39 +19,39 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 25, 14, 39, 51, 981008862, time.UTC),
+			modTime: time.Date(2019, 7, 26, 8, 52, 31, 538418553, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 36, 31, 869053652, time.UTC),
+			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 536639495, time.UTC),
 			uncompressedSize: 836,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x92\x4b\xaf\xd3\x30\x10\x85\xf7\xfe\x15\x47\xba\x8b\x0b\xe8\x26\xa8\x3b\x94\x5d\xdb\x05\x0b\x10\x8b\xf0\xd8\x20\x16\x63\x7b\x42\x4d\x5d\x3b\xf2\x23\x3c\xa2\xfc\x77\x94\xa4\x95\x9a\xb6\x20\x55\xba\x3b\x7b\x7c\xc6\x73\xe6\xe8\x2b\x8a\x42\x3c\xe0\xd3\x8e\x11\x39\x74\x46\x31\x48\x29\x9f\x5d\x7a\x82\xb2\x39\x26\x0e\x08\xde\x72\x7c\x02\x39\xbd\x28\x41\x1a\xa7\x8d\xfb\x0e\x0a\x2c\x1e\xe0\x9d\xfd\x0d\xc7\xac\x59\xa3\xf1\x01\xef\xb2\xe4\xe0\x38\x71\xc4\x4f\x93\x76\x53\x4b\x21\x29\xb2\x1e\x27\x70\x8c\x50\xde\xa5\xe0\x2d\x5e\xd4\x9b\xf5\xf6\x65\x29\xa8\x35\x5f\x38\x44\xe3\x5d\x85\x6e\x25\xf6\xc6\xe9\x0a\x1f\x67\x57\xeb\xd9\x94\x38\x70\x22\x4d\x89\x2a\x01\x58\x92\x6c\xe3\x78\x02\x1c\x1d\xb8\x42\x63\xf3\x2f\x71\x7e\xe9\x7b\x98\x06\xe5\x07\x3a\x70\x6c\x49\x31\x86\xe1\xf8\x3e\x5d\x2b\xf4\xfd\xf2\xb5\xef\xc1\x4e\x0f\x83\x18\x73\x39\x37\x14\x24\xa9\x92\x72\xda\xf9\x60\xfe\x50\x32\xde\x95\xfb\x37\xb1\x34\xfe\x75\xb7\x92\x9c\xe8\xe4\x77\x3b\x27\x54\x7b\xcb\xf7\x9a\x15\x21\x5b\x9e\x24\x05\xa8\x35\x6f\x83\xcf\x6d\xac\xf0\xf5\xf1\xd5\xe3\xb7\xa9\x2f\x70\xf4\x39\x28\x5e\x14\x3b\x0e\xf2\xac\x50\xc0\x79\x57\x1f\x85\x9f\xeb\xf7\xff\xd6\x3e\xc3\x86\x9b\x99\x80\xfb\x17\xf5\x96\x6b\x6e\x46\xd1\x69\xd1\xff\xcc\x17\xc0\x75\xb6\x8b\xff\x62\x96\x3f\x58\xa5\x63\x76\x37\xc1\xb9\xb2\x73\x89\xc1\x25\x27\xb7\xc8\xb0\x71\x3c\x69\x6e\x28\xdb\x34\xa3\x32\x12\xf5\x37\x00\x00\xff\xff\xfd\x7f\x67\x6a\x44\x03\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 14, 39, 51, 979604581, time.UTC),
+			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 537189261, time.UTC),
 			uncompressedSize: 5901,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\xdf\x6f\x1b\xb9\xf1\x7f\xf7\x5f\x31\x90\x1f\x92\x00\xd2\xca\x8a\xef\xfb\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\x8b\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xdc\xd5\x09\xc2\xfd\xef\xc5\x90\xfb\x83\x2b\xc9\xc9\x21\x79\x88\x6d\xee\xfc\x9e\xe1\x67\x66\xb8\x58\x2c\xae\x44\xad\xfe\x89\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xfd\x78\x04\xb5\x81\xec\x5e\x54\x48\xb5\x90\x08\x7f\xfc\xd1\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\xab\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\x66\xb7\x37\xb7\xab\x19\x5c\x83\x47\xad\x13\x0a\xf0\x16\x48\x3a\x51\x23\x2c\x2b\xf4\x4e\x49\x62\xe7\x6a\xab\x8c\x7f\x46\xc0\xcc\x59\x27\x58\x4f\x7c\x38\xf1\x02\xa0\x8f\x45\xf8\x1d\x5d\xab\x24\xbe\x92\xd2\x36\xc6\xdf\x4f\x09\x01\x5a\xab\x9b\x0a\x07\x51\x8b\x4e\xd4\x56\xf9\xc5\x0e\x0f\x83\x02\xe2\x28\xf8\x51\x61\x7f\x32\xca\x5b\x30\x4b\x11\x12\x9c\x50\x15\xb8\x11\x8d\xf6\x1f\x6d\x81\x39\xdc\xfc\x70\x73\x03\xd7\xb0\x2f\xd1\x40\xc5\xd6\x60\x01\x0e\x45\xb1\xb0\x46\x1f\xe6\xb0\x47\xd8\x5b\xf3\xcc\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\xe2\xaa\x13\x78\x0d\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\x1e\x1f\xff\x06\x3b\x3c\x50\x06\xef\x0d\x7c\xf8\x0b\xc1\x4f\x77\xb0\xca\x56\x37\xf3\x41\x4a\xaf\x3b\xba\x40\x20\x1c\xa6\x76\x90\x65\x53\x0c\x62\x01\x02\x08\x6b\xc1\x45\xd1\x05\x0a\xf6\x38\x88\x91\xc2\xc0\xde\x29\xcf\x86\x66\x97\xe3\xb7\x45\x33\x04\x03\xab\xda\x1f\xde\x28\x97\x06\xb1\xc2\x42\x35\x55\x0e\x1f\xb1\xb2\xee\x90\xfa\x89\xb0\xb1\x5a\xdb\x3d\x7b\xd4\xa9\x56\x14\x5c\x6d\x88\xcf\x04\xc8\x86\xbc\xad\x14\x47\x60\x67\xec\xde\xfc\xa7\xb4\xe4\x69\x10\xb1\x51\x1a\xe7\xb0\x2f\x95\x2c\xe1\x60\x1b\xd8\x2b\xad\xa3\x53\xde\x42\x61\xf9\x9e\xf1\x31\x33\xf1\x2f\x0e\xec\xde\xb0\xd9\x83\x00\x87\xb5\x05\x27\x7c\x89\x0e\x7c\x29\x4c\xa7\x78\xab\x7c\xd9\xac\xc1\xf2\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\x79\xa6\x35\x08\x4d\xb6\x57\x31\x0d\x36\x28\x0f\xca\x78\x1b\x78\xa4\x35\x5e\x28\x83\x6e\x0e\x6b\xd4\x76\x9f\xc1\x23\x8e\x51\x2d\xbd\xaf\x29\x5f\x2e\xa3\x9e\x4c\xda\x6a\xb9\x47\xd1\xe2\xde\xba\x1d\x2d\xb9\xd2\x96\x6b\x6d\xd7\xcb\x4a\x90\x47\xb7\x24\xe5\x71\x49\x5e\x98\x42\x68\x6b\x70\x41\xe8\x9b\x3a\xab\x8a\xeb\x60\xed\x42\x2c\x6a\xa7\x5a\xe1\x31\x94\x27\x3b\x3b\x28\xea\x53\x45\x54\x2e\xa4\x35\x1b\xb5\x1d\x3e\x01\xc4\x83\x8f\xa2\xce\x93\xc3\xf4\x9e\x2d\x12\xb6\xef\x4d\x5b\xb6\x6b\xd6\xb8\x8c\x42\xc6\xea\xfc\x66\xca\xf6\x8a\x4a\x3e\x29\x45\x8b\x20\xa0\x50\x9b\x0d\x3a\xc6\xd4\x5e\x42\x77\xe9\x46\xdc\x0c\x19\x8a\xe2\xd2\x1c\x31\xf6\xb4\xaa\xc0\x3e\x2b\x1b\xb5\xad\x44\x3d\x1a\xa2\x7c\x09\xc2\x00\x1a\xef\x0e\xc1\x87\xdf\x22\xd1\x6f\x73\x10\xa6\x80\xc6\x48\x5b\x31\x98\x07\xfe\xe8\xed\xc7\x90\x6d\x61\x8a\x41\x0a\x9a\x36\x48\x50\x48\x5d\xba\xcf\x32\xc0\x61\xf8\x8e\x0c\x24\x6c\xdf\xcc\x40\x00\x0a\x6f\x41\x55\x0c\xa3\xf0\xee\xe1\x5d\xc0\x08\x78\xce\x6e\x91\xda\x1a\x65\x46\xe5\xec\x5c\x8b\x4e\x6d\x94\x0c\x78\x0e\x75\xe3\x6a\x4b\x48\x2f\xfe\x44\x20\x07\x29\x11\x5d\x62\x14\x39\x40\xac\xef\x4f\x04\x0e\x84\xdb\x8e\xb7\xf8\x89\x88\x6d\xeb\x2d\xc3\x0b\x25\xa1\x99\x22\xf4\xf5\x13\x18\x7d\xce\x77\x01\xa3\xfb\x70\x0e\x17\xf5\xac\x3d\x24\x0d\xa4\x8b\xba\xc3\x00\xa3\xc6\xc2\x2c\xe7\x1e\x49\x7e\x06\xaa\x12\x5b\x8c\xd5\xcf\x0c\x19\xbc\x55\xa6\x08\x3e\x57\x8c\x3a\x0e\xe5\x58\xb5\x11\x71\x34\x0a\x42\xc6\x96\xc0\xca\x49\xe0\x31\x02\x84\x1f\x60\x81\x31\xa1\xb0\x72\x87\x2e\x40\x83\x3b\x03\x07\x2f\x86\xf0\xf5\xb9\xe4\x91\x80\xc7\x05\xd6\xec\xc5\x16\xd8\xda\x6c\xa0\x09\xaa\x72\xe8\x84\x2a\x1b\xc4\xc8\x22\xfc\xc8\x57\xd9\xea\x36\x7b\x39\xa5\x7d\x68\xb4\x7e\xb0\x5a\xc9\x43\x0e\xef\x37\xf7\xd6\x3f\x38\xa4\xd4\x13\x87\x64\x1b\x27\x91\x52\xa8\x77\xf8\xdf\x06\xc9\x4f\xce\x00\x64\xdd\xe4\xf0\x7f\x37\xd5\xe4\xb0\x0a\xdd\x20\x87\xff\xff\xe1\xa3\x1a\x27\x09\xeb\x52\xe6\xc5\x98\x9d\x87\x30\x55\xdc\xde\xdc\x72\x73\x55\x66\x63\x5d\x15\xca\x56\xe8\x81\x3a\xa9\xb1\x89\x8c\xcb\xcd\x1e\x22\x68\x3f\x08\x5f\xe6\xb0\x44\x2f\x43\x2c\x8a\x25\x51\xc9\x53\x8b\x8d\x73\x14\x68\xdb\x5d\x8f\xad\x6a\xd1\x80\x32\x31\x3c\xcf\x28\xf2\x10\x95\xcb\xc9\xad\x8e\x51\x10\xc5\x27\xa3\x0f\x39\x78\xd7\x20\x4b\xe3\x8e\x1e\x2e\xd4\xba\xc3\x21\xae\x80\x1a\xdd\xc6\x3a\x89\x2c\x34\xb6\x70\xee\xe0\x4f\x19\x9e\x76\xd9\xa9\xed\xad\x70\x9d\xed\x91\xec\xfb\xcc\x4f\xca\xe9\xbd\x91\xba\x09\x17\x9d\x07\x91\x88\xc7\x3d\x08\xc4\x4e\xf7\x8d\xc6\xdc\xb7\xe6\x1f\x99\xf5\xa4\x69\x0e\x60\x00\x05\x4a\x2d\x1c\x0f\x20\x6b\xdb\x26\xb5\xfa\x95\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x49\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xf8\xf2\xf3\x2f\xaf\x3f\xdd\xbf\x7d\xff\x6e\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\x2f\xf9\x78\xd6\x17\xce\x7d\x1c\x8b\x93\x89\x9f\x74\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xa7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\xcf\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x3c\xd9\x68\xda\xfc\x42\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x59\x4c\xbe\x55\xc4\xa7\x35\xd0\xb7\x88\xaf\x54\x00\x77\xa8\x69\x67\xfa\x4a\x6f\x7a\xa2\x2e\x99\x2a\x36\xe3\x09\xdd\x14\x1f\x46\xa3\x59\x65\x3e\xf1\x21\xa6\x21\x2e\x1c\x58\x30\x66\x4a\x21\x4b\x2c\x38\xb2\x69\x6a\x87\x21\x88\x93\xc8\x61\x99\x27\x52\xac\xeb\xa6\x9c\x84\xa1\x5b\x98\x02\xe3\x3c\x28\xe1\x41\x9f\x9a\xba\xd6\x07\x0e\x04\xa5\xa1\x18\x67\x0d\xbf\xb7\x6c\x65\xc3\x29\x0d\x05\x17\xb6\xbb\x90\x07\x28\xed\x3e\x2c\x33\xd6\x18\x94\x3e\xcc\x21\x7e\x1a\xba\xc5\x62\x70\x20\x4c\xa9\xac\xfc\x6e\x38\xca\xba\x16\x9d\x51\x2b\x33\xa9\x1b\x9e\x7c\x33\xc6\x2f\x9d\x86\xe4\x0b\xc5\xab\x36\x86\xe2\x75\x24\x7d\xff\x30\x71\x8a\x6f\x1d\xa1\x0f\xcb\xd2\x34\xb1\xa3\x0d\x3d\x3d\xaf\xa4\xde\x31\x65\x58\x5f\x12\x04\x4e\x2d\xee\xa8\xef\xae\x26\x33\x81\x22\xa8\x1a\x0a\xeb\x5c\x88\x9e\xc2\x22\x56\xd3\x3a\xe0\x7a\xe8\xc6\x61\x8b\x7b\xde\xaf\x46\x2f\x52\x5b\xfa\xbb\x15\xab\x90\x87\x88\x64\x99\x9b\x18\xc2\x58\x18\xf1\x7d\x51\x28\x77\x77\x86\xfa\xa9\x59\x9f\x93\x59\x60\x4c\xde\x97\xcf\xbf\xc6\x6d\x53\x98\x6d\xfc\xf6\x4e\xf9\xb0\x01\x91\xf2\xd6\x1d\x06\xb4\x7a\xcb\x73\xcc\x44\x39\xf7\xa0\xc6\xe9\xbb\xe3\x11\xb2\x77\xca\xb3\xa4\xf0\x68\x31\xa5\x58\x3b\x61\x64\xd9\x13\xfd\x1c\xfe\x8a\xcf\x17\x6a\x13\x8e\xf8\x6e\xd0\x25\xce\x5a\xf8\xc0\xf7\x18\xd2\x40\x7f\xb7\xca\x24\x0c\xb3\xf9\xac\x7b\x05\xd1\x84\x29\x3b\x4f\x02\xe7\xad\x6a\x2f\x4c\x28\x3f\x87\x9c\x55\x19\x07\xd0\x4a\x18\xb5\xe1\xd1\x84\x0b\x94\x54\x81\x2e\xfa\x7a\x32\xe4\x85\xed\xcd\x12\x42\x63\x0a\x74\x27\x01\x74\xa8\x85\x57\x2d\x42\x1d\xcc\xea\xd2\xbb\x9d\x04\xf1\xa4\xe0\x07\xe7\xa8\x59\x17\xca\xad\xe6\xf1\xe7\xcb\xe1\x49\x67\x0c\x4e\x78\xb2\xb9\x14\x9c\xf0\x0e\xd2\x47\xb5\xa7\xba\x20\xe0\x0b\xa1\xbb\xc4\xdf\x10\xba\x21\x73\x4c\x03\x97\xf9\x7f\xa9\x84\xba\x68\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x5d\x04\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\x93\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x7d\x05\x46\x7b\x8e\x4e\x16\x73\xdd\xfd\x75\x87\x07\x50\xc5\x4f\x03\xd9\x57\x5a\x65\x62\x15\x8b\x10\xbe\x71\x38\x59\x88\x2e\xe8\x0a\x9f\x0f\x8b\x81\x9e\x9e\xf6\xdd\xe0\xef\xbe\x0f\x40\x02\x89\xc2\xc0\xac\xa9\xc9\x3b\x14\xd5\xac\x07\xac\x44\xc8\x73\xcc\xb6\xd9\x1c\xfe\xc5\xf3\x3e\xbc\xd6\xb6\x29\x5e\x64\x61\xdf\xf3\x76\xc7\xf3\x1b\x41\x2d\x9c\x57\xb2\xd1\xc2\x41\xf7\xd4\xd0\x49\x39\xc5\xda\x4e\xeb\xdd\x9e\x78\xa5\x90\x2c\x2b\x0b\x7b\x44\x16\x17\x09\x51\xab\xe5\x49\xf5\x33\x5b\x50\x74\x27\xd6\x72\xf5\xf2\xf6\xfc\xff\xd4\xe1\x47\x74\xed\x85\x57\x3c\x1e\x3b\xc6\x46\xc3\x59\xfb\x31\x45\x3c\xb1\x63\xa4\x74\x11\x75\xd1\x27\x4f\x83\xcf\x92\xd7\xc5\xe4\x99\x90\x5d\x0c\xfb\x6c\x68\xfd\x53\x5c\xd2\x8a\x3c\x9a\x45\x67\xc2\x5d\x7e\x7b\x73\xbb\xba\xea\x2a\xfa\x55\x51\xa8\xb8\x21\x30\x9e\xbd\xe2\x76\x3e\x81\x8e\xf1\xfb\xd8\xd2\x8e\x47\x70\x01\x1d\xbf\xc1\xbd\x08\x6f\xb4\x27\xd7\x68\x7a\x1d\xae\xe1\x53\xdd\x89\x7f\x73\xff\xd8\xf7\x22\x9a\x77\x23\x52\xe3\xba\xce\x04\xa6\xb0\x9e\xc0\x06\x62\xa8\xc4\x21\x6c\x56\xba\x1d\x77\x6c\x43\xda\xda\x5d\x53\x83\x22\x6a\x90\xc0\x1a\x20\x5b\x21\x7c\x68\xd6\xe8\x0c\x7a\x24\x08\x0f\x42\x34\xae\xd0\x85\xa1\x7e\x79\x9b\xdd\x5b\x83\xb3\xf4\xcb\xeb\x60\x40\xba\x44\x47\xe5\x34\xdd\xab\xfb\x51\x27\xd8\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xea\x7f\x01\x00\x00\xff\xff\xe5\xd1\xec\xd3\x0d\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 37, 39, 999312835, time.UTC),
+			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 537769968, time.UTC),
 			uncompressedSize: 137,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xca\x31\x0a\xc2\x40\x10\x85\xe1\x7e\x4f\xf1\x2e\xb0\x82\xed\x1c\x42\x0b\xc1\x7e\xc8\xbe\xc8\x62\xb2\x19\x93\x89\x18\x86\xdc\x5d\x14\x1b\xcb\x9f\xff\xcb\x39\x27\xb5\x7a\xe5\xbc\xd4\xa9\x09\x9e\xc7\x74\xaf\xad\x08\x2e\xec\x66\x7a\x1a\xe9\x5a\xd4\x55\x12\xd0\x74\xa4\xa0\x1f\xd6\x57\xbe\x55\xcf\x85\x36\x4c\x5b\x04\x6a\x8f\xc3\x49\x47\x2e\xa6\x1d\xb1\xef\x3f\xfa\x4d\x41\xc4\xff\x8d\x00\x5b\xf9\x30\xdf\x8c\x82\xb3\xe9\x63\x65\x7a\x07\x00\x00\xff\xff\x40\x21\xa1\xbb\x89\x00\x00\x00"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 14, 18, 1, 501573117, time.UTC),
+			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 538291388, time.UTC),
 			uncompressedSize: 874,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x93\xcd\x6e\x9c\x40\x10\x84\xef\x3c\x45\x49\x7b\x0d\x1b\x61\x69\x2f\xdc\xa2\x38\x89\x2c\x25\xd6\x5e\x9c\x7b\x7b\x68\xf0\x28\xf3\x97\xe9\x66\xb3\x04\xf9\xdd\xa3\xd9\x5f\x36\xf6\x9c\x80\xaa\xaf\xa7\xa6\x80\xba\xae\xab\x15\x3c\x7b\x43\xe6\x85\x3b\x74\x9c\x5c\x9c\x3c\x07\xc5\x28\xdc\xe1\x79\xc2\x57\x37\xee\xa1\x11\x07\x47\xb5\x82\x89\x41\xc9\x06\xce\xb0\x9e\x06\x86\x67\xa5\x8e\x94\xd6\x15\x25\xfb\x93\xb3\xd8\x18\x5a\x50\x4a\xf2\x71\xd7\x54\xbf\x6c\xe8\x5a\xdc\x5f\xc6\x56\x67\x7b\x5b\x01\x81\x3c\xb7\xd7\xdd\xe7\x19\xb6\xc7\xfa\x91\x3c\x4b\x22\xc3\x78\x7d\x3d\x99\x0e\xb7\x2d\xe6\xf9\x56\x9d\x67\x70\xe8\x8a\x4d\x12\x9b\x32\x31\x73\x72\xd6\x90\xb4\x68\x2a\x40\xd8\xb1\xd1\x98\x8b\x02\x78\x52\xf3\xf2\x9d\x9e\xd9\xc9\xf1\xc1\x9b\x00\x15\xa0\xec\x93\x23\xe5\x13\xb2\x08\x5b\x96\xbb\xa1\xdf\xe3\x81\x73\x94\xb2\x2e\x5d\x5d\x98\xfa\x5d\xa6\xac\x43\x9b\x0b\xa1\x6d\xd6\x9b\x75\xb3\xb9\xd5\xb7\xa3\x73\xdb\xe8\xac\x99\x5a\x3c\xf4\x8f\x51\xb7\x99\xa5\xd4\x7a\x76\x51\x1e\x16\xf9\x6a\xd4\x1e\x9b\xe6\x0e\xc0\x0a\x3f\x68\x6f\xfd\xe8\xcb\x0e\x31\x4f\xe5\x95\x8e\xc2\x1f\x60\x03\x3c\x0f\xf4\x3c\x29\xcb\x12\x7c\xc0\xc6\xe3\x06\x14\xfb\x97\xd1\xc7\x8c\x18\x18\x56\xd9\x2f\xed\x09\x4d\x73\xd7\x34\x58\xe1\x9e\x7b\x1a\x9d\x22\xc5\x7c\xcd\xb5\x2a\x9e\xdd\xee\x78\xf9\x14\x4c\xf4\x87\x8f\x4c\x23\x06\x56\xb8\x38\x08\x62\x0f\x26\xf3\x82\xcc\xbf\x47\x16\x05\x85\x0e\x99\x25\xc5\x20\xbc\xbe\x0c\x2a\x53\x6f\x4e\x78\xec\xd3\x38\xcb\x41\xaf\x07\x58\x74\xbf\x8d\x59\xdb\x63\xba\x8b\x2c\x6c\xc6\x6c\x75\xfa\x1c\x83\xf2\x5e\xdb\x05\x97\xc7\xf0\x49\x9e\x84\xf3\xff\xcc\x49\xfa\x96\xe3\x98\xde\x6a\xe4\x5c\xfc\xb3\xcd\x76\x67\x1d\x0f\xfc\x45\x0c\x39\xd2\xc3\xaf\xd0\x93\x13\xae\xfe\x05\x00\x00\xff\xff\x5d\x9a\x63\xab\x6a\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 25, 13, 37, 39, 995569443, time.UTC),
+			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 538759867, time.UTC),
 			uncompressedSize: 206,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8c\x3d\x0e\x02\x21\x10\x46\x7b\x4e\xf1\x5d\x00\x13\x2c\x39\x84\x8d\x89\xfd\x04\x3e\x23\x51\x58\x02\x64\x9b\xc9\xde\xdd\xb0\x6b\xe3\x76\xf3\xf3\xde\xb3\xd6\x1a\xa9\xe9\xc1\xd6\xd3\x52\x3c\x56\x67\xde\xa9\x44\x8f\x3b\xdb\x9a\x02\x4d\xe6\x90\x28\x43\xbc\x01\x8a\x64\x7a\x64\xe6\x20\xe1\xc5\xa8\x8a\xf4\xc4\xe5\x26\x99\xbd\x4a\x20\xb6\xed\x07\xed\xab\x87\xea\xff\x57\x15\x2c\x71\x62\xbd\x32\xcc\x62\x5d\xda\xe8\x73\x00\xec\x39\xbf\x5f\x0f\xc4\xc3\xb9\xab\x73\x06\xe8\xfc\x30\x8c\xa5\x1d\xce\xd9\xf8\x06\x00\x00\xff\xff\x20\x2f\xef\xba\xce\x00\x00\x00"),

From b4f34c8e1e80ddc92378cd835bc4caf5673c18c9 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Fri, 26 Jul 2019 12:03:51 +0200
Subject: [PATCH 078/158] Fix tests

---
 install/install_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/install_test.go b/install/install_test.go
index 4d0304ee5..f12dfbc17 100644
--- a/install/install_test.go
+++ b/install/install_test.go
@@ -14,7 +14,6 @@ func testFillInTemplates(t *testing.T, params TemplateParameters) {
 	for fileName, contents := range manifests {
 		validationResults, err := kubeval.Validate(contents, fileName)
 		assert.NoError(t, err)
-		assert.Len(t, validationResults, 1)
 		for _, result := range validationResults {
 			if len(result.Errors) > 0 {
 				t.Errorf("found problems with manifest %s (Kind %s):\ncontent:\n%s\nerrors: %s",

From 878307d481c8810930459027c2f151fd18024525 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Sat, 27 Jul 2019 12:07:58 +0200
Subject: [PATCH 079/158] Update templates

---
 deploy/flux-deployment.yaml                 |  5 ++---
 install/generated_templates.gogen.go        | 14 +++++++-------
 install/templates/flux-deployment.yaml.tmpl |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 5224f5a54..fba7272e5 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io.port: "3031" # tell prometheus to scrape /metrics endpoint's port.
+        prometheus.io/port: "3031" # tell prometheus to scrape /metrics endpoint's port.
       labels:
         name: flux
     spec:
@@ -63,7 +63,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/flux/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/flux:1.13.2
+        image: docker.io/fluxcd/flux:1.13.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:
@@ -140,7 +140,6 @@ spec:
         # make sure to set prometheus' annotation to scrape the port value.
         - --listen-metrics=:3031
 
-
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
       # dnsPolicy: "None"
diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index c346e22e3..9ea292880 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,39 +19,39 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 26, 8, 52, 31, 538418553, time.UTC),
+			modTime: time.Date(2019, 7, 27, 10, 13, 8, 679282456, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 536639495, time.UTC),
+			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 305203208, time.UTC),
 			uncompressedSize: 836,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x92\x4b\xaf\xd3\x30\x10\x85\xf7\xfe\x15\x47\xba\x8b\x0b\xe8\x26\xa8\x3b\x94\x5d\xdb\x05\x0b\x10\x8b\xf0\xd8\x20\x16\x63\x7b\x42\x4d\x5d\x3b\xf2\x23\x3c\xa2\xfc\x77\x94\xa4\x95\x9a\xb6\x20\x55\xba\x3b\x7b\x7c\xc6\x73\xe6\xe8\x2b\x8a\x42\x3c\xe0\xd3\x8e\x11\x39\x74\x46\x31\x48\x29\x9f\x5d\x7a\x82\xb2\x39\x26\x0e\x08\xde\x72\x7c\x02\x39\xbd\x28\x41\x1a\xa7\x8d\xfb\x0e\x0a\x2c\x1e\xe0\x9d\xfd\x0d\xc7\xac\x59\xa3\xf1\x01\xef\xb2\xe4\xe0\x38\x71\xc4\x4f\x93\x76\x53\x4b\x21\x29\xb2\x1e\x27\x70\x8c\x50\xde\xa5\xe0\x2d\x5e\xd4\x9b\xf5\xf6\x65\x29\xa8\x35\x5f\x38\x44\xe3\x5d\x85\x6e\x25\xf6\xc6\xe9\x0a\x1f\x67\x57\xeb\xd9\x94\x38\x70\x22\x4d\x89\x2a\x01\x58\x92\x6c\xe3\x78\x02\x1c\x1d\xb8\x42\x63\xf3\x2f\x71\x7e\xe9\x7b\x98\x06\xe5\x07\x3a\x70\x6c\x49\x31\x86\xe1\xf8\x3e\x5d\x2b\xf4\xfd\xf2\xb5\xef\xc1\x4e\x0f\x83\x18\x73\x39\x37\x14\x24\xa9\x92\x72\xda\xf9\x60\xfe\x50\x32\xde\x95\xfb\x37\xb1\x34\xfe\x75\xb7\x92\x9c\xe8\xe4\x77\x3b\x27\x54\x7b\xcb\xf7\x9a\x15\x21\x5b\x9e\x24\x05\xa8\x35\x6f\x83\xcf\x6d\xac\xf0\xf5\xf1\xd5\xe3\xb7\xa9\x2f\x70\xf4\x39\x28\x5e\x14\x3b\x0e\xf2\xac\x50\xc0\x79\x57\x1f\x85\x9f\xeb\xf7\xff\xd6\x3e\xc3\x86\x9b\x99\x80\xfb\x17\xf5\x96\x6b\x6e\x46\xd1\x69\xd1\xff\xcc\x17\xc0\x75\xb6\x8b\xff\x62\x96\x3f\x58\xa5\x63\x76\x37\xc1\xb9\xb2\x73\x89\xc1\x25\x27\xb7\xc8\xb0\x71\x3c\x69\x6e\x28\xdb\x34\xa3\x32\x12\xf5\x37\x00\x00\xff\xff\xfd\x7f\x67\x6a\x44\x03\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 537189261, time.UTC),
+			modTime:          time.Date(2019, 7, 27, 10, 13, 8, 678261702, time.UTC),
 			uncompressedSize: 5901,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\xdf\x6f\x1b\xb9\xf1\x7f\xf7\x5f\x31\x90\x1f\x92\x00\xd2\xca\x8a\xef\xfb\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\x8b\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xdc\xd5\x09\xc2\xfd\xef\xc5\x90\xfb\x83\x2b\xc9\xc9\x21\x79\x88\x6d\xee\xfc\x9e\xe1\x67\x66\xb8\x58\x2c\xae\x44\xad\xfe\x89\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xfd\x78\x04\xb5\x81\xec\x5e\x54\x48\xb5\x90\x08\x7f\xfc\xd1\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\xab\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\x9b\xd5\xd6\xf9\x1c\x66\xb7\x37\xb7\xab\x19\x5c\x83\x47\xad\x13\x0a\xf0\x16\x48\x3a\x51\x23\x2c\x2b\xf4\x4e\x49\x62\xe7\x6a\xab\x8c\x7f\x46\xc0\xcc\x59\x27\x58\x4f\x7c\x38\xf1\x02\xa0\x8f\x45\xf8\x1d\x5d\xab\x24\xbe\x92\xd2\x36\xc6\xdf\x4f\x09\x01\x5a\xab\x9b\x0a\x07\x51\x8b\x4e\xd4\x56\xf9\xc5\x0e\x0f\x83\x02\xe2\x28\xf8\x51\x61\x7f\x32\xca\x5b\x30\x4b\x11\x12\x9c\x50\x15\xb8\x11\x8d\xf6\x1f\x6d\x81\x39\xdc\xfc\x70\x73\x03\xd7\xb0\x2f\xd1\x40\xc5\xd6\x60\x01\x0e\x45\xb1\xb0\x46\x1f\xe6\xb0\x47\xd8\x5b\xf3\xcc\xc3\x1a\x41\xac\x35\x72\x3c\x64\x59\xd9\xe2\xaa\x13\x78\x0d\xff\x28\x15\x81\x22\x10\xe0\xab\x7a\x43\xd0\x10\x16\xb0\xb1\x0e\xb6\x68\xd0\x09\xaf\xcc\x16\x1e\x1f\xff\x06\x3b\x3c\x50\x06\xef\x0d\x7c\xf8\x0b\xc1\x4f\x77\xb0\xca\x56\x37\xf3\x41\x4a\xaf\x3b\xba\x40\x20\x1c\xa6\x76\x90\x65\x53\x0c\x62\x01\x02\x08\x6b\xc1\x45\xd1\x05\x0a\xf6\x38\x88\x91\xc2\xc0\xde\x29\xcf\x86\x66\x97\xe3\xb7\x45\x33\x04\x03\xab\xda\x1f\xde\x28\x97\x06\xb1\xc2\x42\x35\x55\x0e\x1f\xb1\xb2\xee\x90\xfa\x89\xb0\xb1\x5a\xdb\x3d\x7b\xd4\xa9\x56\x14\x5c\x6d\x88\xcf\x04\xc8\x86\xbc\xad\x14\x47\x60\x67\xec\xde\xfc\xa7\xb4\xe4\x69\x10\xb1\x51\x1a\xe7\xb0\x2f\x95\x2c\xe1\x60\x1b\xd8\x2b\xad\xa3\x53\xde\x42\x61\xf9\x9e\xf1\x31\x33\xf1\x2f\x0e\xec\xde\xb0\xd9\x83\x00\x87\xb5\x05\x27\x7c\x89\x0e\x7c\x29\x4c\xa7\x78\xab\x7c\xd9\xac\xc1\xf2\x21\x82\x56\x3b\xcc\xe0\xdf\xb6\x79\xa6\x35\x08\x4d\xb6\x57\x31\x0d\x36\x28\x0f\xca\x78\x1b\x78\xa4\x35\x5e\x28\x83\x6e\x0e\x6b\xd4\x76\x9f\xc1\x23\x8e\x51\x2d\xbd\xaf\x29\x5f\x2e\xa3\x9e\x4c\xda\x6a\xb9\x47\xd1\xe2\xde\xba\x1d\x2d\xb9\xd2\x96\x6b\x6d\xd7\xcb\x4a\x90\x47\xb7\x24\xe5\x71\x49\x5e\x98\x42\x68\x6b\x70\x41\xe8\x9b\x3a\xab\x8a\xeb\x60\xed\x42\x2c\x6a\xa7\x5a\xe1\x31\x94\x27\x3b\x3b\x28\xea\x53\x45\x54\x2e\xa4\x35\x1b\xb5\x1d\x3e\x01\xc4\x83\x8f\xa2\xce\x93\xc3\xf4\x9e\x2d\x12\xb6\xef\x4d\x5b\xb6\x6b\xd6\xb8\x8c\x42\xc6\xea\xfc\x66\xca\xf6\x8a\x4a\x3e\x29\x45\x8b\x20\xa0\x50\x9b\x0d\x3a\xc6\xd4\x5e\x42\x77\xe9\x46\xdc\x0c\x19\x8a\xe2\xd2\x1c\x31\xf6\xb4\xaa\xc0\x3e\x2b\x1b\xb5\xad\x44\x3d\x1a\xa2\x7c\x09\xc2\x00\x1a\xef\x0e\xc1\x87\xdf\x22\xd1\x6f\x73\x10\xa6\x80\xc6\x48\x5b\x31\x98\x07\xfe\xe8\xed\xc7\x90\x6d\x61\x8a\x41\x0a\x9a\x36\x48\x50\x48\x5d\xba\xcf\x32\xc0\x61\xf8\x8e\x0c\x24\x6c\xdf\xcc\x40\x00\x0a\x6f\x41\x55\x0c\xa3\xf0\xee\xe1\x5d\xc0\x08\x78\xce\x6e\x91\xda\x1a\x65\x46\xe5\xec\x5c\x8b\x4e\x6d\x94\x0c\x78\x0e\x75\xe3\x6a\x4b\x48\x2f\xfe\x44\x20\x07\x29\x11\x5d\x62\x14\x39\x40\xac\xef\x4f\x04\x0e\x84\xdb\x8e\xb7\xf8\x89\x88\x6d\xeb\x2d\xc3\x0b\x25\xa1\x99\x22\xf4\xf5\x13\x18\x7d\xce\x77\x01\xa3\xfb\x70\x0e\x17\xf5\xac\x3d\x24\x0d\xa4\x8b\xba\xc3\x00\xa3\xc6\xc2\x2c\xe7\x1e\x49\x7e\x06\xaa\x12\x5b\x8c\xd5\xcf\x0c\x19\xbc\x55\xa6\x08\x3e\x57\x8c\x3a\x0e\xe5\x58\xb5\x11\x71\x34\x0a\x42\xc6\x96\xc0\xca\x49\xe0\x31\x02\x84\x1f\x60\x81\x31\xa1\xb0\x72\x87\x2e\x40\x83\x3b\x03\x07\x2f\x86\xf0\xf5\xb9\xe4\x91\x80\xc7\x05\xd6\xec\xc5\x16\xd8\xda\x6c\xa0\x09\xaa\x72\xe8\x84\x2a\x1b\xc4\xc8\x22\xfc\xc8\x57\xd9\xea\x36\x7b\x39\xa5\x7d\x68\xb4\x7e\xb0\x5a\xc9\x43\x0e\xef\x37\xf7\xd6\x3f\x38\xa4\xd4\x13\x87\x64\x1b\x27\x91\x52\xa8\x77\xf8\xdf\x06\xc9\x4f\xce\x00\x64\xdd\xe4\xf0\x7f\x37\xd5\xe4\xb0\x0a\xdd\x20\x87\xff\xff\xe1\xa3\x1a\x27\x09\xeb\x52\xe6\xc5\x98\x9d\x87\x30\x55\xdc\xde\xdc\x72\x73\x55\x66\x63\x5d\x15\xca\x56\xe8\x81\x3a\xa9\xb1\x89\x8c\xcb\xcd\x1e\x22\x68\x3f\x08\x5f\xe6\xb0\x44\x2f\x43\x2c\x8a\x25\x51\xc9\x53\x8b\x8d\x73\x14\x68\xdb\x5d\x8f\xad\x6a\xd1\x80\x32\x31\x3c\xcf\x28\xf2\x10\x95\xcb\xc9\xad\x8e\x51\x10\xc5\x27\xa3\x0f\x39\x78\xd7\x20\x4b\xe3\x8e\x1e\x2e\xd4\xba\xc3\x21\xae\x80\x1a\xdd\xc6\x3a\x89\x2c\x34\xb6\x70\xee\xe0\x4f\x19\x9e\x76\xd9\xa9\xed\xad\x70\x9d\xed\x91\xec\xfb\xcc\x4f\xca\xe9\xbd\x91\xba\x09\x17\x9d\x07\x91\x88\xc7\x3d\x08\xc4\x4e\xf7\x8d\xc6\xdc\xb7\xe6\x1f\x99\xf5\xa4\x69\x0e\x60\x00\x05\x4a\x2d\x1c\x0f\x20\x6b\xdb\x26\xb5\xfa\x95\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x49\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xf8\xf2\xf3\x2f\xaf\x3f\xdd\xbf\x7d\xff\x6e\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\x2f\xf9\x78\xd6\x17\xce\x7d\x1c\x8b\x93\x89\x9f\x74\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xa7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\xcf\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x3c\xd9\x68\xda\xfc\x42\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x59\x4c\xbe\x55\xc4\xa7\x35\xd0\xb7\x88\xaf\x54\x00\x77\xa8\x69\x67\xfa\x4a\x6f\x7a\xa2\x2e\x99\x2a\x36\xe3\x09\xdd\x14\x1f\x46\xa3\x59\x65\x3e\xf1\x21\xa6\x21\x2e\x1c\x58\x30\x66\x4a\x21\x4b\x2c\x38\xb2\x69\x6a\x87\x21\x88\x93\xc8\x61\x99\x27\x52\xac\xeb\xa6\x9c\x84\xa1\x5b\x98\x02\xe3\x3c\x28\xe1\x41\x9f\x9a\xba\xd6\x07\x0e\x04\xa5\xa1\x18\x67\x0d\xbf\xb7\x6c\x65\xc3\x29\x0d\x05\x17\xb6\xbb\x90\x07\x28\xed\x3e\x2c\x33\xd6\x18\x94\x3e\xcc\x21\x7e\x1a\xba\xc5\x62\x70\x20\x4c\xa9\xac\xfc\x6e\x38\xca\xba\x16\x9d\x51\x2b\x33\xa9\x1b\x9e\x7c\x33\xc6\x2f\x9d\x86\xe4\x0b\xc5\xab\x36\x86\xe2\x75\x24\x7d\xff\x30\x71\x8a\x6f\x1d\xa1\x0f\xcb\xd2\x34\xb1\xa3\x0d\x3d\x3d\xaf\xa4\xde\x31\x65\x58\x5f\x12\x04\x4e\x2d\xee\xa8\xef\xae\x26\x33\x81\x22\xa8\x1a\x0a\xeb\x5c\x88\x9e\xc2\x22\x56\xd3\x3a\xe0\x7a\xe8\xc6\x61\x8b\x7b\xde\xaf\x46\x2f\x52\x5b\xfa\xbb\x15\xab\x90\x87\x88\x64\x99\x9b\x18\xc2\x58\x18\xf1\x7d\x51\x28\x77\x77\x86\xfa\xa9\x59\x9f\x93\x59\x60\x4c\xde\x97\xcf\xbf\xc6\x6d\x53\x98\x6d\xfc\xf6\x4e\xf9\xb0\x01\x91\xf2\xd6\x1d\x06\xb4\x7a\xcb\x73\xcc\x44\x39\xf7\xa0\xc6\xe9\xbb\xe3\x11\xb2\x77\xca\xb3\xa4\xf0\x68\x31\xa5\x58\x3b\x61\x64\xd9\x13\xfd\x1c\xfe\x8a\xcf\x17\x6a\x13\x8e\xf8\x6e\xd0\x25\xce\x5a\xf8\xc0\xf7\x18\xd2\x40\x7f\xb7\xca\x24\x0c\xb3\xf9\xac\x7b\x05\xd1\x84\x29\x3b\x4f\x02\xe7\xad\x6a\x2f\x4c\x28\x3f\x87\x9c\x55\x19\x07\xd0\x4a\x18\xb5\xe1\xd1\x84\x0b\x94\x54\x81\x2e\xfa\x7a\x32\xe4\x85\xed\xcd\x12\x42\x63\x0a\x74\x27\x01\x74\xa8\x85\x57\x2d\x42\x1d\xcc\xea\xd2\xbb\x9d\x04\xf1\xa4\xe0\x07\xe7\xa8\x59\x17\xca\xad\xe6\xf1\xe7\xcb\xe1\x49\x67\x0c\x4e\x78\xb2\xb9\x14\x9c\xf0\x0e\xd2\x47\xb5\xa7\xba\x20\xe0\x0b\xa1\xbb\xc4\xdf\x10\xba\x21\x73\x4c\x03\x97\xf9\x7f\xa9\x84\xba\x68\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x5d\x04\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\x93\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x7d\x05\x46\x7b\x8e\x4e\x16\x73\xdd\xfd\x75\x87\x07\x50\xc5\x4f\x03\xd9\x57\x5a\x65\x62\x15\x8b\x10\xbe\x71\x38\x59\x88\x2e\xe8\x0a\x9f\x0f\x8b\x81\x9e\x9e\xf6\xdd\xe0\xef\xbe\x0f\x40\x02\x89\xc2\xc0\xac\xa9\xc9\x3b\x14\xd5\xac\x07\xac\x44\xc8\x73\xcc\xb6\xd9\x1c\xfe\xc5\xf3\x3e\xbc\xd6\xb6\x29\x5e\x64\x61\xdf\xf3\x76\xc7\xf3\x1b\x41\x2d\x9c\x57\xb2\xd1\xc2\x41\xf7\xd4\xd0\x49\x39\xc5\xda\x4e\xeb\xdd\x9e\x78\xa5\x90\x2c\x2b\x0b\x7b\x44\x16\x17\x09\x51\xab\xe5\x49\xf5\x33\x5b\x50\x74\x27\xd6\x72\xf5\xf2\xf6\xfc\xff\xd4\xe1\x47\x74\xed\x85\x57\x3c\x1e\x3b\xc6\x46\xc3\x59\xfb\x31\x45\x3c\xb1\x63\xa4\x74\x11\x75\xd1\x27\x4f\x83\xcf\x92\xd7\xc5\xe4\x99\x90\x5d\x0c\xfb\x6c\x68\xfd\x53\x5c\xd2\x8a\x3c\x9a\x45\x67\xc2\x5d\x7e\x7b\x73\xbb\xba\xea\x2a\xfa\x55\x51\xa8\xb8\x21\x30\x9e\xbd\xe2\x76\x3e\x81\x8e\xf1\xfb\xd8\xd2\x8e\x47\x70\x01\x1d\xbf\xc1\xbd\x08\x6f\xb4\x27\xd7\x68\x7a\x1d\xae\xe1\x53\xdd\x89\x7f\x73\xff\xd8\xf7\x22\x9a\x77\x23\x52\xe3\xba\xce\x04\xa6\xb0\x9e\xc0\x06\x62\xa8\xc4\x21\x6c\x56\xba\x1d\x77\x6c\x43\xda\xda\x5d\x53\x83\x22\x6a\x90\xc0\x1a\x20\x5b\x21\x7c\x68\xd6\xe8\x0c\x7a\x24\x08\x0f\x42\x34\xae\xd0\x85\xa1\x7e\x79\x9b\xdd\x5b\x83\xb3\xf4\xcb\xeb\x60\x40\xba\x44\x47\xe5\x34\xdd\xab\xfb\x51\x27\xd8\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xea\x7f\x01\x00\x00\xff\xff\xe5\xd1\xec\xd3\x0d\x17\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\x4b\x52\x1e\x97\xe4\x85\x29\x84\xb6\x06\x17\x84\xbe\xa9\xb3\xaa\x78\x16\xac\x5d\x88\x45\xed\x54\x2b\x3c\x86\xf2\x64\x67\x07\x45\x7d\xaa\x88\xca\x85\xb4\x66\xa3\xb6\xc3\x27\x80\x78\xf0\x51\xd4\x79\x72\x98\xde\xb3\x45\xc2\xf6\xad\x69\xcb\x76\xcd\x1a\x97\x51\xc8\x58\x9d\x4f\xa6\x6c\xaf\xa8\xe4\x93\x52\xb4\x08\x02\x0a\xb5\xd9\xa0\x63\x4c\xed\x25\x74\x97\x6e\xc4\xcd\x90\xa1\x28\x2e\xcd\x11\x63\x4f\xab\x0a\xec\xb3\xb2\x51\xdb\x4a\xd4\xa3\x21\xca\x97\x20\x0c\xa0\xf1\xee\x10\x7c\xf8\x35\x12\xfd\x3a\x07\x61\x0a\x68\x8c\xb4\x15\x83\x79\xe0\x8f\xde\x7e\x0c\xd9\x16\xa6\x18\xa4\xa0\x69\x83\x04\x85\xd4\xa5\xfb\x2c\x03\x1c\x86\x6f\xc8\x40\xc2\xf6\x64\x06\x02\x50\x78\x0b\xaa\x62\x18\x85\x77\xf7\xef\x02\x46\xc0\x0b\x76\x8b\xd4\xd6\x28\x33\x2a\x67\xe7\x5a\x74\x6a\xa3\x64\xc0\x73\xa8\x1b\x57\x5b\x42\x7a\xf9\x27\x02\x39\x48\x89\xe8\x12\xa3\xc8\x01\x62\x7d\x7f\x22\x70\x20\xdc\x76\xbc\xc5\x8f\x44\x6c\x5b\x6f\x19\x5e\x28\x09\xcd\x14\xa1\x9f\x3d\x82\xd1\xe7\x7c\x17\x30\xba\x0f\xe7\x70\x51\xcf\xda\x43\xd2\x40\xba\xa8\x3b\x0c\x30\x6a\x2c\xcc\x72\xee\x91\xe4\x67\xa0\x2a\xb1\xc5\x58\xfd\xcc\x90\xc1\x5b\x65\x8a\xe0\x73\xc5\xa8\xe3\x50\x8e\x55\x1b\x11\x47\xa3\x20\x64\x6c\x09\xac\x9c\x04\x1e\x23\x40\xf8\x01\x16\x18\x13\x0a\x2b\x77\xe8\x02\x34\xb8\x33\x70\xf0\x62\x08\x5f\x9f\x4b\x1e\x09\x78\x5c\x60\xcd\x5e\x6c\x81\xad\xcd\x06\x9a\xa0\x2a\x87\x4e\xa8\xb2\x41\x8c\x2c\xc2\x8f\x7c\x95\xad\x6e\xb2\x9b\x29\xed\x7d\xa3\xf5\xbd\xd5\x4a\x1e\x72\x78\xbf\xb9\xb3\xfe\xde\x21\xa5\x9e\x38\x24\xdb\x38\x89\x94\x42\xbd\xc3\xff\x37\x48\x7e\x72\x06\x20\xeb\x26\x87\xbf\x5c\x57\x93\xc3\x2a\x74\x83\x1c\xfe\xfa\xfd\x47\x35\x4e\x12\xd6\xa5\xcc\x8b\x31\x3b\xf7\x61\xaa\xb8\xb9\xbe\xe1\xe6\xaa\xcc\xc6\xba\x2a\x94\xad\xd0\x03\x75\x52\x63\x13\x19\x97\x9b\x3d\x44\xd0\xbe\x17\xbe\xcc\x61\x89\x5e\x86\x58\x14\x4b\xa2\x92\xa7\x16\x1b\xe7\x28\xd0\xb6\xbb\x1e\x5b\xd5\xa2\x01\x65\x62\x78\x9e\x53\xe4\x21\x2a\x97\x93\x5b\x1d\xa3\x20\x8a\x4f\x46\x1f\x72\xf0\xae\x41\x96\xc6\x1d\x3d\x5c\xa8\x75\x87\x43\x5c\x01\x35\xba\x8d\x75\x12\x59\x68\x6c\xe1\xdc\xc1\x1f\x33\x3c\xed\xb2\x53\xdb\x5b\xe1\x3a\xdb\x23\xd9\xb7\x99\x9f\x94\xd3\x7b\x23\x75\x13\x2e\x3a\x0f\x22\x11\x8f\x7b\x10\x88\x9d\xee\x89\xc6\xdc\xb7\xe6\x1f\x98\xf5\xa4\x69\x0e\x60\x00\x05\x4a\x2d\x1c\x0f\x20\x6b\xdb\x26\xb5\xfa\x95\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x51\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xf8\xf2\xd3\xcf\xaf\x3f\xdd\xbd\x7d\xff\x6e\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\x2f\xf9\x78\xd6\x17\xce\x7d\x1c\x8b\x93\x89\x1f\x75\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xa7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\xcf\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x3c\xd9\x68\xda\xfc\x42\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x59\x4c\x9e\x2a\xe2\xd3\x1a\xe8\x5b\xc4\x57\x2a\x80\x3b\xd4\xb4\x33\x7d\xa5\x37\x3d\x52\x97\x4c\x15\x9b\xf1\x84\x6e\x8a\x0f\xa3\xd1\xac\x32\x9f\xf8\x10\xd3\x10\x17\x0e\x2c\x18\x33\xa5\x90\x25\x16\x1c\xd9\x34\xb5\xc3\x10\xc4\x49\xe4\xb0\xcc\x13\x29\xd6\x75\x53\x4e\xc2\xd0\x2d\x4c\x81\x71\x1e\x94\xf0\xa0\x4f\x4d\x5d\xeb\x03\x07\x82\xd2\x50\x8c\xb3\x86\xdf\x5b\xb6\xb2\xe1\x94\x86\x82\x0b\xdb\x5d\xc8\x03\x94\x76\x1f\x96\x19\x6b\x0c\x4a\x1f\xe6\x10\x3f\x0d\xdd\x62\x31\x38\x10\xa6\x54\x56\x7e\x3b\x1c\x65\x5d\x8b\xce\xa8\x95\x99\xd4\x0d\x4f\xbe\x19\xe3\x97\x4e\x43\xf2\x85\xe2\x55\x1b\x43\xf1\x3a\x92\xbe\xbf\x9f\x38\xc5\xb7\x8e\xd0\x87\x65\x69\x9a\xd8\xd1\x86\x9e\x9e\x57\x52\xef\x98\x32\xac\x2f\x09\x02\xa7\x16\x77\xd4\xb7\x57\x93\x99\x40\x11\x54\x0d\x85\x75\x2e\x44\x4f\x61\x11\xab\x69\x1d\x70\x3d\x74\xe3\xb0\xc5\xbd\xe8\x57\xa3\x97\xa9\x2d\xfd\xdd\x8a\x55\xc8\x43\x44\xb2\xcc\x4d\x0c\x61\x2c\x8c\xf8\xbe\x28\x94\xbb\x3d\x43\xfd\xd4\xac\xcf\xc9\x2c\x30\x26\xef\xcb\xe7\x5f\xe2\xb6\x29\xcc\x36\x7e\x7b\xa7\x7c\xd8\x80\x48\x79\xeb\x0e\x03\x5a\xbd\xe5\x39\x66\xa2\x9c\x7b\x50\xe3\xf4\xed\xf1\x08\xd9\x3b\xe5\x59\x52\x78\xb4\x98\x52\xac\x9d\x30\xb2\xec\x89\x7e\x0a\x7f\xc5\xe7\x0b\xb5\x09\x47\x7c\x37\xe8\x12\x67\x2d\x7c\xe0\x7b\x08\x69\xa0\x7f\x5a\x65\x12\x86\xd9\x7c\xd6\xbd\x82\x68\xc2\x94\x9d\x27\x81\xf3\x56\xb5\x17\x26\x94\x9f\x43\xce\xaa\x8c\x03\x68\x25\x8c\xda\xf0\x68\xc2\x05\x4a\xaa\x40\x17\x7d\x3d\x19\xf2\xc2\xf6\x66\x09\xa1\x31\x05\xba\x93\x00\x3a\xd4\xc2\xab\x16\xa1\x0e\x66\x75\xe9\xdd\x4e\x82\x78\x52\xf0\x83\x73\xd4\xac\x0b\xe5\x56\xf3\xf8\xf3\xbb\xe1\x49\x67\x0c\x4e\x78\xb2\xb9\x14\x9c\xf0\x0e\xd2\x47\xb5\xa7\xba\x20\xe0\x0b\xa1\xbb\xc4\xdf\x10\xba\x21\x73\x4c\x03\x97\xf9\x7f\xae\x84\xba\x68\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x5d\x04\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\x93\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x7e\x05\x46\x7b\x8e\x4e\x16\x73\xdd\xfe\x7d\x87\x07\x50\xc5\x8f\x03\xd9\x57\x5a\x65\x62\x15\x8b\x10\xbe\x71\x38\x59\x88\x2e\xe8\x0a\x9f\x0f\x8b\x81\x9e\x1e\xf7\xdd\xe0\x6f\xbe\x0f\x40\x02\x89\xc2\xc0\xac\xa9\xc9\x3b\x14\xd5\xac\x07\xac\x44\xc8\x0b\xcc\xb6\xd9\x1c\xfe\xc3\xf3\x3e\xbc\xd6\xb6\x29\x5e\x66\x61\xdf\xf3\x76\xc7\xf3\x1b\x41\x2d\x9c\x57\xb2\xd1\xc2\x41\xf7\xd4\xd0\x49\x39\xc5\xda\x4e\xeb\xed\x9e\x78\xa5\x90\x2c\x2b\x0b\x7b\x44\x16\x17\x09\x51\xab\xe5\x49\xf5\x33\x5b\x50\x74\x2b\xd6\x72\xf5\xdd\xcd\xf9\xff\xa9\xc3\x0f\xe8\xda\x0b\xaf\x78\x3c\x76\x8c\x8d\x86\xb3\xf6\x43\x8a\x78\x62\xc7\x48\xe9\x22\xea\xa2\x4f\x9e\x06\x9f\x27\xaf\x8b\xc9\x33\x21\xbb\x18\xf6\xd9\xd0\xfa\xa7\xb8\xa4\x15\x79\x34\x8b\xce\x84\xdb\xfc\xe6\xfa\x66\x75\xd5\x55\xf4\xab\xa2\x50\x71\x43\x60\x3c\x7b\xc5\xed\x7c\x02\x1d\xe3\xf7\xb1\xa5\x1d\x8f\xe0\x02\x3a\x3e\xc1\xbd\x08\x6f\xb4\x93\x5b\x30\xfe\xd6\x2b\xf8\x54\x77\xe2\xdf\xdc\x3d\xf4\xbd\x88\xe6\xdd\x88\xd4\xb8\xae\x33\x81\x29\xac\x27\xb0\x81\x18\x2a\x71\x08\x9b\x95\x6e\xc7\x1d\xdb\x90\xb6\x76\xd7\xd4\xa0\x88\x1a\x24\xb0\x06\xc8\x56\x08\x1f\x9a\x35\x3a\x83\x1e\x09\xc2\x83\x10\x8d\x2b\x74\x61\xa8\x5f\xde\x66\x77\xd6\xe0\x2c\xfd\xf2\x3a\x18\x90\x2e\xd1\x51\x39\x4d\xf7\xea\x7e\xd4\x09\xf6\x4d\xbe\x0c\x53\xd8\x6c\x35\xbb\xfa\x23\x00\x00\xff\xff\x3d\xd9\xc4\x43\x0d\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 537769968, time.UTC),
+			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 306300582, time.UTC),
 			uncompressedSize: 137,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xca\x31\x0a\xc2\x40\x10\x85\xe1\x7e\x4f\xf1\x2e\xb0\x82\xed\x1c\x42\x0b\xc1\x7e\xc8\xbe\xc8\x62\xb2\x19\x93\x89\x18\x86\xdc\x5d\x14\x1b\xcb\x9f\xff\xcb\x39\x27\xb5\x7a\xe5\xbc\xd4\xa9\x09\x9e\xc7\x74\xaf\xad\x08\x2e\xec\x66\x7a\x1a\xe9\x5a\xd4\x55\x12\xd0\x74\xa4\xa0\x1f\xd6\x57\xbe\x55\xcf\x85\x36\x4c\x5b\x04\x6a\x8f\xc3\x49\x47\x2e\xa6\x1d\xb1\xef\x3f\xfa\x4d\x41\xc4\xff\x8d\x00\x5b\xf9\x30\xdf\x8c\x82\xb3\xe9\x63\x65\x7a\x07\x00\x00\xff\xff\x40\x21\xa1\xbb\x89\x00\x00\x00"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 538291388, time.UTC),
+			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 306879513, time.UTC),
 			uncompressedSize: 874,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x93\xcd\x6e\x9c\x40\x10\x84\xef\x3c\x45\x49\x7b\x0d\x1b\x61\x69\x2f\xdc\xa2\x38\x89\x2c\x25\xd6\x5e\x9c\x7b\x7b\x68\xf0\x28\xf3\x97\xe9\x66\xb3\x04\xf9\xdd\xa3\xd9\x5f\x36\xf6\x9c\x80\xaa\xaf\xa7\xa6\x80\xba\xae\xab\x15\x3c\x7b\x43\xe6\x85\x3b\x74\x9c\x5c\x9c\x3c\x07\xc5\x28\xdc\xe1\x79\xc2\x57\x37\xee\xa1\x11\x07\x47\xb5\x82\x89\x41\xc9\x06\xce\xb0\x9e\x06\x86\x67\xa5\x8e\x94\xd6\x15\x25\xfb\x93\xb3\xd8\x18\x5a\x50\x4a\xf2\x71\xd7\x54\xbf\x6c\xe8\x5a\xdc\x5f\xc6\x56\x67\x7b\x5b\x01\x81\x3c\xb7\xd7\xdd\xe7\x19\xb6\xc7\xfa\x91\x3c\x4b\x22\xc3\x78\x7d\x3d\x99\x0e\xb7\x2d\xe6\xf9\x56\x9d\x67\x70\xe8\x8a\x4d\x12\x9b\x32\x31\x73\x72\xd6\x90\xb4\x68\x2a\x40\xd8\xb1\xd1\x98\x8b\x02\x78\x52\xf3\xf2\x9d\x9e\xd9\xc9\xf1\xc1\x9b\x00\x15\xa0\xec\x93\x23\xe5\x13\xb2\x08\x5b\x96\xbb\xa1\xdf\xe3\x81\x73\x94\xb2\x2e\x5d\x5d\x98\xfa\x5d\xa6\xac\x43\x9b\x0b\xa1\x6d\xd6\x9b\x75\xb3\xb9\xd5\xb7\xa3\x73\xdb\xe8\xac\x99\x5a\x3c\xf4\x8f\x51\xb7\x99\xa5\xd4\x7a\x76\x51\x1e\x16\xf9\x6a\xd4\x1e\x9b\xe6\x0e\xc0\x0a\x3f\x68\x6f\xfd\xe8\xcb\x0e\x31\x4f\xe5\x95\x8e\xc2\x1f\x60\x03\x3c\x0f\xf4\x3c\x29\xcb\x12\x7c\xc0\xc6\xe3\x06\x14\xfb\x97\xd1\xc7\x8c\x18\x18\x56\xd9\x2f\xed\x09\x4d\x73\xd7\x34\x58\xe1\x9e\x7b\x1a\x9d\x22\xc5\x7c\xcd\xb5\x2a\x9e\xdd\xee\x78\xf9\x14\x4c\xf4\x87\x8f\x4c\x23\x06\x56\xb8\x38\x08\x62\x0f\x26\xf3\x82\xcc\xbf\x47\x16\x05\x85\x0e\x99\x25\xc5\x20\xbc\xbe\x0c\x2a\x53\x6f\x4e\x78\xec\xd3\x38\xcb\x41\xaf\x07\x58\x74\xbf\x8d\x59\xdb\x63\xba\x8b\x2c\x6c\xc6\x6c\x75\xfa\x1c\x83\xf2\x5e\xdb\x05\x97\xc7\xf0\x49\x9e\x84\xf3\xff\xcc\x49\xfa\x96\xe3\x98\xde\x6a\xe4\x5c\xfc\xb3\xcd\x76\x67\x1d\x0f\xfc\x45\x0c\x39\xd2\xc3\xaf\xd0\x93\x13\xae\xfe\x05\x00\x00\xff\xff\x5d\x9a\x63\xab\x6a\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 26, 8, 52, 31, 538759867, time.UTC),
+			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 307499265, time.UTC),
 			uncompressedSize: 206,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8c\x3d\x0e\x02\x21\x10\x46\x7b\x4e\xf1\x5d\x00\x13\x2c\x39\x84\x8d\x89\xfd\x04\x3e\x23\x51\x58\x02\x64\x9b\xc9\xde\xdd\xb0\x6b\xe3\x76\xf3\xf3\xde\xb3\xd6\x1a\xa9\xe9\xc1\xd6\xd3\x52\x3c\x56\x67\xde\xa9\x44\x8f\x3b\xdb\x9a\x02\x4d\xe6\x90\x28\x43\xbc\x01\x8a\x64\x7a\x64\xe6\x20\xe1\xc5\xa8\x8a\xf4\xc4\xe5\x26\x99\xbd\x4a\x20\xb6\xed\x07\xed\xab\x87\xea\xff\x57\x15\x2c\x71\x62\xbd\x32\xcc\x62\x5d\xda\xe8\x73\x00\xec\x39\xbf\x5f\x0f\xc4\xc3\xb9\xab\x73\x06\xe8\xfc\x30\x8c\xa5\x1d\xce\xd9\xf8\x06\x00\x00\xff\xff\x20\x2f\xef\xba\xce\x00\x00\x00"),
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
index 7a680fbbb..692c8bec4 100644
--- a/install/templates/flux-deployment.yaml.tmpl
+++ b/install/templates/flux-deployment.yaml.tmpl
@@ -146,8 +146,8 @@ spec:
         - --listen-metrics=:3031
 {{ if .AdditionalFluxArgs }}
         # Additional arguments{{ range .AdditionalFluxArgs }}
-        - {{ . }}{{ end }}{{ end }}
-
+        - {{ . }}{{ end }}
+{{ end }}
       # Optional DNS settings, configuring the ndots option may resolve
       # nslookup issues on some Kubernetes setups.
       # dnsPolicy: "None"

From 6db2445065978fd39dc4f403404ab3216729eda5 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Sun, 28 Jul 2019 11:39:30 +0300
Subject: [PATCH 080/158] Update Kustomize to v3.1.0 Kustomize 3.1 allows
 applying one patch to multiple resources e.g. injecting sidecars

Details about the kustomize release can be found here:
https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/docs/v3.1.0.md
---
 docker/kustomize.version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/kustomize.version b/docker/kustomize.version
index dce31b038..69f640b79 100644
--- a/docker/kustomize.version
+++ b/docker/kustomize.version
@@ -1,2 +1,2 @@
-KUSTOMIZE_VERSION=3.0.0
-KUSTOMIZE_CHECKSUM=ef0dbeca85c419891ad0e12f1f9df649b02ceb01517fa9aea0297ef14e400c7a
+KUSTOMIZE_VERSION=3.1.0
+KUSTOMIZE_CHECKSUM=73acc575cf4e035a91da63ecffcabe58f9572562b772c1eb7ed863991950afe8

From 67637e526bdb275f0a1b6669cf7327a7a00ae7d1 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 29 Jul 2019 14:45:11 +0200
Subject: [PATCH 081/158] Kill all apt-get processes before package update

As they may be holding on to the `/var/lib/apt/lists/lock` file if
there is currently a networking issue that is causing the spinup
step to keep the update process alive.

Ref: https://support.circleci.com/hc/en-us/articles/360021256633-Apt-Get-Update-Is-Slow-Or-Locked
---
 .circleci/config.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0bbb1ff91..291efdabe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,15 @@ jobs:
             mkdir -p "$HOME/go/bin"
             go version
       - run:
-          name: Update packages and Start Memcached
+          name: Update packages and start Memcached
+          no_output_timeout: 10m
           command: |
+            # Kill any apt-get processes that may be hanging due to
+            # networking related issues, and thus holding on to
+            # `/var/lib/apt/lists/lock`.
+            # https://support.circleci.com/hc/en-us/articles/360021256633-Apt-Get-Update-Is-Slow-Or-Locked
+            sudo killall apt-get
+
             sudo apt-get update
             sudo apt-get install -y git rng-tools memcached
             git version

From 253d7652baaaf534e39c43946c555d169c9ead9f Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 29 Jul 2019 15:05:26 +0200
Subject: [PATCH 082/158] Build: tweak killall to silence error

As we want to proceed if there is nothing to kill, given that our
goal is to have no apt-get processes running.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 291efdabe..200910bd4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
             # networking related issues, and thus holding on to
             # `/var/lib/apt/lists/lock`.
             # https://support.circleci.com/hc/en-us/articles/360021256633-Apt-Get-Update-Is-Slow-Or-Locked
-            sudo killall apt-get
+            sudo killall apt-get || true
 
             sudo apt-get update
             sudo apt-get install -y git rng-tools memcached

From e0d7b7568805cd61eb11394f94611515b6fe2573 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 17:53:35 +0200
Subject: [PATCH 083/158] change titles and headings

Signed-off-by: Daniel Holbach <daniel@weave.works>
---
 site/building.md               |   9 +--
 site/daemon.md                 |  13 ++--
 site/faq.md                    |  38 +-----------
 site/fluxctl.md                | 105 +++++++++++----------------------
 site/garbagecollection.md      |   6 +-
 site/get-started.md            |  21 +++----
 site/git-gpg.md                |  19 +++---
 site/helm-get-started.md       |  19 +++---
 site/helm-integration.md       |   7 +--
 site/helm-upgrading-to-beta.md |   6 +-
 site/how-it-works.md           |  19 ++----
 site/installing.md             |  12 +---
 site/introduction.md           |   5 +-
 site/monitoring.md             |   7 +--
 site/requirements.md           |   5 +-
 site/standalone-setup.md       |  25 ++++----
 site/troubleshooting.md        |   5 +-
 site/upgrading-to-1.0.md       |   5 --
 18 files changed, 95 insertions(+), 231 deletions(-)

diff --git a/site/building.md b/site/building.md
index 706cfc055..3dedca373 100644
--- a/site/building.md
+++ b/site/building.md
@@ -1,9 +1,4 @@
----
-title: Building Flux
-menu_order: 80
----
-
-# Build
+# Building Weave Flux
 
 You'll need a working `go` environment version >= 1.11 (official releases are built against `1.12`).
 It's also expected that you have a Docker daemon for building images.
@@ -26,7 +21,7 @@ and binaries for a different architecture you will have to set ARCH variable,
 $ make ARCH=<target_arch>
 ```
 
-# Test
+## Running tests
 
 ```sh
 $ make test
diff --git a/site/daemon.md b/site/daemon.md
index d823ca582..4d7f4d516 100644
--- a/site/daemon.md
+++ b/site/daemon.md
@@ -1,14 +1,11 @@
----
-title: Flux Daemon
-menu_order: 90
----
+# Flux Daemon
 
-# Summary
+## Summary
 
 Flux daemon (fluxd, aka Flux agent) allows automation of application deployments and version control of cluster configuration.
 Version controlling of cluster manifests provides reproducibility and a historical trail of events.
 
-## Flux daemon responsibilities
+### Flux daemon responsibilities
 
     A) Continuous Deployment
 	    1.
@@ -33,12 +30,12 @@ Version controlling of cluster manifests provides reproducibility and a historic
             Deployment is pinned to a particular image tag. New deployment will not
             proceed upon triggered release.
 
-# More information
+## More information
 
 Setting up and configuring fluxd is discussed in our [standalone setup](./standalone-setup.md)
 document.
 
-# Flags
+## Flags
 
 fluxd requires setup and offers customization though a multitude of flags.
 
diff --git a/site/faq.md b/site/faq.md
index 0f8c4e159..f4a470f1f 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -1,39 +1,4 @@
----
-title: Flux FAQ
-menu_order: 60
----
-
-- [General questions](#general-questions)
-  * [What does Flux do?](#what-does-flux-do)
-  * [How does it automate deployment?](#how-does-it-automate-deployment)
-  * [How is that different from a bash script?](#how-is-that-different-from-a-bash-script)
-  * [Why should I automate deployment?](#why-should-i-automate-deployment)
-  * [I thought Flux was about service routing?](#i-thought-flux-was-about-service-routing)
-  * [Are there prerelease builds I can run?](#are-there-prerelease-builds-i-can-run)
-- [Technical questions](#technical-questions)
-  * [Does it work only with one git repository?](#does-it-work-only-with-one-git-repository)
-  * [Do I have to put my application code and config in the same git repo?](#do-i-have-to-put-my-application-code-and-config-in-the-same-git-repo)
-  * [Is there any special directory layout I need in my git repo?](#is-there-any-special-directory-layout-i-need-in-my-git-repo)
-  * [Why does Flux need a git ssh key with write access?](#why-does-flux-need-a-git-ssh-key-with-write-access)
-  * [Does Flux automatically sync changes back to git?](#does-flux-automatically-sync-changes-back-to-git)
-  * [Will Flux delete resources when I remove them from git?](#will-flux-delete-resources-when-i-remove-them-from-git)
-  * [How do I give Flux access to an image registry?](#how-do-i-give-flux-access-to-an-image-registry)
-  * [How often does Flux check for new images?](#how-often-does-flux-check-for-new-images)
-  * [How often does Flux check for new git commits (and can I make it sync faster)?](#how-often-does-flux-check-for-new-git-commits-and-can-i-make-it-sync-faster)
-  * [How do I use my own deploy key?](#how-do-i-use-my-own-deploy-key)
-  * [How do I use a private git host (or one that's not github.com, gitlab.com, bitbucket.org, dev.azure.com, or vs-ssh.visualstudio.com)?](#how-do-i-use-a-private-git-host-or-one-thats-not-githubcom-gitlabcom-bitbucketorg-devazurecom-or-vs-sshvisualstudiocom)
-  * [Why does my CI pipeline keep getting triggered?](#why-does-my-ci-pipeline-keep-getting-triggered)
-  * [Can I restrict the namespaces that Flux can see or operate on?](#can-i-restrict-the-namespaces-that-flux-can-see-or-operate-on)
-  * [Can I change the namespace Flux puts things in by default?](#can-i-change-the-namespace-flux-puts-things-in-by-default)
-  * [Can I temporarily make Flux ignore a deployment?](#can-i-temporarily-make-flux-ignore-a-deployment)
-  * [How can I prevent Flux overriding the replicas when using HPA?](#how-can-i-prevent-flux-overriding-the-replicas-when-using-hpa)
-  * [Can I disable Flux registry scanning?](#can-i-disable-flux-registry-scanning)
-  * [Does Flux support Kustomize/My favorite manifest factorization technology?](#does-flux-support-kustomizetemplatingmy-favorite-manifest-factorization-technology)
-- [Flux Helm Operator questions](#flux-helm-operator-questions)
-  * [I'm using SSL between Helm and Tiller. How can I configure Flux to use the certificate?](#im-using-ssl-between-helm-and-tiller-how-can-i-configure-flux-to-use-the-certificate)
-  * [I've deleted a HelmRelease file from Git. Why is the Helm release still running on my cluster?](#ive-deleted-a-helmrelease-file-from-git-why-is-the-helm-release-still-running-on-my-cluster)
-  * [I've manually deleted a Helm release. Why is Flux not able to restore it?](#ive-manually-deleted-a-helm-release-why-is-flux-not-able-to-restore-it)
-  * [I have a dedicated Kubernetes cluster per environment and I want to use the same Git repo for all. How can I do that?](#i-have-a-dedicated-kubernetes-cluster-per-environment-and-i-want-to-use-the-same-git-repo-for-all-how-can-i-do-that)
+# Flux FAQ
 
 ## General questions
 
@@ -462,4 +427,3 @@ For each cluster create a Git branch in your config repo.
 When installing Flux Helm chart set the Git branch using `--set git.branch=cluster-name`
 and set a unique label for each cluster `--set git.label=cluster-name`.
 
-
diff --git a/site/fluxctl.md b/site/fluxctl.md
index 2c779fc07..6c42de3f6 100644
--- a/site/fluxctl.md
+++ b/site/fluxctl.md
@@ -1,49 +1,12 @@
----
-title: Using Flux
-menu_order: 40
----
-
-- [Installing fluxctl](#installing-fluxctl)
-  * [Mac OS](#mac-os)
-  * [Linux](#linux)
-    + [Ubuntu (and others): snaps](#ubuntu-and-others-snaps)
-    + [Arch Linux](#arch-linux)
-  * [Binary releases](#binary-releases)
-- [Connecting fluxctl to the daemon](#connecting-fluxctl-to-the-daemon)
-  * [Flux API service](#flux-api-service)
-  * [Add an SSH deploy key to the repository](#add-an-ssh-deploy-key-to-the-repository)
-    + [1. Allow Flux to generate a key for you](#1-allow-flux-to-generate-a-key-for-you)
-    + [2. Specify a key to use](#2-specify-a-key-to-use)
-- [Workloads](#workloads)
-  * [What is a Workload?](#what-is-a-workload)
-  * [Viewing Workloads](#viewing-workloads)
-  * [Inspecting the Version of a Container](#inspecting-the-version-of-a-container)
-  * [Releasing a Workload](#releasing-a-workload)
-  * [Turning on Automation](#turning-on-automation)
-  * [Turning off Automation](#turning-off-automation)
-  * [Rolling back a Workload](#rolling-back-a-workload)
-  * [Locking a Workload](#locking-a-workload)
-  * [Releasing an image to a locked workload](#releasing-an-image-to-a-locked-workload)
-  * [Unlocking a Workload](#unlocking-a-workload)
-  * [Recording user and message with the triggered action](#recording-user-and-message-with-the-triggered-action)
-- [Image Tag Filtering](#image-tag-filtering)
-  * [Filter pattern types](#filter-pattern-types)
-    + [Glob](#glob)
-    + [Semver](#semver)
-    + [Regexp](#regexp)
-  * [Controlling image timestamps with labels](#controlling-image-timestamps-with-labels)
-    + [Supported label formats](#supported-label-formats)
-- [Actions triggered through `fluxctl`](#actions-triggered-through-fluxctl)
-  * [Errors due to author customization](#errors-due-to-author-customization)
-- [Using Annotations](#using-annotations)
+# Using Flux
 
 `fluxctl` provides an API that can be used from the command line.
 
 The `--help` for `fluxctl` is described below.
 
-# Installing fluxctl
+## Installing fluxctl
 
-## Mac OS
+### Mac OS
 
 If you are using a Mac and use Homebrew, you can simply run:
 
@@ -51,9 +14,9 @@ If you are using a Mac and use Homebrew, you can simply run:
 brew install fluxctl
 ```
 
-## Linux
+### Linux
 
-### Ubuntu (and others): snaps
+#### Ubuntu (and others): snaps
 
 [Many Linux distributions](https://docs.snapcraft.io/installing-snapd) support
 snaps these days, which makes it very easy to install `fluxctl` and stay up to
@@ -73,7 +36,7 @@ sudo snap install fluxctl --edge
 
 instead.
 
-### Arch Linux
+#### Arch Linux
 
 Install the `fluxctl-bin` package [from the
 AUR](https://aur.archlinux.org/packages/fluxctl-bin/):
@@ -84,13 +47,13 @@ cd fluxctl-bin
 makepkg -si
 ```
 
-## Binary releases
+### Binary releases
 
 With every release of Flux, we release binaries of `fluxctl` for Mac, Linux
 and Windows. Download them from the [Flux release
 page](https://github.com/weaveworks/flux/releases).
 
-# Connecting fluxctl to the daemon
+## Connecting fluxctl to the daemon
 
 By default, `fluxctl` will attempt to port-forward to your Flux
 instance, assuming it runs in the `"default"` namespace. You can
@@ -121,7 +84,7 @@ environment variable `FLUX_URL`:
 fluxctl --url http://127.0.0.1:3030/api/flux list-workloads
 ```
 
-## Flux API service
+### Flux API service
 
 Now you can easily query the Flux API:
 
@@ -129,12 +92,12 @@ Now you can easily query the Flux API:
 fluxctl list-workloads --all-namespaces
 ```
 
-## Add an SSH deploy key to the repository
+### Add an SSH deploy key to the repository
 
 Flux connects to the repository using an SSH key. You have two
 options:
 
-### 1. Allow Flux to generate a key for you
+#### 1. Allow Flux to generate a key for you
 
 If you don't specify a key to use, Flux will create one for you. Obtain
 the public key through `fluxctl`:
@@ -156,7 +119,7 @@ repository and synchronised the cluster.
 When using Kubernetes, this key is stored as a Kubernetes secret. You
 can restart `flux` and it will continue to use the same key.
 
-### 2. Specify a key to use
+#### 2. Specify a key to use
 
 Create a Kubernetes Secret from a private key:
 
@@ -252,15 +215,15 @@ Flags:
 Use "fluxctl [command] --help" for more information about a command.
 ```
 
-# Workloads
+## Workloads
 
-## What is a Workload?
+### What is a Workload?
 
 This term refers to any cluster resource responsible for the creation of
 containers from versioned images - in Kubernetes these are objects such as
 Deployments, DaemonSets, StatefulSets and CronJobs.
 
-## Viewing Workloads
+### Viewing Workloads
 
 The first thing to do is to check whether Flux can see any running
 workloads. To do this, use the `list-workloads` subcommand:
@@ -274,7 +237,7 @@ default:deployment/helloworld  helloworld  quay.io/weaveworks/helloworld:master-
 
 Note that the actual images running will depend on your cluster.
 
-## Inspecting the Version of a Container
+### Inspecting the Version of a Container
 
 Once we have a list of workloads, we can begin to inspect which versions
 of the image are running.
@@ -295,7 +258,7 @@ default:deployment/helloworld  helloworld  quay.io/weaveworks/helloworld
 The arrows will point to the version that is currently running
 alongside a list of other versions and their timestamps.
 
-## Releasing a Workload
+### Releasing a Workload
 
 We can now go ahead and update a workload with the `release` subcommand.
 This will check whether each workload needs to be updated, and if so,
@@ -321,7 +284,7 @@ default:deployment/helloworld  helloworld  quay.io/weaveworks/helloworld
                                                master-a000001             23 Aug 16 09:53 UTC
 ```
 
-## Turning on Automation
+### Turning on Automation
 
 Automation can be easily controlled from `fluxctl`
 with the `automate` subcommand.
@@ -346,7 +309,7 @@ helloworld application is automated. Flux will now automatically
 deploy a new version of a workload whenever one is available and commit
 the new configuration to the version control system.
 
-## Turning off Automation
+### Turning off Automation
 
 Turning off automation is performed with the `deautomate` command:
 
@@ -364,7 +327,7 @@ default:deployment/helloworld  helloworld  quay.io/weaveworks/helloworld:master-
 
 We can see that the workload is no longer automated.
 
-## Rolling back a Workload
+### Rolling back a Workload
 
 Rolling back can be achieved by combining:
 
@@ -407,7 +370,7 @@ default:deployment/helloworld  helloworld  quay.io/weaveworks/helloworld
                                                master-a000001             23 Aug 16 09:53 UTC
 ```
 
-## Locking a Workload
+### Locking a Workload
 
 Locking a workload will stop manual or automated releases to that
 workload. Changes made in the file will still be synced.
@@ -419,7 +382,7 @@ WORKLOAD                       STATUS   UPDATES
 default:deployment/helloworld  success
 ```
 
-## Releasing an image to a locked workload
+### Releasing an image to a locked workload
 
 It may be desirable to release an image to a locked workload while
 maintaining the lock afterwards. In order to not having to modify the
@@ -429,7 +392,7 @@ lock policy (which includes author and reason), one may use `--force`:
 fluxctl release --workload=default:deployment/helloworld --update-all-images --force
 ```
 
-## Unlocking a Workload
+### Unlocking a Workload
 
 Unlocking a workload allows it to have manual or automated releases
 (again).
@@ -441,7 +404,7 @@ WORKLOAD                       STATUS   UPDATES
 default:deployment/helloworld  success
 ```
 
-## Recording user and message with the triggered action
+### Recording user and message with the triggered action
 
 Issuing a deployment change results in a version control change/git
 commit, keeping the history of the actions. The Flux daemon can be
@@ -458,7 +421,7 @@ tool, can have the commit author information customized. This is handy for provi
 notifications and history. Whether the customization is possible, depends on the Flux daemon (fluxd)
 `git-set-author` flag. If set, the commit author will be customized in the following way:
 
-# Image Tag Filtering
+## Image Tag Filtering
 
 When building images it is often useful to tag build images by the branch that they were built against for example:
 
@@ -511,11 +474,11 @@ fluxctl release --workload=default:deployment/helloworld --update-all-images --f
 
 Please note that automation might immediately undo this.
 
-## Filter pattern types
+### Filter pattern types
 
 Flux currently offers support for `glob`, `semver` and `regexp` based filtering.
 
-### Glob
+#### Glob
 
 The glob (`*`) filter is the simplest filter Flux supports, a filter can contain
 multiple globs:
@@ -524,7 +487,7 @@ multiple globs:
 fluxctl policy --workload=default:deployment/helloworld --tag-all='glob:master-v1.*.*'
 ```
 
-### Semver
+#### Semver
 
 If your images use [semantic versioning](https://semver.org) you can filter by image tags
 that adhere to certain constraints:
@@ -542,7 +505,7 @@ fluxctl policy --workload=default:deployment/helloworld --tag-all='semver:*'
 Using a semver filter will also affect how Flux sorts images, so
 that the higher versions will be considered newer.
 
-### Regexp
+#### Regexp
 
 If your images have complex tags you can filter by regular expression:
 
@@ -554,7 +517,7 @@ Instead of `regexp` it is also possible to use its alias `regex`.
 Please bear in mind that if you want to match the whole tag,
 you must bookend your pattern with `^` and `$`.
 
-## Controlling image timestamps with labels
+### Controlling image timestamps with labels
 
 Some image registries do not expose a reliable creation timestamp for
 image tags, which could pose a problem for the automated roll-out of
@@ -564,14 +527,14 @@ To overcome this problem you can define one of the supported labels in
 your `Dockerfile`. Flux will prioritize labels over the timestamp it
 retrieves from the registry.
 
-### Supported label formats
+#### Supported label formats
 
 - [`org.opencontainers.image.created`](https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys)
   date and time on which the image was built (string, date-time as defined by RFC 3339).
 - [`org.label-schema.build-date`](http://label-schema.org/rc1/#build-time-labels)
   date and time on which the image was built (string, date-time as defined by RFC 3339).
 
-# Actions triggered through `fluxctl`
+## Actions triggered through `fluxctl`
 
 `fluxctl` provides the following flags for the message and author customization:
 
@@ -622,7 +585,7 @@ Commit customization
             This form will succeed if there is already a repo commit, done by
             jane@doe.com.
 
-## Errors due to author customization
+### Errors due to author customization
 
 In case of no prior commit by the specified author, an error will be reported
 for b) and c):
@@ -632,7 +595,7 @@ git commit: fatal: --author 'unknown' is not 'Name <email>' and matches
 no existing author
 ```
 
-# Using Annotations
+## Using Annotations
 
 Automation and image tag filtering can also be managed using annotations
 (fluxctl is using the same mechanism).
diff --git a/site/garbagecollection.md b/site/garbagecollection.md
index 5870bcdc0..eecd83c68 100644
--- a/site/garbagecollection.md
+++ b/site/garbagecollection.md
@@ -1,4 +1,4 @@
-## Garbage collection
+# Garbage collection
 
 Part of syncing a cluster with a git repository is getting rid of
 resources in the cluster that have been removed in the repository. You
@@ -6,7 +6,7 @@ can tell fluxd to do this "garbage collection" using the command-line
 flag `--sync-garbage-collection`. It's important to know how it
 operates, and appreciate its limitations, before enabling it.
 
-### How garbage collection works
+## How garbage collection works
 
 When garbage collection is enabled, syncing is done in two phases:
 
@@ -31,7 +31,7 @@ The definition of "source" affects how garbage collection behaves when
 you reconfigure fluxd. It is intended to be conservative: it ensures
 that fluxd will not delete resources that it did not create.
 
-### Limitations of this approach
+## Limitations of this approach
 
 In general, if you change an element of the source (the git repo URL,
 branch, and paths), there is a possiblility that resources no longer
diff --git a/site/get-started.md b/site/get-started.md
index 154f0a87e..25abe62f0 100644
--- a/site/get-started.md
+++ b/site/get-started.md
@@ -1,7 +1,4 @@
----
-title: Installing Flux Manually
-menu_order: 10
----
+# Installing Flux Manually
 
 - [Get started with Flux](#get-started-with-flux)
   * [Prerequisites](#prerequisites)
@@ -13,7 +10,7 @@ menu_order: 10
   * [Confirm the change landed](#confirm-the-change-landed)
   * [Conclusion](#conclusion)
 
-# Get started with Flux
+## Get started with Flux
 
 This short guide shows a self-contained example of Flux and just
 takes a couple of minutes to get set up. By the end you will
@@ -23,7 +20,7 @@ code changes for you.
 > **Note:** If you would like to install Flux using Helm, refer to the
 [Helm section](./helm-get-started.md).
 
-## Prerequisites
+### Prerequisites
 
 You will need to have Kubernetes set up. For a quick local test,
 you can use `minikube` or `kubeadm`. Any other Kubernetes setup
@@ -43,7 +40,7 @@ will work as well though.
 > clusterroles.rbac.authorization.k8s.io "flux" is forbidden: attempt to grant
 > extra privileges:`
 
-## Set up Flux
+### Set up Flux
 
 Get Flux:
 
@@ -69,7 +66,7 @@ flag to `--git-path=namespaces,workloads`, this is meant to exclude Helm
 manifests. Again, if you want to get started with Helm, please refer to the
 [Helm section](./helm-get-started.md).
 
-## Deploying Flux to the cluster
+### Deploying Flux to the cluster
 
 In the next step, deploy Flux to the cluster:
 
@@ -85,7 +82,7 @@ process.
 watch kubectl get pods --all-namespaces
 ```
 
-## Giving write access
+### Giving write access
 
 At startup Flux generates a SSH key and logs the public key. Find
 the SSH public key by installing [fluxctl](./fluxctl.md) and
@@ -109,7 +106,7 @@ for more info on how to manage deploy keys.
 `https://github.com/YOURUSER/flux-get-started/settings/keys/new` and
 paste the key there.)
 
-## Committing a small change
+### Committing a small change
 
 In this example we are using a simple example of a webservice and
 change its configuration to use a different message. The easiest
@@ -130,7 +127,7 @@ The default sync frequency is 5 minutes. This can be tweaked easily.
 By observing the logs you can see when the change landed in in the
 cluster.
 
-## Confirm the change landed
+### Confirm the change landed
 
 To access our webservice and check out its welcome message, simply
 run:
@@ -142,7 +139,7 @@ curl localhost:9898
 
 Notice the updated `color` value in the JSON reply.
 
-## Conclusion
+### Conclusion
 
 As you can see, the actual steps to set up Flux, get our app
 deployed, give Flux access to it and see modifications land are
diff --git a/site/git-gpg.md b/site/git-gpg.md
index c89d987b2..c49fb958e 100644
--- a/site/git-gpg.md
+++ b/site/git-gpg.md
@@ -1,7 +1,4 @@
----
-title: Git commit signing and verification
-menu_order: 90
----
+# Git commit signing and verification
 
 - [Summary](#summary)
 - [Commit signing](#commit-signing)
@@ -11,7 +8,7 @@ menu_order: 90
   * [Importing trusted GPG keys and enabling verification](#importing-trusted-gpg-keys-and-enabling-verification)
   * [Enabling verification for existing repositories, disaster recovery, and deleted sync tags](#enabling-verification-for-existing-repositories-disaster-recovery-and-deleted-sync-tags)
 
-# Summary
+## Summary
 
 Flux can be configured to sign commits that it makes to the user git
 repo when, for example, it detects an updated Docker image is available
@@ -20,7 +17,7 @@ functionality it is also able to verify signatures of commits (and the
 sync tag in git) to prevent Flux from applying unauthorized changes on
 the cluster.
 
-# Commit signing
+## Commit signing
 
 The signing of commits (and the sync tag) requires two flags to be set:
 
@@ -35,7 +32,7 @@ The signing of commits (and the sync tag) requires two flags to be set:
 Once enabled Flux will sign both commits and the sync tag with given
 `--git-signing-key`.
 
-## Creating a GPG signing key
+### Creating a GPG signing key
 
 > **Note:** This requires [gnupg](https://www.gnupg.org) to be
 installed on your system.
@@ -101,7 +98,7 @@ installed on your system.
    ssb   rsa2048/ECA4FF5BD988B8E9 2019-03-28 [E]
    ```
 
-## Importing a GPG signing key
+### Importing a GPG signing key
 
 Any file found in the configured `--git-gpg-key-import` path(s) will be
 imported into GPG; therefore, by volume-mounting a key into that
@@ -176,7 +173,7 @@ understand symbolic links to files.
   trustdb. This is required as git will otherwise not trust signatures
   made with the imported keys.
 
-# Signature verification
+## Signature verification
 
 The verification of commit signatures is enabled by importing all
 trusted public keys (`--git-gpg-key-import=<path>,<path2>`), and by
@@ -188,7 +185,7 @@ In case a signature can not be verified, Flux will sync state up to the
 last valid revision it can find _before_ the unverified commit was
 made, and lock on this revision.
 
-## Importing trusted GPG keys and enabling verification
+### Importing trusted GPG keys and enabling verification
 
 1. Collect the public keys from all trusted git authors.
 
@@ -233,7 +230,7 @@ made, and lock on this revision.
 > **Note:** Flux *does not* recursively scan a given directory but does
 understand symbolic links to files.
 
-## Enabling verification for existing repositories, disaster recovery, and deleted sync tags
+### Enabling verification for existing repositories, disaster recovery, and deleted sync tags
 
 In case you have existing commits in your repository without a
 signature you may want to:
diff --git a/site/helm-get-started.md b/site/helm-get-started.md
index a31d647ab..85708dfaa 100644
--- a/site/helm-get-started.md
+++ b/site/helm-get-started.md
@@ -1,7 +1,4 @@
----
-title: Installing Flux using Helm
-menu_order: 20
----
+# Installing Flux using Helm
 
 - [Get started with Flux using Helm](#get-started-with-flux-using-helm)
   * [Prerequisites](#prerequisites)
@@ -11,7 +8,7 @@ menu_order: 20
   * [Conclusion](#conclusion)
 - [Next](#next)
 
-# Get started with Flux using Helm
+## Get started with Flux using Helm
 
 If you are using Helm already, this guide is for you. By the end
 you will have Helm installing Flux in the cluster and deploying
@@ -21,7 +18,7 @@ If you are looking for more generic notes for how to install Flux
 using Helm, we collected them [in the chart's
 README](../chart/flux/README.md).
 
-## Prerequisites
+### Prerequisites
 
 You will need to have Kubernetes set up. To get up and running fast,
 you might want to use `minikube` or `kubeadm`. Any other Kubernetes
@@ -60,7 +57,7 @@ helm init --skip-refresh --upgrade --service-account tiller --history-max 10
 > and be aware of the `--history-max` flag before promoting to
 > production.
 
-## Install Flux
+### Install Flux
 
 Add the Flux repository:
 
@@ -113,7 +110,7 @@ watch kubectl -n flux get pods
 You will notice that `flux` and `flux-helm-operator` will start
 turning up in the `flux` namespace.
 
-## Giving write access
+### Giving write access
 
 For the real benefits of GitOps, Flux will need access to your
 git repository to update configuration if necessary. To facilitate
@@ -149,7 +146,7 @@ deployed into the `demo` namespace) listed like so:
 helm list --namespace demo
 ```
 
-## Committing a small change
+### Committing a small change
 
 `flux-get-started` is a simple example in which three services
 (mongodb, redis and ghost) are deployed. Here we will simply update the
@@ -190,13 +187,13 @@ Flux is deploying to:
 kubectl describe -n demo deployment/mongodb | grep Image
 ```
 
-## Conclusion
+### Conclusion
 
 As you can see, the actual steps to set up Flux, get our app
 deployed, give Flux access to it and see modifications land are
 very straight-forward and are a quite natural workflow.
 
-# Next
+## Next
 
 As a next step, you might want to dive deeper into [how to control
 Flux](fluxctl.md) or go through our hands-on tutorial about driving Flux,
diff --git a/site/helm-integration.md b/site/helm-integration.md
index 7dfb93299..53d29810c 100644
--- a/site/helm-integration.md
+++ b/site/helm-integration.md
@@ -1,7 +1,4 @@
----
-title: Using Flux with Helm
-menu_order: 90
----
+# Using Flux with Helm
 
 - [Using Flux with Helm](#using-flux-with-helm)
   * [The `HelmRelease` custom resource](#the-helmrelease-custom-resource)
@@ -24,8 +21,6 @@ menu_order: 90
       - [Azure ACR repositories](#azure-acr-repositories)
     + [Authentication for Git repos](#authentication-for-git-repos)
 
-# Using Flux with Helm
-
 You can release charts to your cluster via "GitOps", by combining Flux
 and the Flux Helm Operator (also in
 [weaveworks/flux](https://github.com/weaveworks/flux)).
diff --git a/site/helm-upgrading-to-beta.md b/site/helm-upgrading-to-beta.md
index 2d55e2582..65a785742 100644
--- a/site/helm-upgrading-to-beta.md
+++ b/site/helm-upgrading-to-beta.md
@@ -1,8 +1,4 @@
----
-title: Upgrading from Helm operator alpha (<=0.4.0) to beta
----
-
-# Upgrading from Helm operator v0.4.0 to the beta
+# Upgrading from Helm operator alpha (<=0.4.0) to beta
 
 The Helm operator has undergone changes that necessitate some changes
 to custom resources, and the deployment of the operator itself.
diff --git a/site/how-it-works.md b/site/how-it-works.md
index a0ac630ea..f6806db25 100644
--- a/site/how-it-works.md
+++ b/site/how-it-works.md
@@ -1,13 +1,10 @@
----
-title: How Flux Works
-menu_order: 20
----
+# How Flux Works
 
 This page describes the goals of flux, how it achieves them and
 significant architectural decisions. It is intentionally high level
 to prevent it from being out of date too quickly.
 
-# Goals
+## Goals
 
 The overall goal of Flux is to automate the deployment of services.
 A typical use case would be:
@@ -27,11 +24,11 @@ Flux provides a CLI ([`fluxctl`](fluxctl.md)) to perform these
 operations manually. Flux is flexible enough to fit into any
 development process.
 
-# Implementation Overview
+## Implementation Overview
 
 The following describes how Flux achieves the goals.
 
-## Synchronisation of cluster state
+### Synchronisation of cluster state
 
 The Flux team firmly believe that cluster state should be version
 controlled. This allows users to record the history of the cluster,
@@ -51,7 +48,7 @@ cluster to match the code representing the cluster in the repository.
 This simple idea then allows for a whole range of tools that can react
 to changes and simply write to a repository.
 
-## Monitoring For New Images
+### Monitoring For New Images
 
 Flux reads a list of running containers from the user git repository.
 For each image, it will query the container registry to obtain the most
@@ -68,7 +65,7 @@ When automation is disabled, images are not checked.
 
 In order to access private registries, credentials may be required.
 
-## Deployment of Images
+### Deployment of Images
 
 Flux will only deploy different images. It will not re-deploy images
 with the same tag.
@@ -78,7 +75,3 @@ configuration of the cluster to deploy the new images.
 
 Images can be "locked" to a specific version. "locked" images won't be
 updated by automated or manual means.
-
-## Next
-
-_Get started by [installing Flux](/site/installing.md)._
diff --git a/site/installing.md b/site/installing.md
index f40d0afd6..e8e5280b1 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -1,26 +1,18 @@
----
-title: Installing Flux
-menu_order: 30
----
-
-# Prerequisites for Flux
+# Installing Flux
 
 All you need is a Kubernetes cluster and a git repo. The git repo
 contains [manifests][k8s-manifests] (as YAML files) describing what
 should run in the cluster. Flux imposes
 [some requirements](/site/requirements.md) on these files.
 
-# Installing Flux
-
 Here are the instructions to [install Flux on your own
 cluster](./get-started.md).
 
 If you are using Helm, we have a [separate section about
 this](./helm-get-started.md).
 
-# Next
+## Next
 
 [Setup fluxctl and run the daemon](./fluxctl.md)
 
-----
 [k8s-manifests]: https://kubernetes.io/docs/concepts/configuration/overview/
diff --git a/site/introduction.md b/site/introduction.md
index 412b1b71a..70b2d851e 100644
--- a/site/introduction.md
+++ b/site/introduction.md
@@ -1,7 +1,4 @@
----
-title: Introducing Flux
-menu_order: 10
----
+# Introducing Flux
 
 Continuous delivery is a term that encapsulates a set of best practices 
 that surround building, deploying and monitoring applications. The 
diff --git a/site/monitoring.md b/site/monitoring.md
index 21fed02bd..d061686d8 100644
--- a/site/monitoring.md
+++ b/site/monitoring.md
@@ -1,14 +1,9 @@
----
-title: Monitoring Flux
-menu_order: 70
----
+# Monitoring Flux
 
 The Flux daemon exposes `/metrics` endpoints which can be scraped for
 monitoring data in Prometheus format; exact metric names and help are
 available from the endpoints themselves.
 
-# flux
-
 The following metrics are exposed:
 
 | metric                                   | description
diff --git a/site/requirements.md b/site/requirements.md
index 768247e21..85abff751 100644
--- a/site/requirements.md
+++ b/site/requirements.md
@@ -1,7 +1,4 @@
----
-title: Requirements and limitations
-menu_order: 60
----
+# Requirements and limitations
 
 Flux has some requirements of the files it finds in your git repo.
 
diff --git a/site/standalone-setup.md b/site/standalone-setup.md
index fd35470d3..701dd219c 100644
--- a/site/standalone-setup.md
+++ b/site/standalone-setup.md
@@ -1,7 +1,4 @@
----
-title: Customising the deployment
-menu_order: 20
----
+# Customising the deployment
 
 - [Customising the daemon configuration](#customising-the-daemon-configuration)
   * [Connect Flux to a repository](#connect-flux-to-a-repository)
@@ -13,19 +10,19 @@ menu_order: 20
   * [Using a private git host](#using-a-private-git-host)
   * [Memcache](#memcache)
 
-# Customising the daemon configuration
+## Customising the daemon configuration
 
 The deployment installs Flux and its dependencies. First, change to
 the directory with the examples configuration.
 
-## Connect Flux to a repository
+### Connect Flux to a repository
 
 First, you need to connect Flux to the repository with Kubernetes
 manifests. This is achieved by setting the `--git-url` and
 `--git-branch` arguments in the
 [`flux-deployment.yaml`](../deploy/flux-deployment.yaml) manifest.
 
-## Flux deployment
+### Flux deployment
 
 You will need to create a secret in which Flux will store its SSH
 key. The daemon won't start without this present.
@@ -36,7 +33,7 @@ repository and synchronised the cluster.
 When using Kubernetes, this key is stored as a Kubernetes secret. You
 can restart `flux` and it will continue to use the same key.
 
-## Add an SSH deploy key to the repository
+### Add an SSH deploy key to the repository
 
 Flux connects to the repository using an SSH key.
 
@@ -48,7 +45,7 @@ permissions. The `Developer` permission can create tags, but not update them.
 
 You have two options:
 
-### 1. Allow Flux to generate a key for you.
+#### 1. Allow Flux to generate a key for you.
 
 If you don't specify a key to use, Flux will create one for you. Obtain
 the public key through [fluxctl](./fluxctl.md):
@@ -57,7 +54,7 @@ the public key through [fluxctl](./fluxctl.md):
 fluxctl identity
 ```
 
-### 2. Specify a key to use
+#### 2. Specify a key to use
 
 Create a Kubernetes Secret from a private key:
 
@@ -87,7 +84,7 @@ $EDITOR flux-deployment.yaml
 kubectl create -f flux-deployment.yaml
 ```
 
-### Note for Kubernetes >=1.6 with role-based access control (RBAC)
+#### Note for Kubernetes >=1.6 with role-based access control (RBAC)
 
 You will need to provide fluxd with a service account which can access
 the namespaces you want to use Flux with. To do this, consult the
@@ -103,7 +100,7 @@ Using an SSH key allows you to maintain control of the repository. You
 can revoke permission for `flux` to access the repository at any time
 by removing the deploy key.
 
-## Using a private git host
+### Using a private git host
 
 If you're using your own git host -- e.g., your own installation of
 gitlab, or bitbucket server -- you will need to add its host key to
@@ -191,10 +188,10 @@ You will need to explicitly tell fluxd to use that service account by
 uncommenting and possible adapting the line `# serviceAccountName:
 flux` in the file `fluxd-deployment.yaml` before applying it.
 
-## Memcache
+### Memcache
 
 Flux uses memcache to cache docker registry requests.
 
 ```sh
 kubectl create -f memcache-dep.yaml -f memcache-svc.yaml
-```
\ No newline at end of file
+```
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 55703833c..a1c02e906 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -1,7 +1,4 @@
----
-title: Troubleshooting Flux
-menu_order: 50
----
+# Troubleshooting Weave Flux
 
 Also see the [issues labeled with
 `FAQ`](https://github.com/weaveworks/flux/labels/FAQ), which often
diff --git a/site/upgrading-to-1.0.md b/site/upgrading-to-1.0.md
index f01f2ba97..2273ac8ea 100644
--- a/site/upgrading-to-1.0.md
+++ b/site/upgrading-to-1.0.md
@@ -1,8 +1,3 @@
----
-title: Upgrading to Flux v1
-menu_order: 100
----
-
 # Upgrading to Flux v1
 
 Flux v1 is a major improvement over the previous versions, and is

From 6cb1db647628a7a22530f03dbb4baa05e6660cf2 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 17:54:30 +0200
Subject: [PATCH 084/158] add very basic config for sphinx+recommonmark

---
 site/Makefile |  19 ++++++
 site/conf.py  | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++
 site/index.md |  20 ++++++
 3 files changed, 212 insertions(+)
 create mode 100644 site/Makefile
 create mode 100644 site/conf.py
 create mode 100644 site/index.md

diff --git a/site/Makefile b/site/Makefile
new file mode 100644
index 000000000..298ea9e21
--- /dev/null
+++ b/site/Makefile
@@ -0,0 +1,19 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/site/conf.py b/site/conf.py
new file mode 100644
index 000000000..b14319005
--- /dev/null
+++ b/site/conf.py
@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+sys.path.insert(0, os.path.abspath('.'))
+
+# -- Project information -----------------------------------------------------
+
+project = 'Flux documentation'
+copyright = '2019, Flux development team'
+author = 'Flux development team'
+
+# The short X.Y version
+version = ''
+# The full version, including alpha/beta/rc tags
+release = ''
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'recommonmark',
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+source_suffix = ['.rst', '.md']
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'sphinx_rtd_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Fluxdocumentationdoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'Fluxdocumentation.tex', 'Flux documentation Documentation',
+     'Flux development team', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'fluxdocumentation', 'Flux documentation Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'Fluxdocumentation', 'Flux documentation Documentation',
+     author, 'Fluxdocumentation', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
diff --git a/site/index.md b/site/index.md
new file mode 100644
index 000000000..8658f4589
--- /dev/null
+++ b/site/index.md
@@ -0,0 +1,20 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to Flux documentation's documentation!
+==============================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

From 197c49b45a0d95d2568aa46d5ba3a44f87553452 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 18:07:17 +0200
Subject: [PATCH 085/158] remove documentation duplication

---
 site/conf.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/site/conf.py b/site/conf.py
index b14319005..627c6ba3c 100644
--- a/site/conf.py
+++ b/site/conf.py
@@ -18,7 +18,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'Flux documentation'
+project = 'Flux'
 copyright = '2019, Flux development team'
 author = 'Flux development team'
 
@@ -101,7 +101,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Fluxdocumentationdoc'
+htmlhelp_basename = 'Fluxdoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -128,7 +128,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'Fluxdocumentation.tex', 'Flux documentation Documentation',
+    (master_doc, 'Flux.tex', 'Flux Documentation',
      'Flux development team', 'manual'),
 ]
 
@@ -138,7 +138,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'fluxdocumentation', 'Flux documentation Documentation',
+    (master_doc, 'flux', 'Flux Documentation',
      [author], 1)
 ]
 
@@ -149,8 +149,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Fluxdocumentation', 'Flux documentation Documentation',
-     author, 'Fluxdocumentation', 'One line description of project.',
+    (master_doc, 'Flux', 'Flux Documentation',
+     author, 'Flux', 'One line description of project.',
      'Miscellaneous'),
 ]
 

From e2e1203375f194fa7f7830dbe92acd17912f280d Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 18:15:53 +0200
Subject: [PATCH 086/158] ignore docs build

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1b9eddf4b..712ce26bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ test/bin/kubectl
 test/bin/kustomize
 test/bin/helm
 test/bin/kind
+
+# Docs
+site/_build

From e72ca502bedf70c5d20c9a77e493c34cc444504f Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 18:33:01 +0200
Subject: [PATCH 087/158] add initial index

---
 site/{index.md => index.rst} | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 rename site/{index.md => index.rst} (55%)

diff --git a/site/index.md b/site/index.rst
similarity index 55%
rename from site/index.md
rename to site/index.rst
index 8658f4589..97de483fa 100644
--- a/site/index.md
+++ b/site/index.rst
@@ -10,6 +10,29 @@ Welcome to Flux documentation's documentation!
    :maxdepth: 2
    :caption: Contents:
 
+   annotations-tutorial
+   building
+   daemon
+   faq
+   fluxctl
+   fluxyaml-config-files
+   garbagecollection
+   get-started-developing
+   get-started
+   git-gpg
+   helm-get-started
+   helm-integration
+   helm-operator
+   helm-upgrading-to-beta
+   how-it-works
+   installing
+   introduction
+   monitoring
+   requirements
+   standalone-setup
+   troubleshooting
+   upgrading-to-1.0
+
 
 
 Indices and tables

From 2f825384320575cd81eb00f6f8c4d92e4941d619 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 12 Jun 2019 18:48:41 +0200
Subject: [PATCH 088/158] add support for markdown tables

---
 site/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/conf.py b/site/conf.py
index 627c6ba3c..b03efbc89 100644
--- a/site/conf.py
+++ b/site/conf.py
@@ -39,6 +39,7 @@
 # ones.
 extensions = [
     'recommonmark',
+    'sphinx_markdown_tables',
 ]
 
 # Add any paths that contain templates here, relative to this directory.

From bd016daa21554f196691fe54cf94e1f4b09a587e Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Thu, 13 Jun 2019 09:15:39 +0200
Subject: [PATCH 089/158] make some index changes

---
 site/{ => development}/building.md            |  0
 .../get-started-developing.md                 |  0
 site/development/index.rst                    | 15 ++++++++
 site/index.rst                                | 36 ++++++++-----------
 site/{ => tutorials}/annotations-tutorial.md  |  0
 site/{ => tutorials}/get-started.md           |  0
 site/{ => tutorials}/helm-get-started.md      |  0
 site/tutorials/index.rst                      | 18 ++++++++++
 8 files changed, 47 insertions(+), 22 deletions(-)
 rename site/{ => development}/building.md (100%)
 rename site/{ => development}/get-started-developing.md (100%)
 create mode 100644 site/development/index.rst
 rename site/{ => tutorials}/annotations-tutorial.md (100%)
 rename site/{ => tutorials}/get-started.md (100%)
 rename site/{ => tutorials}/helm-get-started.md (100%)
 create mode 100644 site/tutorials/index.rst

diff --git a/site/building.md b/site/development/building.md
similarity index 100%
rename from site/building.md
rename to site/development/building.md
diff --git a/site/get-started-developing.md b/site/development/get-started-developing.md
similarity index 100%
rename from site/get-started-developing.md
rename to site/development/get-started-developing.md
diff --git a/site/development/index.rst b/site/development/index.rst
new file mode 100644
index 000000000..7a39bb441
--- /dev/null
+++ b/site/development/index.rst
@@ -0,0 +1,15 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Developing the Flux codebase
+==============================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+   get-started-developing
+   building
diff --git a/site/index.rst b/site/index.rst
index 97de483fa..14cf75e87 100644
--- a/site/index.rst
+++ b/site/index.rst
@@ -3,41 +3,33 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to Flux documentation's documentation!
+Welcome to Flux's documentation!
 ==============================================
 
 .. toctree::
    :maxdepth: 2
    :caption: Contents:
 
-   annotations-tutorial
-   building
-   daemon
+
+   introduction
+   requirements
+   installing
+   how-it-works
+   standalone-setup
+
+   tutorials/index
+   development/index
+
    faq
+   troubleshooting
+
+   daemon
    fluxctl
    fluxyaml-config-files
    garbagecollection
-   get-started-developing
-   get-started
    git-gpg
-   helm-get-started
    helm-integration
    helm-operator
    helm-upgrading-to-beta
-   how-it-works
-   installing
-   introduction
    monitoring
-   requirements
-   standalone-setup
-   troubleshooting
    upgrading-to-1.0
-
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/site/annotations-tutorial.md b/site/tutorials/annotations-tutorial.md
similarity index 100%
rename from site/annotations-tutorial.md
rename to site/tutorials/annotations-tutorial.md
diff --git a/site/get-started.md b/site/tutorials/get-started.md
similarity index 100%
rename from site/get-started.md
rename to site/tutorials/get-started.md
diff --git a/site/helm-get-started.md b/site/tutorials/helm-get-started.md
similarity index 100%
rename from site/helm-get-started.md
rename to site/tutorials/helm-get-started.md
diff --git a/site/tutorials/index.rst b/site/tutorials/index.rst
new file mode 100644
index 000000000..560700eca
--- /dev/null
+++ b/site/tutorials/index.rst
@@ -0,0 +1,18 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Flux Tutorials - step by step guides
+==============================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+
+   get-started
+   helm-get-started
+   annotations-tutorial
+
+

From e7716e4a334a4b5681623d095846c3975830e2b1 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 14 Jun 2019 14:08:34 +0200
Subject: [PATCH 090/158] add build/serve in container

---
 site/Dockerfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 site/Dockerfile

diff --git a/site/Dockerfile b/site/Dockerfile
new file mode 100644
index 000000000..0f631af67
--- /dev/null
+++ b/site/Dockerfile
@@ -0,0 +1,12 @@
+FROM ddidier/sphinx-doc
+RUN pip install 'sphinx_markdown_tables'		\
+		'recommonmark 		== 0.5.0'
+
+
+# docker build
+#
+# to build docs, run:
+# docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> make html
+#
+# to serve docs on :8000, run:
+# docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> python -m http.server 8000

From 696db6fec9925cc19f29aa781427f1ae48ed8ed4 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 14 Jun 2019 14:11:40 +0200
Subject: [PATCH 091/158] explain where to point browser

---
 site/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/Dockerfile b/site/Dockerfile
index 0f631af67..9cff293ec 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -10,3 +10,4 @@ RUN pip install 'sphinx_markdown_tables'		\
 #
 # to serve docs on :8000, run:
 # docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> python -m http.server 8000
+# and point your browser to: http://localhost:8000/_build/html/index.html

From 91648160d8a16483217a1b84cfbe4fe93e7ec1e9 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 14 Jun 2019 14:17:33 +0200
Subject: [PATCH 092/158] simplify

---
 site/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/Dockerfile b/site/Dockerfile
index 9cff293ec..636ceab93 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -6,7 +6,7 @@ RUN pip install 'sphinx_markdown_tables'		\
 # docker build
 #
 # to build docs, run:
-# docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> make html
+# docker run -i -v `pwd`:/doc -e USER_ID=$UID <image> make html
 #
 # to serve docs on :8000, run:
 # docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> python -m http.server 8000

From 0b3c960a8a9c6938b541090b1eb92c59365b148a Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 14 Jun 2019 14:22:58 +0200
Subject: [PATCH 093/158] adjust link

---
 site/development/get-started-developing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/development/get-started-developing.md b/site/development/get-started-developing.md
index 2e3f9606e..e79b2876d 100644
--- a/site/development/get-started-developing.md
+++ b/site/development/get-started-developing.md
@@ -40,7 +40,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
 
 ## Run `flux-getting-started`
 
-We're going to make some changes soon enough, but just to get a good baseline please follow the [Getting Started](site/get-started.md) guide and run the `flux-getting-started` repo through its normal paces.
+We're going to make some changes soon enough, but just to get a good baseline please follow the [Getting Started](../tutorials/get-started.md) guide and run the `flux-getting-started` repo through its normal paces.
 
 Now that we know everything is working with `flux-getting-started`, we're going to try and do nearly the same thing as `flux-getting-started`, except instead of using official releases of flux, we're going to build and run what we have locally.
 

From 65fc5b5e409adf17f81a37a29b3f7c80691f3253 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 14 Jun 2019 15:48:14 +0200
Subject: [PATCH 094/158] fix links

---
 site/installing.md                     | 4 ++--
 site/tutorials/annotations-tutorial.md | 6 +++---
 site/tutorials/get-started.md          | 6 +++---
 site/tutorials/helm-get-started.md     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/site/installing.md b/site/installing.md
index e8e5280b1..4567a94a5 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -6,10 +6,10 @@ should run in the cluster. Flux imposes
 [some requirements](/site/requirements.md) on these files.
 
 Here are the instructions to [install Flux on your own
-cluster](./get-started.md).
+cluster](./tutorials/get-started.md).
 
 If you are using Helm, we have a [separate section about
-this](./helm-get-started.md).
+this](./tutorials/helm-get-started.md).
 
 ## Next
 
diff --git a/site/tutorials/annotations-tutorial.md b/site/tutorials/annotations-tutorial.md
index bc7459d08..91e672216 100644
--- a/site/tutorials/annotations-tutorial.md
+++ b/site/tutorials/annotations-tutorial.md
@@ -98,7 +98,7 @@ fluxcd/flux
 
 > **Note:** In this tutorial we keep things simple, so we deploy Flux into
 the `default` namespace. Normally you would pick a separate namespace for
-it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](fluxctl.md#Connectingfluxctltothedaemon) for specifying the right
+it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](../fluxctl.md#Connectingfluxctltothedaemon) for specifying the right
 namespace.
 
 ### Connecting to your git config
@@ -107,8 +107,8 @@ The first step is done. Flux is now and up running (you can confirm by
 running `kubectl get pods --all-namespaces`).
 
 In the second step we will use fluxctl to talk to Flux in the cluster and
-interact with the deployments. First, please [install fluxctl](fluxctl.md#installing-fluxctl).
-(It enables you to drive all of Flux, so have a look at the output of
+interact with the deployments. First, please [install fluxctl](../fluxctl.md#installing-fluxctl).
+(It enables you to drive all of Weave Flux, so have a look at the output of
 `fluxctl -h` to get a better idea.)
 
 > **Note:** Another option (without installing `fluxctl` is to take a look
diff --git a/site/tutorials/get-started.md b/site/tutorials/get-started.md
index 25abe62f0..711b2eb64 100644
--- a/site/tutorials/get-started.md
+++ b/site/tutorials/get-started.md
@@ -85,7 +85,7 @@ watch kubectl get pods --all-namespaces
 ### Giving write access
 
 At startup Flux generates a SSH key and logs the public key. Find
-the SSH public key by installing [fluxctl](./fluxctl.md) and
+the SSH public key by installing [fluxctl](../fluxctl.md) and
 runnning:
 
 ```sh
@@ -146,7 +146,7 @@ deployed, give Flux access to it and see modifications land are
 very straight-forward and are a quite natural work-flow.
 
 As a next step, you might want to dive deeper into [how to
-control Flux](./fluxctl.md), check out [more sophisticated
-setups](./standalone-setup.md) or go through our hands-on
+control Flux](../fluxctl.md), check out [more sophisticated
+setups](../standalone-setup.md) or go through our hands-on
 tutorial about driving Flux, e.g.
 [automations, annotations and locks](annotations-tutorial.md).
diff --git a/site/tutorials/helm-get-started.md b/site/tutorials/helm-get-started.md
index 85708dfaa..3d50970e6 100644
--- a/site/tutorials/helm-get-started.md
+++ b/site/tutorials/helm-get-started.md
@@ -119,7 +119,7 @@ repository.
 
 This is pretty straight-forward as Flux generates a SSH key and
 logs the public key at startup. Find the SSH public key by
-installing [fluxctl](./fluxctl.md) and running:
+installing [fluxctl](../fluxctl.md) and running:
 
 ```sh
 fluxctl identity --k8s-fwd-ns flux
@@ -196,7 +196,7 @@ very straight-forward and are a quite natural workflow.
 ## Next
 
 As a next step, you might want to dive deeper into [how to control
-Flux](fluxctl.md) or go through our hands-on tutorial about driving Flux,
+Flux](../fluxctl.md) or go through our hands-on tutorial about driving Flux,
 e.g. [automations, annotations and locks](annotations-tutorial.md).
 
 For a more advanced Helm setup, take a look at the [gitops-helm

From 2a91501d5912ba71e4bb97a8669ffc5a0c090eb3 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 17 Jun 2019 10:58:25 +0200
Subject: [PATCH 095/158] fix some more links

---
 site/faq.md          | 8 ++++----
 site/how-it-works.md | 1 +
 site/installing.md   | 2 +-
 site/introduction.md | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/site/faq.md b/site/faq.md
index f4a470f1f..ed24c2480 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -4,8 +4,8 @@
 
 Also see
 
-- [the introduction](/site/introduction.md) for Flux's design principles
-- [the troubleshooting section](/site/troubleshooting.md)
+- [the introduction](./introduction.md) for Flux's design principles
+- [the troubleshooting section](./troubleshooting.md)
 
 ### What does Flux do?
 
@@ -231,7 +231,7 @@ service, or running your own git host, you need to supply your own
 host key(s).
 
 How to do this is documented in
-[standalone-setup.md](/site/standalone-setup.md#using-a-private-git-host).
+[standalone-setup.md](./standalone-setup.md#using-a-private-git-host).
 
 ### Why does my CI pipeline keep getting triggered?
 
@@ -386,7 +386,7 @@ Flux experimentally supports technology-agnostic manifest factorization through
 `.flux.yaml` configuration files placed in the Git repository. To enable this
 feature please supply `fluxd` with flag `--manifest-generation=true`.
 
-See [`.flux.yaml` configuration files documentation](/site/fluxyaml-config-files.md) for
+See [`.flux.yaml` configuration files documentation](./fluxyaml-config-files.md) for
 further details.
 
 ## Flux Helm Operator questions
diff --git a/site/how-it-works.md b/site/how-it-works.md
index f6806db25..eb223f28f 100644
--- a/site/how-it-works.md
+++ b/site/how-it-works.md
@@ -75,3 +75,4 @@ configuration of the cluster to deploy the new images.
 
 Images can be "locked" to a specific version. "locked" images won't be
 updated by automated or manual means.
+
diff --git a/site/installing.md b/site/installing.md
index 4567a94a5..bc646289f 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -3,7 +3,7 @@
 All you need is a Kubernetes cluster and a git repo. The git repo
 contains [manifests][k8s-manifests] (as YAML files) describing what
 should run in the cluster. Flux imposes
-[some requirements](/site/requirements.md) on these files.
+[some requirements](./requirements.md) on these files.
 
 Here are the instructions to [install Flux on your own
 cluster](./tutorials/get-started.md).
diff --git a/site/introduction.md b/site/introduction.md
index 70b2d851e..a7558e728 100644
--- a/site/introduction.md
+++ b/site/introduction.md
@@ -50,6 +50,6 @@ changes by observing a predictable series of deployment events.
 
 ## Next
 
-_Find out more about [Flux's features](/site/how-it-works.md)._
+_Find out more about [Flux's features](./how-it-works.md)._
 
-_Get started immediately by [installing Flux](/site/installing.md)._
+_Get started immediately by [installing Flux](./installing.md)._

From a39a4a896c3974235056dc84009f24d81ba2990e Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Mon, 17 Jun 2019 12:47:19 +0300
Subject: [PATCH 096/158] Preview docs with docker From the root dir run `make
 run-docs`, this will: - build the docs website inside the docker image -
 create a docker image named flux-docs:latest - run the docs website on
 http://localhost:8000/_build/html/index.html You can change the port binding
 with `DOCS_PORT=8080 make run-docs`

---
 Makefile        |  6 ++++++
 site/Dockerfile | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 7b72a19cf..2d23a31e0 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ IMAGE_TAG:=$(shell ./docker/image-tag)
 VCS_REF:=$(shell git rev-parse HEAD)
 BUILD_DATE:=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 
+DOCS_PORT:=8000
+
 all: $(GOBIN)/fluxctl $(GOBIN)/fluxd $(GOBIN)/helm-operator build/.flux.done build/.helm-operator.done
 
 release-bins:
@@ -132,3 +134,7 @@ check-generated: generate-deploy install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
 	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
+run-docs:
+	@cd site && docker build -t flux-docs .
+	@echo Stating docs website on http://localhost:${DOCS_PORT}/_build/html/index.html
+	@docker run -i -p ${DOCS_PORT}:8000 -e USER_ID=$$UID flux-docs
diff --git a/site/Dockerfile b/site/Dockerfile
index 636ceab93..8f2ac3866 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,13 +1,12 @@
 FROM ddidier/sphinx-doc
-RUN pip install 'sphinx_markdown_tables'		\
-		'recommonmark 		== 0.5.0'
-
-
-# docker build
-#
-# to build docs, run:
-# docker run -i -v `pwd`:/doc -e USER_ID=$UID <image> make html
-#
-# to serve docs on :8000, run:
-# docker run -i -v `pwd`:/doc -e USER_ID=$UID -p 8000:8000 <image> python -m http.server 8000
-# and point your browser to: http://localhost:8000/_build/html/index.html
+
+RUN pip install 'sphinx_markdown_tables' 'recommonmark == 0.5.0'
+
+WORKDIR /doc
+
+COPY . .
+
+RUN make html
+
+CMD ["python", "-m", "http.server", "8000"]
+

From b39f7f0377fb83d86bd9812dcc8a1a90eb59a2a0 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 17 Jun 2019 11:53:33 +0200
Subject: [PATCH 097/158] New directory structure

	- moved docs into subdirectories to make things easier to
	  navigate
        - remove TOCs from various docs as this will be in the
	  UI of readthedocs already - less to manually keep up
	  to date
---
 site/development/get-started-developing.md    |  2 +-
 site/faq.md                                   |  6 ++---
 site/{ => helm}/helm-integration.md           | 21 ----------------
 site/{ => helm}/helm-operator.md              |  0
 site/{ => helm}/helm-upgrading-to-beta.md     |  0
 site/helm/index.rst                           | 15 ++++++++++++
 site/how-it-works.md                          |  6 ++---
 site/index.rst                                | 24 +++++++------------
 site/{tutorials => install}/get-started.md    | 18 ++++----------
 .../helm-get-started.md                       | 15 ++++--------
 site/{tutorials => install}/index.rst         | 10 ++++----
 site/{ => install}/installing.md              |  8 +++----
 site/{ => install}/standalone-setup.md        | 12 +---------
 site/{ => internals}/daemon.md                |  2 +-
 site/{ => internals}/fluxyaml-config-files.md |  0
 site/{ => internals}/garbagecollection.md     |  0
 site/internals/index.rst                      | 16 +++++++++++++
 site/introduction.md                          |  3 ++-
 site/troubleshooting.md                       |  4 ++--
 .../annotations-tutorial.md                   |  0
 site/{ => using}/fluxctl.md                   |  0
 site/{ => using}/git-gpg.md                   |  8 -------
 site/using/index.rst                          | 17 +++++++++++++
 site/{ => using}/monitoring.md                |  0
 site/{ => using}/upgrading-to-1.0.md          |  0
 25 files changed, 85 insertions(+), 102 deletions(-)
 rename site/{ => helm}/helm-integration.md (92%)
 rename site/{ => helm}/helm-operator.md (100%)
 rename site/{ => helm}/helm-upgrading-to-beta.md (100%)
 create mode 100644 site/helm/index.rst
 rename site/{tutorials => install}/get-started.md (85%)
 rename site/{tutorials => install}/helm-get-started.md (92%)
 rename site/{tutorials => install}/index.rst (81%)
 rename site/{ => install}/installing.md (68%)
 rename site/{ => install}/standalone-setup.md (90%)
 rename site/{ => internals}/daemon.md (99%)
 rename site/{ => internals}/fluxyaml-config-files.md (100%)
 rename site/{ => internals}/garbagecollection.md (100%)
 create mode 100644 site/internals/index.rst
 rename site/{tutorials => using}/annotations-tutorial.md (100%)
 rename site/{ => using}/fluxctl.md (100%)
 rename site/{ => using}/git-gpg.md (93%)
 create mode 100644 site/using/index.rst
 rename site/{ => using}/monitoring.md (100%)
 rename site/{ => using}/upgrading-to-1.0.md (100%)

diff --git a/site/development/get-started-developing.md b/site/development/get-started-developing.md
index e79b2876d..9039b219d 100644
--- a/site/development/get-started-developing.md
+++ b/site/development/get-started-developing.md
@@ -40,7 +40,7 @@ This guide shows a workflow for making a small (actually, tiny) change to Flux,
 
 ## Run `flux-getting-started`
 
-We're going to make some changes soon enough, but just to get a good baseline please follow the [Getting Started](../tutorials/get-started.md) guide and run the `flux-getting-started` repo through its normal paces.
+We're going to make some changes soon enough, but just to get a good baseline please follow the [Getting Started](../install/get-started.md) guide and run the `flux-getting-started` repo through its normal paces.
 
 Now that we know everything is working with `flux-getting-started`, we're going to try and do nearly the same thing as `flux-getting-started`, except instead of using official releases of flux, we're going to build and run what we have locally.
 
diff --git a/site/faq.md b/site/faq.md
index ed24c2480..638fd10f7 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -107,7 +107,7 @@ fluxctl release --controller=deployment/foo --update-image=bar:v2
 
 The image tag will be updated in the git repository upon applying the command.
 
-For more information about Flux commands see [the fluxctl docs](./fluxctl.md).
+For more information about Flux commands see [the fluxctl docs](./using/fluxctl.md).
 
 ### Does Flux automatically sync changes back to git?
 
@@ -123,7 +123,7 @@ The garbage collection is conservative: it is designed to not delete
 resources that were not created by fluxd. This means it will sometimes
 _not_ delete resources that _were_ created by fluxd, when
 reconfigured. Read more about garbage collection
-[here](./garbagecollection.md).
+[here](./internals/garbagecollection.md).
 
 ### How do I give Flux access to an image registry?
 
@@ -386,7 +386,7 @@ Flux experimentally supports technology-agnostic manifest factorization through
 `.flux.yaml` configuration files placed in the Git repository. To enable this
 feature please supply `fluxd` with flag `--manifest-generation=true`.
 
-See [`.flux.yaml` configuration files documentation](./fluxyaml-config-files.md) for
+See [`.flux.yaml` configuration files documentation](./internals/fluxyaml-config-files.md) for
 further details.
 
 ## Flux Helm Operator questions
diff --git a/site/helm-integration.md b/site/helm/helm-integration.md
similarity index 92%
rename from site/helm-integration.md
rename to site/helm/helm-integration.md
index 53d29810c..0c0308372 100644
--- a/site/helm-integration.md
+++ b/site/helm/helm-integration.md
@@ -1,26 +1,5 @@
 # Using Flux with Helm
 
-- [Using Flux with Helm](#using-flux-with-helm)
-  * [The `HelmRelease` custom resource](#the-helmrelease-custom-resource)
-    + [Using a chart from a Git repo instead of a Helm repo](#using-a-chart-from-a-git-repo-instead-of-a-helm-repo)
-      - [Notifying Helm Operator about Git changes](#notifying-helm-operator-about-git-changes)
-    + [Reinstalling a Helm release](#reinstalling-a-helm-release)
-    + [What the Helm Operator does](#what-the-helm-operator-does)
-  * [Supplying values to the chart](#supplying-values-to-the-chart)
-    + [`.spec.values`](#specvalues)
-    + [`.spec.valuesFrom`](#specvaluesfrom)
-      * [Config maps](#config-maps)
-      * [Secrets](#secrets)
-      * [External sources](#external-sources)
-      * [Chart files](#chart-files)
-  * [Upgrading images in a `HelmRelease` using Flux](#upgrading-images-in-a-helmrelease-using-flux)
-  * [Rollbacks](#rollbacks)
-    + [Configuration](#configuration)
-  * [Authentication](#authentication)
-    + [Authentication for Helm repos](#authentication-for-helm-repos)
-      - [Azure ACR repositories](#azure-acr-repositories)
-    + [Authentication for Git repos](#authentication-for-git-repos)
-
 You can release charts to your cluster via "GitOps", by combining Flux
 and the Flux Helm Operator (also in
 [weaveworks/flux](https://github.com/weaveworks/flux)).
diff --git a/site/helm-operator.md b/site/helm/helm-operator.md
similarity index 100%
rename from site/helm-operator.md
rename to site/helm/helm-operator.md
diff --git a/site/helm-upgrading-to-beta.md b/site/helm/helm-upgrading-to-beta.md
similarity index 100%
rename from site/helm-upgrading-to-beta.md
rename to site/helm/helm-upgrading-to-beta.md
diff --git a/site/helm/index.rst b/site/helm/index.rst
new file mode 100644
index 000000000..8123af843
--- /dev/null
+++ b/site/helm/index.rst
@@ -0,0 +1,15 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Using Flux with Helm
+==============================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   helm-integration
+   helm-operator
+   helm-upgrading-to-beta
diff --git a/site/how-it-works.md b/site/how-it-works.md
index eb223f28f..8bc6d8123 100644
--- a/site/how-it-works.md
+++ b/site/how-it-works.md
@@ -20,9 +20,9 @@ with an orchestrator (which is a common source of accidental failure) or
 with the systems that ensure that the orchestrator is in a working
 state.
 
-Flux provides a CLI ([`fluxctl`](fluxctl.md)) to perform these
-operations manually. Flux is flexible enough to fit into any
-development process.
+Flux provides a CLI ([`fluxctl`](./using/fluxctl.md)) and a UI (as a component of Weave Cloud)
+to perform these operations manually. Flux is flexible enough to fit
+into any development process.
 
 ## Implementation Overview
 
diff --git a/site/index.rst b/site/index.rst
index 14cf75e87..349bc33cb 100644
--- a/site/index.rst
+++ b/site/index.rst
@@ -7,29 +7,21 @@ Welcome to Flux's documentation!
 ==============================================
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
    :caption: Contents:
 
 
    introduction
    requirements
-   installing
-   how-it-works
-   standalone-setup
 
-   tutorials/index
+   install/index
+   using/index
+   helm/index
+   
+   how-it-works
+   
+   internals/index
    development/index
 
    faq
    troubleshooting
-
-   daemon
-   fluxctl
-   fluxyaml-config-files
-   garbagecollection
-   git-gpg
-   helm-integration
-   helm-operator
-   helm-upgrading-to-beta
-   monitoring
-   upgrading-to-1.0
diff --git a/site/tutorials/get-started.md b/site/install/get-started.md
similarity index 85%
rename from site/tutorials/get-started.md
rename to site/install/get-started.md
index 711b2eb64..44b884e52 100644
--- a/site/tutorials/get-started.md
+++ b/site/install/get-started.md
@@ -1,15 +1,5 @@
 # Installing Flux Manually
 
-- [Get started with Flux](#get-started-with-flux)
-  * [Prerequisites](#prerequisites)
-    + [A Note on GKE with RBAC enabled](#a-note-on-gke-with-rbac-enabled)
-  * [Set up Flux](#set-up-flux)
-  * [Deploying Flux to the cluster](#deploying-flux-to-the-cluster)
-  * [Giving write access](#giving-write-access)
-  * [Committing a small change](#committing-a-small-change)
-  * [Confirm the change landed](#confirm-the-change-landed)
-  * [Conclusion](#conclusion)
-
 ## Get started with Flux
 
 This short guide shows a self-contained example of Flux and just
@@ -85,7 +75,7 @@ watch kubectl get pods --all-namespaces
 ### Giving write access
 
 At startup Flux generates a SSH key and logs the public key. Find
-the SSH public key by installing [fluxctl](../fluxctl.md) and
+the SSH public key by installing [fluxctl](../using/fluxctl.md) and
 runnning:
 
 ```sh
@@ -146,7 +136,7 @@ deployed, give Flux access to it and see modifications land are
 very straight-forward and are a quite natural work-flow.
 
 As a next step, you might want to dive deeper into [how to
-control Flux](../fluxctl.md), check out [more sophisticated
-setups](../standalone-setup.md) or go through our hands-on
+control Flux](../using/fluxctl.md), check out [more sophisticated
+setups](./standalone-setup.md) or go through our hands-on
 tutorial about driving Flux, e.g.
-[automations, annotations and locks](annotations-tutorial.md).
+[automations, annotations and locks](../using/annotations-tutorial.md).
diff --git a/site/tutorials/helm-get-started.md b/site/install/helm-get-started.md
similarity index 92%
rename from site/tutorials/helm-get-started.md
rename to site/install/helm-get-started.md
index 3d50970e6..82512912d 100644
--- a/site/tutorials/helm-get-started.md
+++ b/site/install/helm-get-started.md
@@ -1,13 +1,5 @@
 # Installing Flux using Helm
 
-- [Get started with Flux using Helm](#get-started-with-flux-using-helm)
-  * [Prerequisites](#prerequisites)
-  * [Install Flux](#install-flux)
-  * [Giving write access](#giving-write-access)
-  * [Committing a small change](#committing-a-small-change)
-  * [Conclusion](#conclusion)
-- [Next](#next)
-
 ## Get started with Flux using Helm
 
 If you are using Helm already, this guide is for you. By the end
@@ -119,7 +111,7 @@ repository.
 
 This is pretty straight-forward as Flux generates a SSH key and
 logs the public key at startup. Find the SSH public key by
-installing [fluxctl](../fluxctl.md) and running:
+installing [fluxctl](../using/fluxctl.md) and running:
 
 ```sh
 fluxctl identity --k8s-fwd-ns flux
@@ -196,8 +188,9 @@ very straight-forward and are a quite natural workflow.
 ## Next
 
 As a next step, you might want to dive deeper into [how to control
-Flux](../fluxctl.md) or go through our hands-on tutorial about driving Flux,
-e.g. [automations, annotations and locks](annotations-tutorial.md).
+Flux](../using/fluxctl.md) or go through our hands-on tutorial about
+driving Flux, e.g. [automations, annotations and
+locks](../using/annotations-tutorial.md).
 
 For a more advanced Helm setup, take a look at the [gitops-helm
 repository](https://github.com/stefanprodan/gitops-helm).
diff --git a/site/tutorials/index.rst b/site/install/index.rst
similarity index 81%
rename from site/tutorials/index.rst
rename to site/install/index.rst
index 560700eca..cc64e7cda 100644
--- a/site/tutorials/index.rst
+++ b/site/install/index.rst
@@ -3,16 +3,14 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Flux Tutorials - step by step guides
+Installing Flux
 ==============================================
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
    :caption: Contents:
 
-
    get-started
    helm-get-started
-   annotations-tutorial
-
-
+   installing
+   standalone-setup
diff --git a/site/installing.md b/site/install/installing.md
similarity index 68%
rename from site/installing.md
rename to site/install/installing.md
index bc646289f..e471337da 100644
--- a/site/installing.md
+++ b/site/install/installing.md
@@ -3,16 +3,16 @@
 All you need is a Kubernetes cluster and a git repo. The git repo
 contains [manifests][k8s-manifests] (as YAML files) describing what
 should run in the cluster. Flux imposes
-[some requirements](./requirements.md) on these files.
+[some requirements](../requirements.md) on these files.
 
 Here are the instructions to [install Flux on your own
-cluster](./tutorials/get-started.md).
+cluster](./get-started.md).
 
 If you are using Helm, we have a [separate section about
-this](./tutorials/helm-get-started.md).
+this](./helm-get-started.md).
 
 ## Next
 
-[Setup fluxctl and run the daemon](./fluxctl.md)
+[Setup fluxctl and run the daemon](../using/fluxctl.md)
 
 [k8s-manifests]: https://kubernetes.io/docs/concepts/configuration/overview/
diff --git a/site/standalone-setup.md b/site/install/standalone-setup.md
similarity index 90%
rename from site/standalone-setup.md
rename to site/install/standalone-setup.md
index 701dd219c..b02b55842 100644
--- a/site/standalone-setup.md
+++ b/site/install/standalone-setup.md
@@ -1,15 +1,5 @@
 # Customising the deployment
 
-- [Customising the daemon configuration](#customising-the-daemon-configuration)
-  * [Connect Flux to a repository](#connect-flux-to-a-repository)
-  * [Flux deployment](#flux-deployment)
-  * [Add an SSH deploy key to the repository](#add-an-ssh-deploy-key-to-the-repository)
-    + [1. Allow Flux to generate a key for you.](#1-allow-flux-to-generate-a-key-for-you)
-    + [2. Specify a key to use](#2-specify-a-key-to-use)
-    + [Note for Kubernetes >=1.6 with role-based access control (RBAC)](#note-for-kubernetes-16-with-role-based-access-control-rbac)
-  * [Using a private git host](#using-a-private-git-host)
-  * [Memcache](#memcache)
-
 ## Customising the daemon configuration
 
 The deployment installs Flux and its dependencies. First, change to
@@ -48,7 +38,7 @@ You have two options:
 #### 1. Allow Flux to generate a key for you.
 
 If you don't specify a key to use, Flux will create one for you. Obtain
-the public key through [fluxctl](./fluxctl.md):
+the public key through [fluxctl](../using/fluxctl.md):
 
 ```sh
 fluxctl identity
diff --git a/site/daemon.md b/site/internals/daemon.md
similarity index 99%
rename from site/daemon.md
rename to site/internals/daemon.md
index 4d7f4d516..fccddadd6 100644
--- a/site/daemon.md
+++ b/site/internals/daemon.md
@@ -32,7 +32,7 @@ Version controlling of cluster manifests provides reproducibility and a historic
 
 ## More information
 
-Setting up and configuring fluxd is discussed in our [standalone setup](./standalone-setup.md)
+Setting up and configuring fluxd is discussed in our [standalone setup](../install/standalone-setup.md)
 document.
 
 ## Flags
diff --git a/site/fluxyaml-config-files.md b/site/internals/fluxyaml-config-files.md
similarity index 100%
rename from site/fluxyaml-config-files.md
rename to site/internals/fluxyaml-config-files.md
diff --git a/site/garbagecollection.md b/site/internals/garbagecollection.md
similarity index 100%
rename from site/garbagecollection.md
rename to site/internals/garbagecollection.md
diff --git a/site/internals/index.rst b/site/internals/index.rst
new file mode 100644
index 000000000..f7b7efba0
--- /dev/null
+++ b/site/internals/index.rst
@@ -0,0 +1,16 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+
+Flux Internals
+==============================================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Contents:
+
+   daemon
+   fluxyaml-config-files
+   garbagecollection
diff --git a/site/introduction.md b/site/introduction.md
index a7558e728..e6435d571 100644
--- a/site/introduction.md
+++ b/site/introduction.md
@@ -52,4 +52,5 @@ changes by observing a predictable series of deployment events.
 
 _Find out more about [Flux's features](./how-it-works.md)._
 
-_Get started immediately by [installing Flux](./installing.md)._
+_Get started immediately by [installing Flux](../install/installing.md)._
+
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index a1c02e906..b3ad9806a 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -47,7 +47,7 @@ This means Flux can't read from and write to the git repo. Check that
    `~/.ssh/known_hosts` in the fluxd container. We prime the container
    _image_ with host keys for `github.com`, `gitlab.com`, `bitbucket.org`, `dev.azure.com`, and `vs-ssh.visualstudio.com`, but if you're using your own git server, you'll
    need to add its host key. See
-   [./standalone-setup.md](./standalone-setup.md#using-a-private-git-host).
+   [./standalone-setup.md](./install/standalone-setup.md#using-a-private-git-host).
 
 ### I'm using GCR/GKE and I keep seeing "Quota exceeded" in logs
 
@@ -79,7 +79,7 @@ reasons this can happen:
    present, it looks at `imagePullSecret`s attached to workloads,
    service accounts, platform-provided credentials on GCP, AWS or Azure, and
    a Docker config file if you mount one into the fluxd container (see
-   the [command-line usage](./daemon.md)).
+   the [command-line usage](./internals/daemon.md)).
  - When using images in ECR, from EC2, the `NodeInstanceRole` for the
    worker node running fluxd must have permissions to query the ECR
    registry (or registries) in
diff --git a/site/tutorials/annotations-tutorial.md b/site/using/annotations-tutorial.md
similarity index 100%
rename from site/tutorials/annotations-tutorial.md
rename to site/using/annotations-tutorial.md
diff --git a/site/fluxctl.md b/site/using/fluxctl.md
similarity index 100%
rename from site/fluxctl.md
rename to site/using/fluxctl.md
diff --git a/site/git-gpg.md b/site/using/git-gpg.md
similarity index 93%
rename from site/git-gpg.md
rename to site/using/git-gpg.md
index c49fb958e..adfc19095 100644
--- a/site/git-gpg.md
+++ b/site/using/git-gpg.md
@@ -1,13 +1,5 @@
 # Git commit signing and verification
 
-- [Summary](#summary)
-- [Commit signing](#commit-signing)
-  * [Creating a GPG signing key](#creating-a-gpg-signing-key)
-  * [Importing a GPG signing key](#importing-a-gpg-signing-key)
-- [Signature verification](#signature-verification)
-  * [Importing trusted GPG keys and enabling verification](#importing-trusted-gpg-keys-and-enabling-verification)
-  * [Enabling verification for existing repositories, disaster recovery, and deleted sync tags](#enabling-verification-for-existing-repositories-disaster-recovery-and-deleted-sync-tags)
-
 ## Summary
 
 Flux can be configured to sign commits that it makes to the user git
diff --git a/site/using/index.rst b/site/using/index.rst
new file mode 100644
index 000000000..01b4e1438
--- /dev/null
+++ b/site/using/index.rst
@@ -0,0 +1,17 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Using Flux
+==============================================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Contents:
+
+   annotations-tutorial
+   fluxctl
+   git-gpg
+   monitoring
+   upgrading-to-1.0
diff --git a/site/monitoring.md b/site/using/monitoring.md
similarity index 100%
rename from site/monitoring.md
rename to site/using/monitoring.md
diff --git a/site/upgrading-to-1.0.md b/site/using/upgrading-to-1.0.md
similarity index 100%
rename from site/upgrading-to-1.0.md
rename to site/using/upgrading-to-1.0.md

From 5eed7c148f0448f5419d4370d4242c407038bbd4 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 17 Jun 2019 15:55:42 +0200
Subject: [PATCH 098/158] fix ALL links - unfortunately we have to be explicit
 with GH links

---
 site/development/get-started-developing.md |  4 ++--
 site/faq.md                                |  4 ++--
 site/helm/helm-integration.md              |  9 +++++----
 site/helm/helm-upgrading-to-beta.md        |  4 ++--
 site/install/helm-get-started.md           |  2 +-
 site/install/standalone-setup.md           |  6 +++---
 site/internals/fluxyaml-config-files.md    | 11 ++++++-----
 site/troubleshooting.md                    |  4 ++--
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/site/development/get-started-developing.md b/site/development/get-started-developing.md
index 9039b219d..49369a523 100644
--- a/site/development/get-started-developing.md
+++ b/site/development/get-started-developing.md
@@ -103,7 +103,7 @@ Now that we know everything is working with `flux-getting-started`, we're going
     ```
     This confirms that a new docker image was tagged for your image.
 
-1. Open up [`deploy/flux-deployment.yaml`](deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/fluxcd/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
+1. Open up [`deploy/flux-deployment.yaml`](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
     ```yaml
     spec:
       template:
@@ -169,7 +169,7 @@ Now that we know everything is working with `flux-getting-started`, we're going
 
 ## Make Some Changes
 
-1. Now for the part you've been waiting for!  We're going to make a cosmetic change to our local copy of Flux.  Navigate to [git/operations.go](git/operations.go).  In it, you will find a private function to this package that goes by the name `execGitCmd`.  Paste the following as the (new) first line of the function:
+1. Now for the part you've been waiting for!  We're going to make a cosmetic change to our local copy of Flux.  Navigate to [git/operations.go](https://github.com/weaveworks/flux/blob/master/git/operations.go).  In it, you will find a private function to this package that goes by the name `execGitCmd`.  Paste the following as the (new) first line of the function:
     ```go
     fmt.Println("executing git command ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ")
     ```
diff --git a/site/faq.md b/site/faq.md
index 638fd10f7..84d449cd1 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -287,12 +287,12 @@ namespace `"default"` when applied to the cluster.
 You can override this by mounting your own "kubeconfig" file into the
 container from a configmap, and using the `KUBECONFIG` environment
 entry to point to it. The [example
-deployment](../deploy/flux-deployment.yaml) shows how to do this, in
+deployment](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) shows how to do this, in
 commented out sections -- it needs extra bits of config in three
 places (the `volume`, `volumeMount`, and `env` entries).
 
 The easiest way to create a suitable "kubeconfig" will be to adapt the
-[file that is baked into the image](../docker/kubeconfig). Save that
+[file that is baked into the image](https://github.com/weaveworks/flux/blob/master/docker/kubeconfig). Save that
 locally as `my-kubeconfig`, edit it to change the default namespace,
 then create the configmap, in the same namespace you run Flux in, with
 something like:
diff --git a/site/helm/helm-integration.md b/site/helm/helm-integration.md
index 0c0308372..5dd7a549f 100644
--- a/site/helm/helm-integration.md
+++ b/site/helm/helm-integration.md
@@ -15,7 +15,7 @@ it.
 
 Each release of a chart is declared by a `HelmRelease`
 resource. The schema for these resources is given in [the custom
-resource definition](../deploy-helm/flux-helm-release-crd.yaml). They
+resource definition](https://github.com/weaveworks/flux/blob/master/deploy-helm/flux-helm-release-crd.yaml). They
 look like this:
 
 ```yaml
@@ -399,7 +399,8 @@ section for how to do this).
 As a workaround, you can mount a `repositories.yaml` file with
 authentication already configured, into the operator container.
 
-> **Note:** When using a custom `repositories.yaml` the [default](../docker/helm-repositories.yaml)
+> **Note:** When using a custom `repositories.yaml` the
+[default](https://github.com/weaveworks/flux/blob/master/docker/helm-repositories.yaml)
 that ships with the operator is overwritten. This means that for any
 repository you want to make use of you should manually add an entry to
 your `repositories.yaml` file.
@@ -430,7 +431,7 @@ kubectl create secret generic flux-helm-repositories --from-file=./repositories.
 Lastly, mount that secret into the container. This can be done by
 setting `helmOperator.configureRepositories.enable` to `true` for the
 flux Helm release, or as shown in the commented-out sections of the
-[example deployment](../deploy-helm/helm-operator-deployment.yaml).
+[example deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
 
 #### Azure ACR repositories
 
@@ -459,7 +460,7 @@ access.
 
 To provide an SSH key, put the key in a secret under the entry
 `identity`, and mount it into the operator container as shown in the
-[example deployment](../deploy-helm/helm-operator-deployment.yaml).
+[example deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
 The default ssh_config expects an identity file at
 `/etc/fluxd/ssh/identity`, which is where it'll be if you just
 uncomment the blocks from the example.
diff --git a/site/helm/helm-upgrading-to-beta.md b/site/helm/helm-upgrading-to-beta.md
index 65a785742..479d5df4e 100644
--- a/site/helm/helm-upgrading-to-beta.md
+++ b/site/helm/helm-upgrading-to-beta.md
@@ -73,8 +73,8 @@ Once you want to use the new capabilities of the operator -- e.g.,
 releasing charts from Helm repos -- you will probably need to adapt
 the manifest further. The [Helm operator set-up
 guide](./helm-integration.md) and [example
-deployment](../deploy-helm/helm-operator-deployment.yaml) explain all
-the details.
+deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml)
+explain all the details.
 
 ## Updating custom resources
 
diff --git a/site/install/helm-get-started.md b/site/install/helm-get-started.md
index 82512912d..6d9246250 100644
--- a/site/install/helm-get-started.md
+++ b/site/install/helm-get-started.md
@@ -8,7 +8,7 @@ any code changes for you.
 
 If you are looking for more generic notes for how to install Flux
 using Helm, we collected them [in the chart's
-README](../chart/flux/README.md).
+README](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md).
 
 ### Prerequisites
 
diff --git a/site/install/standalone-setup.md b/site/install/standalone-setup.md
index b02b55842..6713d3943 100644
--- a/site/install/standalone-setup.md
+++ b/site/install/standalone-setup.md
@@ -10,7 +10,7 @@ the directory with the examples configuration.
 First, you need to connect Flux to the repository with Kubernetes
 manifests. This is achieved by setting the `--git-url` and
 `--git-branch` arguments in the
-[`flux-deployment.yaml`](../deploy/flux-deployment.yaml) manifest.
+[`flux-deployment.yaml`](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) manifest.
 
 ### Flux deployment
 
@@ -65,7 +65,7 @@ this will result in a secret that has the structure:
 ```
 
 The Kubernetes deployment configuration file
-[flux-deployment.yaml](../deploy/flux-deployment.yaml) runs the
+[flux-deployment.yaml](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) runs the
 Flux daemon, but you'll need to edit it first, at least to supply your
 own configuration repo (the `--git-repo` argument).
 
@@ -79,7 +79,7 @@ kubectl create -f flux-deployment.yaml
 You will need to provide fluxd with a service account which can access
 the namespaces you want to use Flux with. To do this, consult the
 example service account given in
-[flux-account.yaml](../deploy/flux-account.yaml) (which
+[flux-account.yaml](https://github.com/weaveworks/flux/blob/master/deploy/flux-account.yaml) (which
 puts essentially no constraints on the account) and the
 [RBAC documentation](https://kubernetes.io/docs/admin/authorization/rbac/),
 and create a service account in whichever namespace you put fluxd
diff --git a/site/internals/fluxyaml-config-files.md b/site/internals/fluxyaml-config-files.md
index 0587f87d2..2a479b677 100644
--- a/site/internals/fluxyaml-config-files.md
+++ b/site/internals/fluxyaml-config-files.md
@@ -138,11 +138,12 @@ a separate configuration file variant (`patchedUpdated`) is provided, which will
 ### Execution context of commands
 
 `generators` and `updaters` are run in a POSIX shell inside the Flux container. This means that the `command`s supplied
-should be available in the [Flux container image](../docker/Dockerfile.flux). Flux currently includes `Kustomize` and
-basic Unix shell tools. If the tools in the Flux image are not sufficient for your use case, you can include new tools
-in your own Flux-based image or, if the tools are popular enough, Flux maintainers can add them to the Flux image
-(please create an issue). In the future (once [Ephemeral containers](https://github.com/kubernetes/kubernetes/pull/59416)
-are available), you will be able to specify an container image for each command.
+should be available in the [Flux container image](https://github.com/weaveworks/flux/blob/master/docker/Dockerfile.flux).
+Flux currently includes `Kustomize` and basic Unix shell tools. If the tools in the Flux image are not sufficient for
+your use case, you can include new tools in your own Flux-based image or, if the tools are popular enough, Flux
+maintainers can add them to the Flux image (please create an issue). In the future (once [Ephemeral
+containers](https://github.com/kubernetes/kubernetes/pull/59416) are available), you will be able to specify an container
+image for each command.
 
 The working directory (also known as CWD) of the `command`s executed from a `.flux.yaml` file will be set to the
 target path (`--git-path` entry) used when finding that `.flux.yaml` file.
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index b3ad9806a..8291f1b08 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -89,8 +89,8 @@ reasons this can happen:
    both make sure this is the case.
  - When using images from ACR in AKS, the HostPath `/etc/kubernetes/azure.json`
    should be [mounted](https://kubernetes.io/docs/concepts/storage/volumes/) into the Flux Pod.
-   Set `registry.acr.enabled=True` in the [helm chart](../chart/flux/README.md)
-   or alter the [Deployment](../deploy/flux-deployment.yaml):
+   Set `registry.acr.enabled=True` in the [helm chart](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md)
+   or alter the [Deployment](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml):
    ```yaml
     spec:
       containers:

From 9d40273914cd2aa61f517e810f6ff9458219c164 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 10:37:12 +0200
Subject: [PATCH 099/158] install linkchecker, break up docs make targets, add
 link checking

---
 Makefile        | 7 ++++++-
 site/Dockerfile | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2d23a31e0..c29cb00b2 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,12 @@ check-generated: generate-deploy install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
 	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
-run-docs:
+build-docs:
 	@cd site && docker build -t flux-docs .
+
+test-docs: build-docs
+	@docker run -it flux-docs /usr/bin/linkchecker _build/html/index.html
+
+serve-docs: build-docs
 	@echo Stating docs website on http://localhost:${DOCS_PORT}/_build/html/index.html
 	@docker run -i -p ${DOCS_PORT}:8000 -e USER_ID=$$UID flux-docs
diff --git a/site/Dockerfile b/site/Dockerfile
index 8f2ac3866..2d929324e 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,6 +1,7 @@
 FROM ddidier/sphinx-doc
 
-RUN pip install 'sphinx_markdown_tables' 'recommonmark == 0.5.0'
+RUN apt update && apt install -y linkchecker && \
+    pip install 'sphinx == 2.1.1' 'sphinx_markdown_tables' 'recommonmark == 0.5.0'
 
 WORKDIR /doc
 

From 498140ba6244e86d9e9f4b3df57399ba940f5a3c Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 11:27:28 +0200
Subject: [PATCH 100/158] simplify install/ pages

---
 site/install/{installing.md => index.md} |  3 +++
 site/install/index.rst                   | 16 ----------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 rename site/install/{installing.md => index.md} (87%)
 delete mode 100644 site/install/index.rst

diff --git a/site/install/installing.md b/site/install/index.md
similarity index 87%
rename from site/install/installing.md
rename to site/install/index.md
index e471337da..54d8a29db 100644
--- a/site/install/installing.md
+++ b/site/install/index.md
@@ -11,6 +11,9 @@ cluster](./get-started.md).
 If you are using Helm, we have a [separate section about
 this](./helm-get-started.md).
 
+You can also configure a more advanced, [standalone
+setup](./standalone-setup.md).
+
 ## Next
 
 [Setup fluxctl and run the daemon](../using/fluxctl.md)
diff --git a/site/install/index.rst b/site/install/index.rst
deleted file mode 100644
index cc64e7cda..000000000
--- a/site/install/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Installing Flux
-==============================================
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
-   get-started
-   helm-get-started
-   installing
-   standalone-setup

From 45a22ede36bec4fb9e73f15a259113544f944345 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 11:30:02 +0200
Subject: [PATCH 101/158] rename 'internals' to 'features'

---
 site/faq.md                                           | 4 ++--
 site/{internals => features}/daemon.md                | 0
 site/{internals => features}/fluxyaml-config-files.md | 0
 site/{internals => features}/garbagecollection.md     | 0
 site/{internals => features}/index.rst                | 2 +-
 site/index.rst                                        | 2 +-
 site/troubleshooting.md                               | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename site/{internals => features}/daemon.md (100%)
 rename site/{internals => features}/fluxyaml-config-files.md (100%)
 rename site/{internals => features}/garbagecollection.md (100%)
 rename site/{internals => features}/index.rst (96%)

diff --git a/site/faq.md b/site/faq.md
index 84d449cd1..9f4cca470 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -123,7 +123,7 @@ The garbage collection is conservative: it is designed to not delete
 resources that were not created by fluxd. This means it will sometimes
 _not_ delete resources that _were_ created by fluxd, when
 reconfigured. Read more about garbage collection
-[here](./internals/garbagecollection.md).
+[here](./features/garbagecollection.md).
 
 ### How do I give Flux access to an image registry?
 
@@ -386,7 +386,7 @@ Flux experimentally supports technology-agnostic manifest factorization through
 `.flux.yaml` configuration files placed in the Git repository. To enable this
 feature please supply `fluxd` with flag `--manifest-generation=true`.
 
-See [`.flux.yaml` configuration files documentation](./internals/fluxyaml-config-files.md) for
+See [`.flux.yaml` configuration files documentation](./features/fluxyaml-config-files.md) for
 further details.
 
 ## Flux Helm Operator questions
diff --git a/site/internals/daemon.md b/site/features/daemon.md
similarity index 100%
rename from site/internals/daemon.md
rename to site/features/daemon.md
diff --git a/site/internals/fluxyaml-config-files.md b/site/features/fluxyaml-config-files.md
similarity index 100%
rename from site/internals/fluxyaml-config-files.md
rename to site/features/fluxyaml-config-files.md
diff --git a/site/internals/garbagecollection.md b/site/features/garbagecollection.md
similarity index 100%
rename from site/internals/garbagecollection.md
rename to site/features/garbagecollection.md
diff --git a/site/internals/index.rst b/site/features/index.rst
similarity index 96%
rename from site/internals/index.rst
rename to site/features/index.rst
index f7b7efba0..3ffca535b 100644
--- a/site/internals/index.rst
+++ b/site/features/index.rst
@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 
-Flux Internals
+Flux Features
 ==============================================
 
 .. toctree::
diff --git a/site/index.rst b/site/index.rst
index 349bc33cb..59eb74b45 100644
--- a/site/index.rst
+++ b/site/index.rst
@@ -20,7 +20,7 @@ Welcome to Flux's documentation!
    
    how-it-works
    
-   internals/index
+   features/index
    development/index
 
    faq
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 8291f1b08..00eccb5ff 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -79,7 +79,7 @@ reasons this can happen:
    present, it looks at `imagePullSecret`s attached to workloads,
    service accounts, platform-provided credentials on GCP, AWS or Azure, and
    a Docker config file if you mount one into the fluxd container (see
-   the [command-line usage](./internals/daemon.md)).
+   the [command-line usage](./features/daemon.md)).
  - When using images in ECR, from EC2, the `NodeInstanceRole` for the
    worker node running fluxd must have permissions to query the ECR
    registry (or registries) in

From 694695c40097700436bf16a6fb22640ce0d5a68e Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 11:36:23 +0200
Subject: [PATCH 102/158] fix some links

---
 site/how-it-works.md | 1 -
 site/introduction.md | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/how-it-works.md b/site/how-it-works.md
index 8bc6d8123..b3a768b64 100644
--- a/site/how-it-works.md
+++ b/site/how-it-works.md
@@ -75,4 +75,3 @@ configuration of the cluster to deploy the new images.
 
 Images can be "locked" to a specific version. "locked" images won't be
 updated by automated or manual means.
-
diff --git a/site/introduction.md b/site/introduction.md
index e6435d571..e0e9bbba3 100644
--- a/site/introduction.md
+++ b/site/introduction.md
@@ -52,5 +52,5 @@ changes by observing a predictable series of deployment events.
 
 _Find out more about [Flux's features](./how-it-works.md)._
 
-_Get started immediately by [installing Flux](../install/installing.md)._
+_Get started immediately by [installing Flux](../install/index.md)._
 

From 27e4d03a5e473e65439c2ac5eac5d45afa453483 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 11:48:42 +0200
Subject: [PATCH 103/158] fix overflowing text box

---
 site/_static/custom.css     | 14 ++++++++++++++
 site/install/get-started.md |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 site/_static/custom.css

diff --git a/site/_static/custom.css b/site/_static/custom.css
new file mode 100644
index 000000000..bb60b53d3
--- /dev/null
+++ b/site/_static/custom.css
@@ -0,0 +1,14 @@
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+  .wy-table-responsive table td {
+    /* !important prevents the common CSS stylesheets from
+       overriding this as on RTD they are loaded after this stylesheet */
+    white-space: normal !important;
+  }
+
+  .wy-table-responsive {
+    overflow: visible !important;
+  }
+
+}
diff --git a/site/install/get-started.md b/site/install/get-started.md
index 44b884e52..9d1e0c987 100644
--- a/site/install/get-started.md
+++ b/site/install/get-started.md
@@ -26,9 +26,11 @@ will work as well though.
 >
 > to avoid an error along the lines of
 >
-> `Error from server (Forbidden): error when creating "deploy/flux-account.yaml":
+> ```
+> Error from server (Forbidden): error when creating "deploy/flux-account.yaml":
 > clusterroles.rbac.authorization.k8s.io "flux" is forbidden: attempt to grant
-> extra privileges:`
+> extra privileges:
+> ```
 
 ### Set up Flux
 

From b26b553d80249dffd61378fd9643953abaedb5d4 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 18 Jun 2019 15:59:44 +0200
Subject: [PATCH 104/158] remove errorenously committed file

---
 site/_static/custom.css | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 site/_static/custom.css

diff --git a/site/_static/custom.css b/site/_static/custom.css
deleted file mode 100644
index bb60b53d3..000000000
--- a/site/_static/custom.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* override table width restrictions */
-@media screen and (min-width: 767px) {
-
-  .wy-table-responsive table td {
-    /* !important prevents the common CSS stylesheets from
-       overriding this as on RTD they are loaded after this stylesheet */
-    white-space: normal !important;
-  }
-
-  .wy-table-responsive {
-    overflow: visible !important;
-  }
-
-}

From 4c20471df08b5c4f4003caa953bde3d6dc3b82ea Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 19 Jun 2019 10:35:18 +0200
Subject: [PATCH 105/158] add custom fonts as requested by Bianca to be in line
 with other sites of us

---
 site/_static/custom.css | 15 +++++++++++++++
 site/conf.py            |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 site/_static/custom.css

diff --git a/site/_static/custom.css b/site/_static/custom.css
new file mode 100644
index 000000000..faa300bc1
--- /dev/null
+++ b/site/_static/custom.css
@@ -0,0 +1,15 @@
+@import url("https://fonts.googleapis.com/css?family=Montserrat&display=swap");
+@import url("https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap");
+
+body {
+  font-family: "Montserrat", sans-serif;
+}
+
+.rst-content pre.literal-block, .rst-content div[class^="highlight"] pre, .rst-content .linenodiv pre {
+  font-family: "Roboto Mono", monospace;
+}
+
+code {
+  font-family: "Roboto Mono", monospace;
+}
+
diff --git a/site/conf.py b/site/conf.py
index b03efbc89..5cdda0853 100644
--- a/site/conf.py
+++ b/site/conf.py
@@ -172,3 +172,6 @@
 
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html']
+
+def setup(app):
+    app.add_stylesheet('custom.css')

From e9e146c235ea8de40e79544e903e8f71394c2fee Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Wed, 19 Jun 2019 10:53:00 +0200
Subject: [PATCH 106/158] pin versions

---
 site/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/Dockerfile b/site/Dockerfile
index 2d929324e..c2bd52403 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,7 +1,9 @@
 FROM ddidier/sphinx-doc
 
 RUN apt update && apt install -y linkchecker && \
-    pip install 'sphinx == 2.1.1' 'sphinx_markdown_tables' 'recommonmark == 0.5.0'
+    pip install 'sphinx                 == 2.1.1' \
+                'sphinx_markdown_tables == 0.0.9' \
+                'recommonmark           == 0.5.0'
 
 WORKDIR /doc
 

From e11bdd751775035d347acfa371a402d63af7d8a9 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 21 Jun 2019 10:07:13 +0200
Subject: [PATCH 107/158] fix links, work around our current link issues

	- anchors in our own files [file.md#anchor]
	- links in markdown tables
	- missing symlink to font file
---
 site/Dockerfile                    |  4 ++-
 site/faq.md                        |  4 +--
 site/features/daemon.md            | 39 +++++++++++++++---------------
 site/helm/helm-integration.md      |  2 +-
 site/troubleshooting.md            |  7 +++---
 site/using/annotations-tutorial.md |  4 +--
 site/using/fluxctl.md              |  2 +-
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/site/Dockerfile b/site/Dockerfile
index c2bd52403..5413adbeb 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -9,7 +9,9 @@ WORKDIR /doc
 
 COPY . .
 
-RUN make html
+RUN make html && \
+    cd /doc/_build/html/_static/fonts/RobotoSlab && \
+    ln -s roboto-slab-v7-regular.eot roboto-slab.eot
 
 CMD ["python", "-m", "http.server", "8000"]
 
diff --git a/site/faq.md b/site/faq.md
index 9f4cca470..6453a2444 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -148,7 +148,7 @@ There are exceptions:
 
 To work around exceptional cases, you can mount a docker config into
 the Flux container. See the argument `--docker-config` in [the daemon
-arguments reference](daemon.md#flags).
+arguments reference](./features/daemon.md).
 
 See also
 [Why are my images not showing up in the list of images?](#why-are-my-images-not-showing-up-in-the-list-of-images)
@@ -231,7 +231,7 @@ service, or running your own git host, you need to supply your own
 host key(s).
 
 How to do this is documented in
-[standalone-setup.md](./standalone-setup.md#using-a-private-git-host).
+[the standalone setup doc](./install/standalone-setup.md).
 
 ### Why does my CI pipeline keep getting triggered?
 
diff --git a/site/features/daemon.md b/site/features/daemon.md
index fccddadd6..f14a07c83 100644
--- a/site/features/daemon.md
+++ b/site/features/daemon.md
@@ -35,6 +35,8 @@ Version controlling of cluster manifests provides reproducibility and a historic
 Setting up and configuring fluxd is discussed in our [standalone setup](../install/standalone-setup.md)
 document.
 
+There is also more information on [garbage collection](./garbagecollection.md) and [Git commit signing](../using/git-gpg.md).
+
 ## Flags
 
 fluxd requires setup and offers customization though a multitude of flags.
@@ -46,27 +48,24 @@ fluxd requires setup and offers customization though a multitude of flags.
 | --kubernetes-kubectl                             |                                    | optional, explicit path to kubectl tool
 | --version                                        | false                              | output the version number and exit
 | **Git repo & key etc.**
-| --git-url                                        |                                    | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
-| --git-branch                                     | `master`                           | branch of git repo to use for Kubernetes manifests
-| --git-ci-skip                                    | false                              | when set, fluxd will append `\n\n[ci skip]` to its commit messages
-| --git-ci-skip-message                            | `""`                               | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
-| --git-path                                       |                                    | path within git repo to locate Kubernetes manifests (relative path)
-| --git-user                                       | `Weave Flux`                       | username to use as git committer
-| --git-email                                      | `support@weave.works`              | email to use as git committer
-| --git-set-author                                 | false                              | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
-| --git-gpg-key-import                             |                                    | if set, fluxd will attempt to import the gpg key(s) found on the given path
-| --git-signing-key                                |                                    | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key. See [Git commit signing](git-commit-signing.md) to learn how to use this feature
-| --git-label                                      |                                    | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
-| --git-sync-tag                                   | `flux-sync`                        | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
-| --git-notes-ref                                  | `flux`                             | ref to use for keeping commit annotations in git notes
-| --git-poll-interval                              | `5m`                               | period at which to fetch any new commits from the git repo
-| --git-timeout                                    | `20s`                              | duration after which git operations time out
-| --git-secret                                     | false                              | if set, git-secret will be run on every git checkout. A gpg key must be imported using  --git-gpg-key-import or by mounting a keyring containing it directly
+| --git-url                                        |                          | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
+| --git-branch                                     | `master`                 | branch of git repo to use for Kubernetes manifests
+| --git-ci-skip                                    | false                    | when set, fluxd will append `\n\n[ci skip]` to its commit messages
+| --git-ci-skip-message                            | `""`                     | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
+| --git-path                                       |                          | path within git repo to locate Kubernetes manifests (relative path)
+| --git-user                                       | `Weave Flux`             | username to use as git committer
+| --git-email                                      | `support@weave.works`    | email to use as git committer
+| --git-set-author                                 | false                    | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
+| --git-gpg-key-import                             |                          | if set, fluxd will attempt to import the gpg key(s) found on the given path
+| --git-signing-key                                |                          | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key.
+| --git-label                                      |                          | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref
+| --git-sync-tag                                   | `flux-sync`              | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)
+| --git-notes-ref                                  | `flux`                   | ref to use for keeping commit annotations in git notes
+| --git-poll-interval                              | `5m`                     | period at which to fetch any new commits from the git repo
+| --git-timeout                                    | `20s`                    | duration after which git operations time out
 | **syncing:** control over how config is applied to the cluster
-| --sync-interval                                  | `5m`                               | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
-| --sync-garbage-collection                        | `false`                            | experimental: when set, fluxd will delete resources that it created, but are no longer present in git (see [garbage collection](./garbagecollection.md))
-| **automation (of image updates):**
-| --automation-interval                            | `5m`                               | period at which to check for image updates for automated workloads
+| --sync-interval                                  | `5m`                     | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs
+| --sync-garbage-collection                        | `false`                  | experimental: when set, fluxd will delete resources that it created, but are no longer present in git
 | **registry cache:** (none of these need overriding, usually)
 | --memcached-hostname                             | `memcached`                        | hostname for memcached service to use for caching image metadata
 | --memcached-timeout                              | `1s`                               | maximum time to wait before giving up on memcached requests
diff --git a/site/helm/helm-integration.md b/site/helm/helm-integration.md
index 5dd7a549f..457b94a4f 100644
--- a/site/helm/helm-integration.md
+++ b/site/helm/helm-integration.md
@@ -287,7 +287,7 @@ values:
     port: 4040
 ```
 
-You can use the [same annotations](./fluxctl.md#using-annotations) in
+You can use the [same annotations](../using/fluxctl.md) in
 the `HelmRelease` as you would for a Deployment or other workload,
 to control updates and automation. For the purpose of specifying
 filters, the container name is either `chart-image` (if at the top
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index 00eccb5ff..4e05a7870 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -24,7 +24,7 @@ filesystem, and use the environment entry `KUBECONFIG` to point
 may be as easy as reapplying the chart if that's what you're using.
 
 This is also documented in the
-[FAQ](./faq.md#can-i-change-the-namespace-flux-puts-things-in-by-default).
+[FAQ](./faq.md).
 
 ### `fluxctl` returns a 500 Internal Server Error
 
@@ -46,8 +46,7 @@ This means Flux can't read from and write to the git repo. Check that
  - ... that the host where your git repo lives is in
    `~/.ssh/known_hosts` in the fluxd container. We prime the container
    _image_ with host keys for `github.com`, `gitlab.com`, `bitbucket.org`, `dev.azure.com`, and `vs-ssh.visualstudio.com`, but if you're using your own git server, you'll
-   need to add its host key. See
-   [./standalone-setup.md](./install/standalone-setup.md#using-a-private-git-host).
+   need to add its host key. See [./standalone-setup.md](./install/standalone-setup.md).
 
 ### I'm using GCR/GKE and I keep seeing "Quota exceeded" in logs
 
@@ -132,7 +131,7 @@ to an existing image.
 If this appears to be a problem for you, one way to ensure each image
 build has its own creation time is to label it with a build time;
 e.g., using
-[OpenContainers pre-defined annotations](https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys).
+[OpenContainers pre-defined annotations](https://github.com/opencontainers/image-spec/blob/master/annotations.md).
 
 ### What is the "sync tag"; or, why do I see a `flux-sync` tag in my git repo?
 
diff --git a/site/using/annotations-tutorial.md b/site/using/annotations-tutorial.md
index 91e672216..85d38ae04 100644
--- a/site/using/annotations-tutorial.md
+++ b/site/using/annotations-tutorial.md
@@ -98,7 +98,7 @@ fluxcd/flux
 
 > **Note:** In this tutorial we keep things simple, so we deploy Flux into
 the `default` namespace. Normally you would pick a separate namespace for
-it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](../fluxctl.md#Connectingfluxctltothedaemon) for specifying the right
+it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](./fluxctl.md) for specifying the right
 namespace.
 
 ### Connecting to your git config
@@ -107,7 +107,7 @@ The first step is done. Flux is now and up running (you can confirm by
 running `kubectl get pods --all-namespaces`).
 
 In the second step we will use fluxctl to talk to Flux in the cluster and
-interact with the deployments. First, please [install fluxctl](../fluxctl.md#installing-fluxctl).
+interact with the deployments. First, please [install fluxctl](./fluxctl.md).
 (It enables you to drive all of Weave Flux, so have a look at the output of
 `fluxctl -h` to get a better idea.)
 
diff --git a/site/using/fluxctl.md b/site/using/fluxctl.md
index 6c42de3f6..68f57ca00 100644
--- a/site/using/fluxctl.md
+++ b/site/using/fluxctl.md
@@ -647,4 +647,4 @@ Things to notice:
 3. The value for the `flux.weave.works/tag.`... annotation should includes the filter pattern type, in this case `semver`.
 
 Annotations can also be used to tell Flux to temporarily ignore certain manifests
-using `flux.weave.works/ignore: "true"`. Read more about this in the [FAQ](faq.md#can-i-temporarily-make-flux-ignore-a-deployment).
+using `flux.weave.works/ignore: "true"`. Read more about this in the [FAQ](../faq.md).

From 1592ae7661adaf31de6129c551c7b7765517bcc0 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Fri, 21 Jun 2019 10:08:59 +0200
Subject: [PATCH 108/158] add docs tests to circleci

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 200910bd4..79507fa32 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,6 +51,7 @@ jobs:
       - run: make test TEST_FLAGS="-race -tags integration -timeout 60s"
       - run: make all
       - run: make e2e
+      - run: make test-docs
       - save_cache:
           key: cache-{{ checksum "Makefile" }}
           paths:

From 9bbbfe1741ea69d1a34a0e99752a47b66af334a9 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 2 Jul 2019 11:02:55 +0200
Subject: [PATCH 109/158] upgrade sphinx version

---
 site/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/Dockerfile b/site/Dockerfile
index 5413adbeb..dc5d285d5 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,7 +1,7 @@
 FROM ddidier/sphinx-doc
 
 RUN apt update && apt install -y linkchecker && \
-    pip install 'sphinx                 == 2.1.1' \
+    pip install 'sphinx                 == 2.1.2' \
                 'sphinx_markdown_tables == 0.0.9' \
                 'recommonmark           == 0.5.0'
 

From 55d88ed639ebbcb5ece90d505d79e399ad8a0b20 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 2 Jul 2019 11:10:02 +0200
Subject: [PATCH 110/158] Remove 'next' sections

	They are part of the read-the-docs UI already. If we want a
	specific flow in the UI, we can move docs around.

	Also make markdownlint happy in the files I touched.
---
 site/install/helm-get-started.md |  7 +------
 site/install/index.md            |  4 ----
 site/introduction.md             | 15 ++++-----------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/site/install/helm-get-started.md b/site/install/helm-get-started.md
index 6d9246250..95c028b0a 100644
--- a/site/install/helm-get-started.md
+++ b/site/install/helm-get-started.md
@@ -185,12 +185,7 @@ As you can see, the actual steps to set up Flux, get our app
 deployed, give Flux access to it and see modifications land are
 very straight-forward and are a quite natural workflow.
 
-## Next
-
-As a next step, you might want to dive deeper into [how to control
-Flux](../using/fluxctl.md) or go through our hands-on tutorial about
-driving Flux, e.g. [automations, annotations and
-locks](../using/annotations-tutorial.md).
+## A more advanced setup
 
 For a more advanced Helm setup, take a look at the [gitops-helm
 repository](https://github.com/stefanprodan/gitops-helm).
diff --git a/site/install/index.md b/site/install/index.md
index 54d8a29db..df006e80f 100644
--- a/site/install/index.md
+++ b/site/install/index.md
@@ -14,8 +14,4 @@ this](./helm-get-started.md).
 You can also configure a more advanced, [standalone
 setup](./standalone-setup.md).
 
-## Next
-
-[Setup fluxctl and run the daemon](../using/fluxctl.md)
-
 [k8s-manifests]: https://kubernetes.io/docs/concepts/configuration/overview/
diff --git a/site/introduction.md b/site/introduction.md
index e0e9bbba3..22c557d94 100644
--- a/site/introduction.md
+++ b/site/introduction.md
@@ -1,11 +1,11 @@
 # Introducing Flux
 
-Continuous delivery is a term that encapsulates a set of best practices 
-that surround building, deploying and monitoring applications. The 
-goal is to provide a sustainable model for maintaining and improving 
+Continuous delivery is a term that encapsulates a set of best practices
+that surround building, deploying and monitoring applications. The
+goal is to provide a sustainable model for maintaining and improving
 an application.
 
-Flux is a tool that automates the deployment of containers to 
+Flux is a tool that automates the deployment of containers to
 Kubernetes. It fills the automation void that exists between building
 and monitoring.
 
@@ -47,10 +47,3 @@ One final high-level feature is that Flux increases visibility of your
 application. Clear visibility of the state of a cluster is key for
 maintaining operational systems. Developers can be confident in their
 changes by observing a predictable series of deployment events.
-
-## Next
-
-_Find out more about [Flux's features](./how-it-works.md)._
-
-_Get started immediately by [installing Flux](../install/index.md)._
-

From 554da47713a57f7ff8ddb4f56ce900f47ba5fc59 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 2 Jul 2019 11:42:47 +0200
Subject: [PATCH 111/158] make markdownlint happy in a lot more places

---
 site/development/building.md               |  1 -
 site/development/get-started-developing.md | 26 ++++++---
 site/features/daemon.md                    |  6 +--
 site/features/fluxyaml-config-files.md     | 63 +++++++++-------------
 site/helm/helm-integration.md              | 12 ++---
 site/helm/helm-operator.md                 |  2 +
 site/helm/helm-upgrading-to-beta.md        | 56 +++++++++----------
 site/install/get-started.md                |  2 +-
 site/install/standalone-setup.md           |  6 +--
 site/using/annotations-tutorial.md         |  2 +-
 site/using/fluxctl.md                      |  6 +--
 site/using/git-gpg.md                      |  8 +--
 site/using/upgrading-to-1.0.md             |  2 +-
 13 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/site/development/building.md b/site/development/building.md
index 3dedca373..559cc6041 100644
--- a/site/development/building.md
+++ b/site/development/building.md
@@ -26,4 +26,3 @@ $ make ARCH=<target_arch>
 ```sh
 $ make test
 ```
-
diff --git a/site/development/get-started-developing.md b/site/development/get-started-developing.md
index 49369a523..0ccd7e7eb 100644
--- a/site/development/get-started-developing.md
+++ b/site/development/get-started-developing.md
@@ -53,11 +53,13 @@ Now that we know everything is working with `flux-getting-started`, we're going
     - [Go](https://golang.org/doc/install)
 
 1. Configure your enviroment so you can run tests.  Run:
+
     ```sh
     make test
     ```
 
 1. We want to make sure we're starting fresh.  Tell Minikube to clear any previously running clusters.
+
     ```sh
     minikube delete
     ```
@@ -68,7 +70,8 @@ Now that we know everything is working with `flux-getting-started`, we're going
     ```
 
 1. This part is really important.  You're going to set some environment variables which will intercept any images pulled by docker.  Run `minikube docker-env` to see what we're talking about.  You'll get an output that shows you what the script is doing.  Thankfully, it's not terribly complicated - it just sets some environment variables which will allow Minikube to man-in-the-middle the requests Kubernetes makes to pull images.  It will look something like this:
-    ```
+
+    ```sh
     export DOCKER_TLS_VERIFY="1"
     export DOCKER_HOST="tcp://192.168.99.128:2376"
     export DOCKER_CERT_PATH="/home/fluxrulez/.minikube/certs"
@@ -78,13 +81,14 @@ Now that we know everything is working with `flux-getting-started`, we're going
     ```
 
     So, as the script suggests, run the following command:
+
     ```sh
     eval $(minikube docker-env)
     ```
 
     Now, be warned. These are local variables.  This means that if you run this `eval` in one terminal and then switch to another for later when we build the Flux project, you're gonna hit some issues.  For one, you'll know it isn't working because Kubernetes will tell you that it can't pull the image when you run `kubectl get pods`:
 
-    ```
+    ```sh
     NAME                        READY   STATUS         RESTARTS   AGE
     flux-7f6bd57699-shx9v       0/1     ErrImagePull   0          35s
     ```
@@ -96,14 +100,17 @@ Now that we know everything is working with `flux-getting-started`, we're going
 1. Clone `git@github.com:<YOUR-GITHUB-USERNAME>/flux.git` replacing `<YOUR-GITHUB-USERNAME>` with your GitHub username.
 
     In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo.  You'll see docker's usual output as it builds the image layers.  Once it's done, you should see something like this in the middle of the output:
-    ```
+
+    ```sh
     Successfully built 606610e0f4ef
     Successfully tagged docker.io/fluxcd/flux:latest
     Successfully tagged docker.io/fluxcd/flux:master-a86167e4
     ```
+
     This confirms that a new docker image was tagged for your image.
 
 1. Open up [`deploy/flux-deployment.yaml`](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
+
     ```yaml
     spec:
       template:
@@ -125,7 +132,7 @@ Now that we know everything is working with `flux-getting-started`, we're going
 
     You should see an output similar to:
 
-    ```
+    ```sh
     serviceaccount/flux created
     clusterrole.rbac.authorization.k8s.io/flux created
     clusterrolebinding.rbac.authorization.k8s.io/flux created
@@ -143,6 +150,7 @@ Now that we know everything is working with `flux-getting-started`, we're going
     ```
 
     You should get an output that looks like:
+
     ```sh
     NAME                   READY   STATUS    RESTARTS   AGE
     flux-6f7fd5bbc-hpq85   1/1     Running   0          38s
@@ -151,14 +159,16 @@ Now that we know everything is working with `flux-getting-started`, we're going
     If (instead) you see that Ready is showing `0/1` and/or the status is `ErrImagePull` double back on the instructions and make sure you did everything correctly and in order.
 
 1. Pull the logs for your "fresh off of master" copy of Flux that you just deployed locally to Minikube:
+
     ```sh
     kubectl logs --selector=name=flux
     ```
 
     You should see an output that looks something like this:
-    ```
-    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
-    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux    successful=60 attempted=60
+
+    ```sh
+    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
+    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux    successful=60 attempted=60
     ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
     ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
     ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
@@ -170,11 +180,13 @@ Now that we know everything is working with `flux-getting-started`, we're going
 ## Make Some Changes
 
 1. Now for the part you've been waiting for!  We're going to make a cosmetic change to our local copy of Flux.  Navigate to [git/operations.go](https://github.com/weaveworks/flux/blob/master/git/operations.go).  In it, you will find a private function to this package that goes by the name `execGitCmd`.  Paste the following as the (new) first line of the function:
+
     ```go
     fmt.Println("executing git command ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ")
     ```
 
 1. Run `make` again.  Once this finishes you can check on your running pods with
+
     ```sh
     kubectl get pods --selector=name=flux
     ```
diff --git a/site/features/daemon.md b/site/features/daemon.md
index f14a07c83..1da66c8cd 100644
--- a/site/features/daemon.md
+++ b/site/features/daemon.md
@@ -8,12 +8,12 @@ Version controlling of cluster manifests provides reproducibility and a historic
 ### Flux daemon responsibilities
 
     A) Continuous Deployment
-	    1.
+        1.
         Flux daemon monitors user git repo Kubernetes manifests for changes, which it
         then deploys to the cluster.
 
-	    2.
-	    Flux daemon monitors container registry for running container image updates.
+        2.
+        Flux daemon monitors container registry for running container image updates.
         Detection of an image change (running container image tag vs container
         registry image tag) triggers k8s manifest update, which is committed to the
         user git repository, then deployed to the Kubernetes cluster.
diff --git a/site/features/fluxyaml-config-files.md b/site/features/fluxyaml-config-files.md
index 2a479b677..5844324b3 100644
--- a/site/features/fluxyaml-config-files.md
+++ b/site/features/fluxyaml-config-files.md
@@ -20,7 +20,6 @@ The main goal of `.flux.yaml` configuration files is to help deploying similar r
 * with minimal replication of resource definitions
 * while keeping Flux neutral about the factorization technology used
 
-
 ## File-access behaviour in Flux
 
 Flux performs two types of actions on raw manifest files from the Git repository:
@@ -36,9 +35,8 @@ Flux performs two types of actions on raw manifest files from the Git repository
 
 Flux can be configured to confine the scope of (1) and (2):
 
-*   To specific (sub)directories (flag` --git-path`)
-*   To a Git branch other than `master` (flag` --git-branch`)
-
+* To specific (sub)directories (flag `--git-path`)
+* To a Git branch other than `master` (flag `--git-branch`)
 
 ## Abstracting out file-access: generators and updaters
 
@@ -50,8 +48,7 @@ The configuration files are formatted in `YAML` and named `.flux.yaml`. They mus
 
 A `commandUpdated` `.flux.yaml` file has the following loosely specified format:
 
-
-```
+```yaml
 version: X
 commandUpdated:
   generators:
@@ -68,15 +65,13 @@ commandUpdated:
         command: policy_updater_command2 pu2arg1 pu2arg2 ...
 ```
 
-
 > **Note:** For a simpler approach to updates, Flux provides a `patchUpdated` configuration file variant.
 
-
 The file above is versioned (in order to account for future file format changes). Current version is `1`,
 which is enforced.
 
-Also, the file contains two generators (declared in the `generators `entry), used to generate manifests and two updaters
-(declared in the `updaters `entry), used to update resources in the Git repository.
+Also, the file contains two generators (declared in the `generators` entry), used to generate manifests and two updaters
+(declared in the `updaters` entry), used to update resources in the Git repository.
 
 The generators are meant as an alternative to Flux manifest reads (1). Each updater is split into a `containerImage`
 command and a `policy` command, covering the corresponding two types of workload manifest updates mentioned in (2).
@@ -90,8 +85,7 @@ Here is a specific `.flux.yaml` example, declaring a generator and an updater us
 (see [https://github.com/weaveworks/flux-kustomize-example](https://github.com/weaveworks/flux-kustomize-example)
 for a complete example).
 
-
-```
+```yaml
 version: 1
 commandUpdated:
   generators:
@@ -100,19 +94,18 @@ commandUpdated:
     # use https://github.com/squaremo/kubeyaml on flux-patch.yaml
     - containerImage:
         command: >-
-          cat flux-patch.yaml | 
+          cat flux-patch.yaml |
           kubeyaml image --namespace $FLUX_WL_NS --kind $FLUX_WL_KIND --name $FLUX_WL_NAME --container $FLUX_CONTAINER --image "$FLUX_IMG:$FLUX_TAG"
-          > new-flux-patch.yaml && 
+          > new-flux-patch.yaml &&
           mv new-flux-patch.yaml flux-patch.yaml
       policy:
         command: >-
-          cat flux-patch.yaml | 
+          cat flux-patch.yaml |
           kubeyaml annotate --namespace $FLUX_WL_NS --kind $FLUX_WL_KIND --name $FLUX_WL_NAME "flux.weave.works/$FLUX_POLICY=$FLUX_POLICY_VALUE"
-          > new-flux-patch.yaml && 
+          > new-flux-patch.yaml &&
           mv new-flux-patch.yaml flux-patch.yaml
 ```
 
-
 For every flux target path, Flux will look for a `.flux.yaml` file in the target path and all its parent directories.
 If a `.flux.yaml` is found:
 
@@ -120,7 +113,7 @@ If a `.flux.yaml` is found:
    them to the cluster.
 2. When making a release or updating a policy, `fluxd` will run the `updaters`, which are in charge of updating the Git
    repository to reflect the required changes in workloads.
-    * The `containerImage `updaters are invoked once for every container whose image requires updating.
+    * The `containerImage` updaters are invoked once for every container whose image requires updating.
     * The `policy` updaters are invoked once for every workload annotation which needs to be added or updated.
     * Updaters are supplied with environment variables indicating what image should be updated and what annotation to
       update (more on this later).
@@ -128,13 +121,12 @@ If a `.flux.yaml` is found:
 
     After invoking the updaters, `fluxd` will then commit and push the resulting modifications to the git repository.
 
-3. `fluxd `will ignore any other yaml files under that path (e.g. resource manifests).
+3. `fluxd` will ignore any other yaml files under that path (e.g. resource manifests).
 
 Generators and updaters are intentionally independent, in case a matching updater cannot be provided. It is hard to
 create updaters for some factorization technologies (particularly Configuration-As-Code). To improve the situation,
 a separate configuration file variant (`patchedUpdated`) is provided, which will be described later on.
 
-
 ### Execution context of commands
 
 `generators` and `updaters` are run in a POSIX shell inside the Flux container. This means that the `command`s supplied
@@ -150,8 +142,7 @@ target path (`--git-path` entry) used when finding that `.flux.yaml` file.
 
 For example, when using flux with `--git-path=staging` on a git repository with this structure:
 
-
-```
+```sh
 ├── .flux.yaml
 ├── staging/
 ├──── [...]
@@ -159,33 +150,30 @@ For example, when using flux with `--git-path=staging` on a git repository with
 └──── [...]
 ```
 
-The commands in `.flux.yaml `will be executed with their working directory set to `staging.`
+The commands in `.flux.yaml` will be executed with their working directory set to `staging.`
 
 In addition, `updaters` are provided with some environment variables:
 
 * `FLUX_WORKLOAD`: Workload to be updated. Its format is `<namespace>:<kind>/<name>` (e.g. `default:deployment/foo`).
-  For convenience (to circumvent parsing) `FLUX_WORKLOAD `is also broken down into the following environment variables:
+  For convenience (to circumvent parsing) `FLUX_WORKLOAD` is also broken down into the following environment variables:
         * `FLUX_WL_NS`
         * `FLUX_WL_KIND`
         * `FLUX_WL_NAME`
 * `containerImage` updaters are provided with:
-    * `FLUX_CONTAINER`: Name of the container within the workload whose image needs to be updated.
-    * `FLUX_IMG`: Image name which the container needs to be updated to (e.g. `nginx`).
-    * `FLUX_TAG`: Image tag which the container needs to be updated to (e.g. `1.15`).
+  * `FLUX_CONTAINER`: Name of the container within the workload whose image needs to be updated.
+  * `FLUX_IMG`: Image name which the container needs to be updated to (e.g. `nginx`).
+  * `FLUX_TAG`: Image tag which the container needs to be updated to (e.g. `1.15`).
 * `policy` updaters are provided with:
-    * `FLUX_POLICY`: the name of the policy to be added or updated in the workload. To make into an annotation name,
-      prefix with `flux.weave.works/`
-    * `FLUX_POLICY_VALUE`: value of the policy to be added or updated in the controller. If the `FLUX_POLICY_VALUE`
-      environment variable is not set, it means the policy should be removed.
-
+  * `FLUX_POLICY`: the name of the policy to be added or updated in the workload. To make into an annotation name, prefix with `flux.weave.works/`
+  * `FLUX_POLICY_VALUE`: value of the policy to be added or updated in the controller. If the `FLUX_POLICY_VALUE`
+  environment variable is not set, it means the policy should be removed.
 
 ### Combining generators, updaters and raw manifest files
 
 The `.flux.yaml` files support including multiple generators and updaters. Here is an example combining multiple
 generators:
 
-
-```
+```yaml
 version: 1
 commandUpdated:
   generators:
@@ -193,13 +181,11 @@ commandUpdated:
     - command: helm template ../charts/mychart -f overrides.yaml
 ```
 
-
 The generators/updaters will simply be executed in the presented order (top down). Flux will merge their output.
 
 Flux supports both generated manifests and raw manifests tracked in the same repository. If Flux doesn't find a
 configuration file associated to a target directory, Flux will inspect it in search for raw YAML manifest files.
 
-
 ### The `patchUpdated` configuration variant
 
 We mentioned before that, while it is simple for users to provide generator commands, matching updater commands are
@@ -210,8 +196,7 @@ and implicitly apply them to the resources printed by the `generators`.
 
 Here is an example, allowing to deploy a [Helm chart without a Tiller installation](https://jenkins-x.io/news/helm-without-tiller/)
 
-
-```
+```yaml
 version: 1
 patchUpdated:
   generators:
@@ -230,7 +215,7 @@ the patch file will be sensitive to changes in workload names, workload namespac
 Lastly, here is another example using Kustomize which is much simpler than the `commandUpdated`-based example presented
 earlier.
 
-```
+```yaml
 version: 1
 commandUpdated:
   generators:
diff --git a/site/helm/helm-integration.md b/site/helm/helm-integration.md
index 457b94a4f..930dfa5e6 100644
--- a/site/helm/helm-integration.md
+++ b/site/helm/helm-integration.md
@@ -105,8 +105,8 @@ you can reinstall it using the following command:
 $ kubectl delete hr/my-release
 ```
 
-When the Helm Operator receives a delete event from Kubernetes API it will 
-call Tiller and purge the Helm release. On the next Flux sync, the Helm Release 
+When the Helm Operator receives a delete event from Kubernetes API it will
+call Tiller and purge the Helm release. On the next Flux sync, the Helm Release
 object will be created and the Helm Operator will install it.
 
 ### What the Helm Operator does
@@ -407,7 +407,7 @@ your `repositories.yaml` file.
 
 To prepare a file, add the repo _locally_ as you would normally:
 
-```
+```sh
 helm repo add <URL> --username <username> --password <password>
 ```
 
@@ -416,15 +416,15 @@ absolute paths that will be wrong when mounted inside the
 container. Copy the file and replace all the `cache` entries with just
 the filename.
 
-```
+```sh
 cp ~/.helm/repository/repositories.yaml .
-sed -i -e 's/^\( *cache: \).*\/\(.*\.yaml\)/\1\2/g' repositories.yaml 
+sed -i -e 's/^\( *cache: \).*\/\(.*\.yaml\)/\1\2/g' repositories.yaml
 ```
 
 Now you can create a secret in the same namespace as you're running
 the Helm operator, from the repositories file:
 
-```
+```sh
 kubectl create secret generic flux-helm-repositories --from-file=./repositories.yaml
 ```
 
diff --git a/site/helm/helm-operator.md b/site/helm/helm-operator.md
index c8d75dc48..678357e6f 100644
--- a/site/helm/helm-operator.md
+++ b/site/helm/helm-operator.md
@@ -196,7 +196,9 @@ helm upgrade --install \
     flux \
     fluxcd/flux
 ```
+
 > **Note:**
+>
 > - include --tls flags for `helm` as in the `helm ls` example, if talking to a tiller with TLS
 > - optionally specify target --namespace
 
diff --git a/site/helm/helm-upgrading-to-beta.md b/site/helm/helm-upgrading-to-beta.md
index 479d5df4e..87a7c04a3 100644
--- a/site/helm/helm-upgrading-to-beta.md
+++ b/site/helm/helm-upgrading-to-beta.md
@@ -10,14 +10,14 @@ custom resources used by the old Helm operator (`FluxHelmRelease`).
 
 Here are some things to know:
 
- - The new operator will ignore the old custom resources (and the old
-   operator will ignore the new resources).
- - Deleting a resource while the corresponding operator is running
-   will result in the Helm release also being deleted
- - Deleting a `CustomResourceDefinition` will also delete all
-   custom resources of that kind.
- - If both operators are running and both new and old custom resources
-   defining a release, the operators will fight over the release.
+- The new operator will ignore the old custom resources (and the old
+  operator will ignore the new resources).
+- Deleting a resource while the corresponding operator is running
+  will result in the Helm release also being deleted
+- Deleting a `CustomResourceDefinition` will also delete all
+  custom resources of that kind.
+- If both operators are running and both new and old custom resources
+  defining a release, the operators will fight over the release.
 
 The safest way to upgrade is to avoid deletions and fights by stopping
 the old operator. Replacing it with the new one (e.g., by changing the
@@ -57,12 +57,12 @@ Helm operator. The arguments to the operator executable have changed,
 since it no longer needs the git repo to be specified (and in some
 cases, just to tidy up):
 
- - the new operator does not use the `--git-url`, `--git-charts-path`,
-   or `--git-branch` arguments, since the git repo and so on are
-   provided in each custom resource.
- - the `--queue-worker-count` argument has been removed
- - the `--chart-sync-timeout` argument has been removed
- - other arguments stay the same
+- the new operator does not use the `--git-url`, `--git-charts-path`,
+  or `--git-branch` arguments, since the git repo and so on are
+  provided in each custom resource.
+- the `--queue-worker-count` argument has been removed
+- the `--chart-sync-timeout` argument has been removed
+- other arguments stay the same
 
 It is entirely valid to run the operator with no arguments, which you
 may end up with after removing those mentioned above. It will work
@@ -80,27 +80,27 @@ explain all the details.
 
 The main differences between the old resource format and the new are:
 
- - the API version and kind have changed
- - you can now specify a chart to release either as a path in a git
-   repo, or a named, versioned chart from a Helm repo
+- the API version and kind have changed
+- you can now specify a chart to release either as a path in a git
+  repo, or a named, versioned chart from a Helm repo
 
 Here is how to change an old resource to a new resource:
 
- - change the `apiVersion` field to `flux.weave.works/v1beta1`
- - change the `kind` field to `HelmRelease`
- - you can remove the label `chart:` from the labels, if it's still
-   there, just to tidy up (it doesn't matter if it's there or not)
- - replace the field `chartGitPath`, with the structure:
+- change the `apiVersion` field to `flux.weave.works/v1beta1`
+- change the `kind` field to `HelmRelease`
+- you can remove the label `chart:` from the labels, if it's still
+  there, just to tidy up (it doesn't matter if it's there or not)
+- replace the field `chartGitPath`, with the structure:
 
-```
+```yaml
 chart:
   git: <URL to git repo>
   ref: <optional branch name>
   path: <path from top directory of git repo to chart directory>
 ```
 
- - the `values`, `releaseName`, and `valueFileSecrets` can stay as
-   they are.
+- the `values`, `releaseName`, and `valueFileSecrets` can stay as
+  they are.
 
 Note that you now give the git repo URL and branch and full path in
 each custom resource, rather than supplying arguments to the Helm
@@ -110,7 +110,7 @@ charts!)
 
 As a full example, this is an old resource:
 
-```
+```yaml
 ---
 apiVersion: helm.integrations.flux.weave.works/v1alpha2
 kind: FluxHelmRelease
@@ -127,7 +127,7 @@ spec:
 
 Say the arguments given to the old Helm operator were
 
-```
+```yaml
 args:
   - --git-url=git@example.com:user/repo
   - --git-charts-path=charts
@@ -136,7 +136,7 @@ args:
 
 Then the new custom resource would be:
 
-```
+```yaml
 ---
 apiVersion: flux.weave.works/v1beta1 # <- change API version
 kind: HelmRelease                    # <- change kind
diff --git a/site/install/get-started.md b/site/install/get-started.md
index 9d1e0c987..7973ad7d9 100644
--- a/site/install/get-started.md
+++ b/site/install/get-started.md
@@ -26,7 +26,7 @@ will work as well though.
 >
 > to avoid an error along the lines of
 >
-> ```
+> ```sh
 > Error from server (Forbidden): error when creating "deploy/flux-account.yaml":
 > clusterroles.rbac.authorization.k8s.io "flux" is forbidden: attempt to grant
 > extra privileges:
diff --git a/site/install/standalone-setup.md b/site/install/standalone-setup.md
index 6713d3943..cb323d028 100644
--- a/site/install/standalone-setup.md
+++ b/site/install/standalone-setup.md
@@ -141,13 +141,13 @@ To use the ConfigMap every time the Flux daemon restarts, you'll need
 to mount it into the container. The example deployment manifest
 includes an example of doing this, commented out. Uncomment those two blocks:
 
-```
+```yaml
       - name: ssh-config
         configMap:
           name: flux-ssh-config
 ```
 
-```
+```yaml
         - name: ssh-config
           mountPath: /root/.ssh
 ```
@@ -158,7 +158,7 @@ manifest.
 Another alternative is to create the configmap from a template. This could be
 something like:
 
-```
+```yaml
 apiVersion: v1
 data:
   known_hosts: |
diff --git a/site/using/annotations-tutorial.md b/site/using/annotations-tutorial.md
index 85d38ae04..a86da9d18 100644
--- a/site/using/annotations-tutorial.md
+++ b/site/using/annotations-tutorial.md
@@ -1,6 +1,6 @@
 # Driving Flux - automations, locks and annotations
 
-In this tutorial we want to get a better feel for what we can do with 
+In this tutorial we want to get a better feel for what we can do with
 Flux. We won't spend too much time with getting it up and running, so let's
 get that out of the way first.
 
diff --git a/site/using/fluxctl.md b/site/using/fluxctl.md
index 68f57ca00..c14dc7db0 100644
--- a/site/using/fluxctl.md
+++ b/site/using/fluxctl.md
@@ -171,7 +171,7 @@ Using an SSH key allows you to maintain control of the repository. You
 can revoke permission for `flux` to access the repository at any time
 by removing the deploy key.
 
-```
+```sh
 fluxctl helps you deploy your code.
 
 Connecting:
@@ -425,7 +425,7 @@ notifications and history. Whether the customization is possible, depends on the
 
 When building images it is often useful to tag build images by the branch that they were built against for example:
 
-```
+```sh
 quay.io/weaveworks/helloworld:master-9a16ff945b9e
 ```
 
@@ -538,7 +538,7 @@ retrieves from the registry.
 
 `fluxctl` provides the following flags for the message and author customization:
 
-```
+```sh
   -m, --message string      attach a message to the update
       --user    string      override the user reported as initiating the update
 ```
diff --git a/site/using/git-gpg.md b/site/using/git-gpg.md
index adfc19095..6bb9c2eab 100644
--- a/site/using/git-gpg.md
+++ b/site/using/git-gpg.md
@@ -15,7 +15,7 @@ The signing of commits (and the sync tag) requires two flags to be set:
 
 1. `--git-gpg-key-import` should be set to the path(s) Flux should look
    for GPG key(s) to import, this can be direct paths to keys and/or
-   the paths to folders Flux should scan for files. 
+   the paths to folders Flux should scan for files.
 2. `--git-signing-key` should be set to the ID of the key Flux should
    use to sign commits, this can be the full fingerprint or the long
    ID, for example: `700D397C988079BFF0DDAFED6A7436E8790F8689` (or
@@ -119,7 +119,7 @@ directory it will be made available for use by Flux.
    metadata:
      creationTimestamp: null
      name: flux-gpg-signing-key
-  ```
+   ```
 
 3. Adapt your Flux deployment to mount the secret and enable the
    signing of commits:
@@ -162,8 +162,8 @@ directory it will be made available for use by Flux.
 understand symbolic links to files.
 
 > **Note:** Flux will automatically add any imported key to the GnuPG
-  trustdb. This is required as git will otherwise not trust signatures
-  made with the imported keys.
+> trustdb. This is required as git will otherwise not trust signatures
+> made with the imported keys.
 
 ## Signature verification
 
diff --git a/site/using/upgrading-to-1.0.md b/site/using/upgrading-to-1.0.md
index 2273ac8ea..163e993be 100644
--- a/site/using/upgrading-to-1.0.md
+++ b/site/using/upgrading-to-1.0.md
@@ -97,7 +97,7 @@ to expose the Flux service.
 
 Before making any changes, get the config so that it can be consulted later:
 
-```
+```sh
 ./fluxctl_030 get-config --fingerprint=md5 | tee old-config.yaml
 ```
 

From b0ddc24933aba978d341b828f6b9bc9c232f5b0f Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 29 Jul 2019 14:15:48 +0200
Subject: [PATCH 112/158] add requirements.txt file for docs creation, add
 readthedocs.yml file too

---
 .readthedocs.yml      | 23 +++++++++++++++++++++++
 site/Dockerfile       |  6 +++---
 site/requirements.txt |  3 +++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 .readthedocs.yml
 create mode 100644 site/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000..013e4bd6e
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,23 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: site/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: site/requirements.txt
diff --git a/site/Dockerfile b/site/Dockerfile
index dc5d285d5..dab83daaa 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,9 +1,9 @@
 FROM ddidier/sphinx-doc
 
+COPY requirements.txt .
+
 RUN apt update && apt install -y linkchecker && \
-    pip install 'sphinx                 == 2.1.2' \
-                'sphinx_markdown_tables == 0.0.9' \
-                'recommonmark           == 0.5.0'
+    pip install -r requirements.txt
 
 WORKDIR /doc
 
diff --git a/site/requirements.txt b/site/requirements.txt
new file mode 100644
index 000000000..867be2716
--- /dev/null
+++ b/site/requirements.txt
@@ -0,0 +1,3 @@
+sphinx                 == 2.1.2
+sphinx_markdown_tables == 0.0.9
+recommonmark           == 0.5.0

From 6bdc55bc42f048085fbb38e280e5575bf320cf52 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 29 Jul 2019 14:44:41 +0200
Subject: [PATCH 113/158] remove upgrade docs from indexes

---
 docs/helm/index.rst  | 14 ++++++++++++++
 docs/using/index.rst | 16 ++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 docs/helm/index.rst
 create mode 100644 docs/using/index.rst

diff --git a/docs/helm/index.rst b/docs/helm/index.rst
new file mode 100644
index 000000000..ae257ba69
--- /dev/null
+++ b/docs/helm/index.rst
@@ -0,0 +1,14 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Using Flux with Helm
+==============================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   helm-integration
+   helm-operator
diff --git a/docs/using/index.rst b/docs/using/index.rst
new file mode 100644
index 000000000..3cff57133
--- /dev/null
+++ b/docs/using/index.rst
@@ -0,0 +1,16 @@
+.. Flux documentation documentation master file, created by
+   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Using Flux
+==============================================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Contents:
+
+   annotations-tutorial
+   fluxctl
+   git-gpg
+   monitoring

From fffd8d3550693180f671bd047c215ea40cf013ae Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 29 Jul 2019 14:48:39 +0200
Subject: [PATCH 114/158] rename  site/  to  docs/

---
 .gitignore                                    |   2 +-
 .readthedocs.yml                              |   4 +-
 CONTRIBUTING.md                               |   8 ++--
 Makefile                                      |   2 +-
 README.md                                     |  36 +++++++++---------
 chart/flux/Chart.yaml                         |   2 +-
 chart/flux/README.md                          |  10 ++---
 chart/flux/templates/NOTES.txt                |   2 +-
 daemon/errors.go                              |   2 +-
 deploy/flux-deployment.yaml                   |   2 +-
 {site => docs}/Dockerfile                     |   0
 {site => docs}/Makefile                       |   0
 {site => docs}/_static/custom.css             |   0
 {site => docs}/conf.py                        |   0
 {site => docs}/development/building.md        |   0
 .../development/get-started-developing.md     |   0
 {site => docs}/development/index.rst          |   0
 {site => docs}/faq.md                         |   0
 {site => docs}/features/daemon.md             |   0
 .../features/fluxyaml-config-files.md         |   2 +-
 {site => docs}/features/garbagecollection.md  |   0
 {site => docs}/features/index.rst             |   0
 {site => docs}/helm/helm-integration.md       |   0
 {site => docs}/helm/helm-operator.md          |   0
 {site => docs}/helm/helm-upgrading-to-beta.md |   0
 {site => docs}/how-it-works.md                |   0
 {site => docs}/images/deployment-pipeline.png | Bin
 {site => docs}/images/flux-cd-diagram.png     | Bin
 {site => docs}/images/weave-flux.png          | Bin
 {site => docs}/index.rst                      |   0
 {site => docs}/install/get-started.md         |   0
 {site => docs}/install/helm-get-started.md    |   0
 {site => docs}/install/index.md               |   0
 {site => docs}/install/standalone-setup.md    |   0
 {site => docs}/introduction.md                |   0
 {site => docs}/requirements.md                |   0
 {site => docs}/requirements.txt               |   0
 {site => docs}/troubleshooting.md             |   0
 {site => docs}/using/annotations-tutorial.md  |   0
 {site => docs}/using/fluxctl.md               |   2 +-
 {site => docs}/using/git-gpg.md               |   0
 {site => docs}/using/monitoring.md            |   0
 {site => docs}/using/upgrading-to-1.0.md      |   0
 git/errors.go                                 |   2 +-
 install/templates/flux-deployment.yaml.tmpl   |   2 +-
 internal_docs/releasing.md                    |   2 +-
 release/errors.go                             |   2 +-
 remote/errors.go                              |   4 +-
 site/helm/index.rst                           |  15 --------
 site/using/index.rst                          |  17 ---------
 50 files changed, 43 insertions(+), 75 deletions(-)
 rename {site => docs}/Dockerfile (100%)
 rename {site => docs}/Makefile (100%)
 rename {site => docs}/_static/custom.css (100%)
 rename {site => docs}/conf.py (100%)
 rename {site => docs}/development/building.md (100%)
 rename {site => docs}/development/get-started-developing.md (100%)
 rename {site => docs}/development/index.rst (100%)
 rename {site => docs}/faq.md (100%)
 rename {site => docs}/features/daemon.md (100%)
 rename {site => docs}/features/fluxyaml-config-files.md (99%)
 rename {site => docs}/features/garbagecollection.md (100%)
 rename {site => docs}/features/index.rst (100%)
 rename {site => docs}/helm/helm-integration.md (100%)
 rename {site => docs}/helm/helm-operator.md (100%)
 rename {site => docs}/helm/helm-upgrading-to-beta.md (100%)
 rename {site => docs}/how-it-works.md (100%)
 rename {site => docs}/images/deployment-pipeline.png (100%)
 rename {site => docs}/images/flux-cd-diagram.png (100%)
 rename {site => docs}/images/weave-flux.png (100%)
 rename {site => docs}/index.rst (100%)
 rename {site => docs}/install/get-started.md (100%)
 rename {site => docs}/install/helm-get-started.md (100%)
 rename {site => docs}/install/index.md (100%)
 rename {site => docs}/install/standalone-setup.md (100%)
 rename {site => docs}/introduction.md (100%)
 rename {site => docs}/requirements.md (100%)
 rename {site => docs}/requirements.txt (100%)
 rename {site => docs}/troubleshooting.md (100%)
 rename {site => docs}/using/annotations-tutorial.md (100%)
 rename {site => docs}/using/fluxctl.md (99%)
 rename {site => docs}/using/git-gpg.md (100%)
 rename {site => docs}/using/monitoring.md (100%)
 rename {site => docs}/using/upgrading-to-1.0.md (100%)
 delete mode 100644 site/helm/index.rst
 delete mode 100644 site/using/index.rst

diff --git a/.gitignore b/.gitignore
index 712ce26bc..87bc93bcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,4 @@ test/bin/helm
 test/bin/kind
 
 # Docs
-site/_build
+docs/_build
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 013e4bd6e..a36db8a13 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -7,7 +7,7 @@ version: 2
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-  configuration: site/conf.py
+  configuration: docs/conf.py
 
 # Build documentation with MkDocs
 #mkdocs:
@@ -20,4 +20,4 @@ formats: all
 python:
   version: 3.7
   install:
-    - requirements: site/requirements.txt
+    - requirements: docs/requirements.txt
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ab45719fa..b27307bd5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,8 +18,8 @@ the `blocked-needs-validation` label is removed, and the issue can be worked
 on.
 
 To set up Flux to test things, there's documentation about setting up a
-[standalone install](site/get-started.md) and a [Helm
-install](site/helm-get-started.md), which might be helpful.
+[standalone install](docs/get-started.md) and a [Helm
+install](docs/helm-get-started.md), which might be helpful.
 
 Please talk to us on Slack, if you should get stuck anywhere. We appreciate
 any help and look forward to talking to you soon!
@@ -73,10 +73,10 @@ This is a rough outline of how to prepare a contribution:
 
 ### How to build and run the project
 
-Refer to the [building doc](site/building.md) to find out how to build from
+Refer to the [building doc](docs/building.md) to find out how to build from
 source.
 
-Refer to the [Get Started Developing](site/get-started-developing.md) guide for a walkthrough on developing Flux locally.
+Refer to the [Get Started Developing](docs/get-started-developing.md) guide for a walkthrough on developing Flux locally.
 
 ### How to run the test suite
 
diff --git a/Makefile b/Makefile
index c29cb00b2..e8e812a17 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ check-generated: generate-deploy install/generated_templates.gogen.go
 	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
 
 build-docs:
-	@cd site && docker build -t flux-docs .
+	@cd docs && docker build -t flux-docs .
 
 test-docs: build-docs
 	@docker run -it flux-docs /usr/bin/linkchecker _build/html/index.html
diff --git a/README.md b/README.md
index d6b3d4c8d..2268cf22e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ change is atomic and transactional, git has your audit log. Each transaction
 either fails or succeeds cleanly. You're entirely code centric and don't need
 new infrastructure.
 
-![Deployment Pipeline](site/images/flux-cd-diagram.png)
+![Deployment Pipeline](docs/images/flux-cd-diagram.png)
 
 [![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
 [![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
@@ -46,9 +46,9 @@ container images and config changes are propagated to the cluster.
 
 Its major features are:
 
-- [Automated git → cluster synchronisation](/site/introduction.md#automated-git-cluster-synchronisation)
-- [Automated deployment of new container images](/site/introduction.md#automated-deployment-of-new-container-images)
-- [Integrations with other devops tools](/site/introduction.md#integrations-with-other-devops-tools) ([Helm](/site/helm-integration.md) and more)
+- [Automated git → cluster synchronisation](/docs/introduction.md#automated-git-cluster-synchronisation)
+- [Automated deployment of new container images](/docs/introduction.md#automated-deployment-of-new-container-images)
+- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/helm-integration.md) and more)
 - No additional service or infrastructure needed - Flux lives inside your
   cluster
 - Straight-forward control over the state of deployments in the
@@ -99,21 +99,21 @@ could easily integrate.
 Get started by browsing through the documentation below:
 
 - Background about Flux
-  - [Introduction to Flux](/site/introduction.md)
-  - [FAQ](/site/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [How it works](/site/how-it-works.md)
-  - [Considerations regarding installing Flux](/site/installing.md)
-  - [Flux <-> Helm integration](/site/helm-integration.md)
+  - [Introduction to Flux](/docs/introduction.md)
+  - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
+  - [How it works](/docs/how-it-works.md)
+  - [Considerations regarding installing Flux](/docs/installing.md)
+  - [Flux <-> Helm integration](/docs/helm-integration.md)
 - Get Started with Flux
-  - [Standalone Flux](/site/get-started.md)
-  - [Flux using Helm](/site/helm-get-started.md)
-  - [Automation: annotations and locks](/site/annotations-tutorial.md)
+  - [Standalone Flux](/docs/get-started.md)
+  - [Flux using Helm](/docs/helm-get-started.md)
+  - [Automation: annotations and locks](/docs/annotations-tutorial.md)
 - Operating Flux
-  - [Using fluxctl to control Flux](/site/fluxctl.md)
-  - [Helm Operator](/site/helm-operator.md)
-  - [Troubleshooting](/site/troubleshooting.md)
+  - [Using fluxctl to control Flux](/docs/fluxctl.md)
+  - [Helm Operator](/docs/helm-operator.md)
+  - [Troubleshooting](/docs/troubleshooting.md)
   - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [Upgrading to Flux v1](/site/upgrading-to-1.0.md)
+  - [Upgrading to Flux v1](/docs/upgrading-to-1.0.md)
 
 ### Integrations
 
@@ -142,14 +142,14 @@ To familiarise yourself with the project and how things work, you might
 be interested in the following:
 
 - [Our contributions guidelines](CONTRIBUTING.md)
-- [Build documentation](/site/building.md)
+- [Build documentation](/docs/building.md)
 - [Release documentation](/internal_docs/releasing.md)
 
 ## <a name="help"></a>Getting Help
 
 If you have any questions about Flux and continuous delivery:
 
-- Read [the Flux docs](https://github.com/fluxcd/flux/tree/master/site).
+- Read [the Flux docs](https://github.com/fluxcd/flux/tree/master/docs).
 - Invite yourself to the <a href="https://slack.cncf.io" target="_blank">CNCF community</a>
   slack and ask a question on the [#flux](https://cloud-native.slack.com/messages/flux/)
   channel.
diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
index 124406bd8..9fb256b33 100644
--- a/chart/flux/Chart.yaml
+++ b/chart/flux/Chart.yaml
@@ -11,6 +11,6 @@ maintainers:
   - name: stefanprodan
     email: stefan@weave.works
 engine: gotpl
-icon: https://raw.githubusercontent.com/fluxcd/flux/master/site/images/weave-flux.png
+icon: https://raw.githubusercontent.com/fluxcd/flux/master/docs/images/weave-flux.png
 keywords:
   - gitops
diff --git a/chart/flux/README.md b/chart/flux/README.md
index d2994253b..3b946dc4d 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -22,7 +22,7 @@ This means fluxd can fail to apply changes to HelmRelease resources.
 ### Helm
 
 Tiller should be running in the cluster, though
-[helm-operator](../../site/helm-operator.md) will wait
+[helm-operator](../../docs/helm-operator.md) will wait
 until it can find one.
 
 # Git repo
@@ -37,7 +37,7 @@ until it can find one.
 ## Installation
 
 We put together a simple [Get Started
-guide](../../site/helm-get-started.md) which takes about 5-10 minutes to follow.
+guide](../../docs/helm-get-started.md) which takes about 5-10 minutes to follow.
 You will have a fully working Flux installation deploying workloads to your cluster.
 
 ## Installing Flux using Helm
@@ -154,7 +154,7 @@ The [configuration](#configuration) section lists all the parameters that can be
 #### Setup Git deploy
 
 At startup Flux generates a SSH key and logs the public key.
-Find the SSH public key by installing [fluxctl](../../site/fluxctl.md) and
+Find the SSH public key by installing [fluxctl](../../docs/fluxctl.md) and
 running:
 
 ```sh
@@ -288,8 +288,8 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `helmOperator.affinity`                           | `{}`                                                 | Affinity properties for the helmOperator deployment
 | `kube.config`                                     | [See values.yaml](/chart/flux/values.yaml#L151-L165) | Override for kubectl default config in the Flux pod(s).
 | `prometheus.enabled`                              | `false`                                              | If enabled, adds prometheus annotations to Flux and helmOperator pod(s)
-| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/site/garbagecollection.md))
-| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/site/garbagecollection.md))
+| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/docs/garbagecollection.md))
+| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/docs/garbagecollection.md))
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
 
diff --git a/chart/flux/templates/NOTES.txt b/chart/flux/templates/NOTES.txt
index aa7acd329..d81e12603 100644
--- a/chart/flux/templates/NOTES.txt
+++ b/chart/flux/templates/NOTES.txt
@@ -3,7 +3,7 @@ Get the Git deploy key by either (a) running
   kubectl -n {{ .Release.Namespace }} logs deployment/{{ .Release.Name }} | grep identity.pub | cut -d '"' -f2
 
 or by (b) installing fluxctl through
-https://github.com/weaveworks/flux/blob/master/site/fluxctl.md#installing-fluxctl
+https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md#installing-fluxctl
 and running:
 
   fluxctl identity
diff --git a/daemon/errors.go b/daemon/errors.go
index 45a36f2bf..384c585ed 100644
--- a/daemon/errors.go
+++ b/daemon/errors.go
@@ -28,7 +28,7 @@ giving this error:
 Check that any files mentioned are well-formed, and resources are not
 defined more than once. It's also worth reviewing
 
-    https://github.com/weaveworks/flux/blob/master/site/requirements.md
+    https://github.com/weaveworks/flux/blob/master/docs/requirements.md
 
 to make sure you're not running into any corner cases.
 
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index fba7272e5..6e4012671 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -35,7 +35,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/site/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs/standalone-setup.md#using-a-private-git-host
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config
diff --git a/site/Dockerfile b/docs/Dockerfile
similarity index 100%
rename from site/Dockerfile
rename to docs/Dockerfile
diff --git a/site/Makefile b/docs/Makefile
similarity index 100%
rename from site/Makefile
rename to docs/Makefile
diff --git a/site/_static/custom.css b/docs/_static/custom.css
similarity index 100%
rename from site/_static/custom.css
rename to docs/_static/custom.css
diff --git a/site/conf.py b/docs/conf.py
similarity index 100%
rename from site/conf.py
rename to docs/conf.py
diff --git a/site/development/building.md b/docs/development/building.md
similarity index 100%
rename from site/development/building.md
rename to docs/development/building.md
diff --git a/site/development/get-started-developing.md b/docs/development/get-started-developing.md
similarity index 100%
rename from site/development/get-started-developing.md
rename to docs/development/get-started-developing.md
diff --git a/site/development/index.rst b/docs/development/index.rst
similarity index 100%
rename from site/development/index.rst
rename to docs/development/index.rst
diff --git a/site/faq.md b/docs/faq.md
similarity index 100%
rename from site/faq.md
rename to docs/faq.md
diff --git a/site/features/daemon.md b/docs/features/daemon.md
similarity index 100%
rename from site/features/daemon.md
rename to docs/features/daemon.md
diff --git a/site/features/fluxyaml-config-files.md b/docs/features/fluxyaml-config-files.md
similarity index 99%
rename from site/features/fluxyaml-config-files.md
rename to docs/features/fluxyaml-config-files.md
index 5844324b3..130259ec1 100644
--- a/site/features/fluxyaml-config-files.md
+++ b/docs/features/fluxyaml-config-files.md
@@ -26,7 +26,7 @@ Flux performs two types of actions on raw manifest files from the Git repository
 
 1. Read manifest files when performing a sync operation (i.e making sure that the status of the cluster reflects what's
    in the manifest files, adjusting it if necessary)
-2. Update the manifest files of [workload](https://github.com/weaveworks/flux/blob/master/site/fluxctl.md#what-is-a-workload).
+2. Update the manifest files of [workload](https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md#what-is-a-workload).
    Specifically, flux can update:
     * container images, when releasing a new image version. A release can happen manually or automatically, when a new
       container image is pushed to a repository.
diff --git a/site/features/garbagecollection.md b/docs/features/garbagecollection.md
similarity index 100%
rename from site/features/garbagecollection.md
rename to docs/features/garbagecollection.md
diff --git a/site/features/index.rst b/docs/features/index.rst
similarity index 100%
rename from site/features/index.rst
rename to docs/features/index.rst
diff --git a/site/helm/helm-integration.md b/docs/helm/helm-integration.md
similarity index 100%
rename from site/helm/helm-integration.md
rename to docs/helm/helm-integration.md
diff --git a/site/helm/helm-operator.md b/docs/helm/helm-operator.md
similarity index 100%
rename from site/helm/helm-operator.md
rename to docs/helm/helm-operator.md
diff --git a/site/helm/helm-upgrading-to-beta.md b/docs/helm/helm-upgrading-to-beta.md
similarity index 100%
rename from site/helm/helm-upgrading-to-beta.md
rename to docs/helm/helm-upgrading-to-beta.md
diff --git a/site/how-it-works.md b/docs/how-it-works.md
similarity index 100%
rename from site/how-it-works.md
rename to docs/how-it-works.md
diff --git a/site/images/deployment-pipeline.png b/docs/images/deployment-pipeline.png
similarity index 100%
rename from site/images/deployment-pipeline.png
rename to docs/images/deployment-pipeline.png
diff --git a/site/images/flux-cd-diagram.png b/docs/images/flux-cd-diagram.png
similarity index 100%
rename from site/images/flux-cd-diagram.png
rename to docs/images/flux-cd-diagram.png
diff --git a/site/images/weave-flux.png b/docs/images/weave-flux.png
similarity index 100%
rename from site/images/weave-flux.png
rename to docs/images/weave-flux.png
diff --git a/site/index.rst b/docs/index.rst
similarity index 100%
rename from site/index.rst
rename to docs/index.rst
diff --git a/site/install/get-started.md b/docs/install/get-started.md
similarity index 100%
rename from site/install/get-started.md
rename to docs/install/get-started.md
diff --git a/site/install/helm-get-started.md b/docs/install/helm-get-started.md
similarity index 100%
rename from site/install/helm-get-started.md
rename to docs/install/helm-get-started.md
diff --git a/site/install/index.md b/docs/install/index.md
similarity index 100%
rename from site/install/index.md
rename to docs/install/index.md
diff --git a/site/install/standalone-setup.md b/docs/install/standalone-setup.md
similarity index 100%
rename from site/install/standalone-setup.md
rename to docs/install/standalone-setup.md
diff --git a/site/introduction.md b/docs/introduction.md
similarity index 100%
rename from site/introduction.md
rename to docs/introduction.md
diff --git a/site/requirements.md b/docs/requirements.md
similarity index 100%
rename from site/requirements.md
rename to docs/requirements.md
diff --git a/site/requirements.txt b/docs/requirements.txt
similarity index 100%
rename from site/requirements.txt
rename to docs/requirements.txt
diff --git a/site/troubleshooting.md b/docs/troubleshooting.md
similarity index 100%
rename from site/troubleshooting.md
rename to docs/troubleshooting.md
diff --git a/site/using/annotations-tutorial.md b/docs/using/annotations-tutorial.md
similarity index 100%
rename from site/using/annotations-tutorial.md
rename to docs/using/annotations-tutorial.md
diff --git a/site/using/fluxctl.md b/docs/using/fluxctl.md
similarity index 99%
rename from site/using/fluxctl.md
rename to docs/using/fluxctl.md
index c14dc7db0..76e992f58 100644
--- a/site/using/fluxctl.md
+++ b/docs/using/fluxctl.md
@@ -556,7 +556,7 @@ Commit customization
         --git-user
         --git-email
 
-        See [site/daemon.md] for more information.
+        See [docs/daemon.md] for more information.
 
     3. Commit author
 
diff --git a/site/using/git-gpg.md b/docs/using/git-gpg.md
similarity index 100%
rename from site/using/git-gpg.md
rename to docs/using/git-gpg.md
diff --git a/site/using/monitoring.md b/docs/using/monitoring.md
similarity index 100%
rename from site/using/monitoring.md
rename to docs/using/monitoring.md
diff --git a/site/using/upgrading-to-1.0.md b/docs/using/upgrading-to-1.0.md
similarity index 100%
rename from site/using/upgrading-to-1.0.md
rename to docs/using/upgrading-to-1.0.md
diff --git a/git/errors.go b/git/errors.go
index 05272fed7..c3827c574 100644
--- a/git/errors.go
+++ b/git/errors.go
@@ -16,7 +16,7 @@ We need to clone a git repo to proceed, and you haven't supplied
 one. Please upload a config file, including a git repository URL, as
 described in
 
-    https://github.com/weaveworks/flux/blob/master/site/fluxctl.md
+    https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md
 
 `,
 }
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
index 692c8bec4..abcbcbcb9 100644
--- a/install/templates/flux-deployment.yaml.tmpl
+++ b/install/templates/flux-deployment.yaml.tmpl
@@ -36,7 +36,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/site/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs/standalone-setup.md#using-a-private-git-host
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config
diff --git a/internal_docs/releasing.md b/internal_docs/releasing.md
index 330ce00da..5b7b126d2 100644
--- a/internal_docs/releasing.md
+++ b/internal_docs/releasing.md
@@ -4,7 +4,7 @@ The release process needs to do these things:
 
  - create a new release on GitHub, with a tag
  - push Docker image(s) to Docker Hub
- - possibly upload the [`fluxctl` binaries](/site/fluxctl.md#binary-releases) to the GitHub release
+ - possibly upload the [`fluxctl` binaries](/docs/fluxctl.md#binary-releases) to the GitHub release
  - make sure the version is entered into the checkpoint database so that up-to-date checks report back accurate information
  - close out the GitHub milestone that was used to track the release
 
diff --git a/release/errors.go b/release/errors.go
index 314bc1516..92f2f28c0 100644
--- a/release/errors.go
+++ b/release/errors.go
@@ -14,7 +14,7 @@ func MakeReleaseError(err error) *fluxerr.Error {
 This may be because of a limitation in the formats of file Flux can
 deal with. See
 
-    https://github.com/weaveworks/flux/blob/master/site/requirements.md
+    https://github.com/weaveworks/flux/blob/master/docs/requirements.md
 
 for those limitations.
 
diff --git a/remote/errors.go b/remote/errors.go
index 584215402..3add0d187 100644
--- a/remote/errors.go
+++ b/remote/errors.go
@@ -22,7 +22,7 @@ and try the operation again.
 Otherwise, please consult the installation instructions in our
 documentation:
 
-    https://github.com/weaveworks/flux/blob/master/site/installing.md
+    https://github.com/weaveworks/flux/blob/master/docs/installing.md
 
 If you are still stuck, please log an issue:
 
@@ -89,7 +89,7 @@ Otherwise, it is likely to be an ongoing problem until fluxd is
 updated and/or redeployed. For help, please consult the installation
 instructions:
 
-    https://github.com/weaveworks/flux/blob/master/site/installing.md
+    https://github.com/weaveworks/flux/blob/master/docs/installing.md
 
 If you are still stuck, please log an issue:
 
diff --git a/site/helm/index.rst b/site/helm/index.rst
deleted file mode 100644
index 8123af843..000000000
--- a/site/helm/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Using Flux with Helm
-==============================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-   helm-integration
-   helm-operator
-   helm-upgrading-to-beta
diff --git a/site/using/index.rst b/site/using/index.rst
deleted file mode 100644
index 01b4e1438..000000000
--- a/site/using/index.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Using Flux
-==============================================
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
-   annotations-tutorial
-   fluxctl
-   git-gpg
-   monitoring
-   upgrading-to-1.0

From d2d804477d022a28aba272a2c0ca49abca9c9f96 Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Mon, 29 Jul 2019 15:21:12 +0200
Subject: [PATCH 115/158] fix index of docs/install by moving to .rst

---
 docs/install/index.rst | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 docs/install/index.rst

diff --git a/docs/install/index.rst b/docs/install/index.rst
new file mode 100644
index 000000000..a2400b939
--- /dev/null
+++ b/docs/install/index.rst
@@ -0,0 +1,28 @@
+======================
+Prerequisites for Flux
+======================
+
+All you need is a Kubernetes cluster and a git repo. The git repo
+contains `manifests <https://kubernetes.io/docs/concepts/configuration/overview/>`_
+(as YAML files) describing what should run in the cluster. Flux imposes
+:doc:`some requirements <../requirements>` on these files.
+
+Installing Weave Flux
+=====================
+
+Here are the instructions to :doc:`install Flux on your own
+cluster <./get-started>`.
+
+If you are using Helm, we have a :doc:`separate section about
+this <./helm-get-started>`.
+
+You can also configure a more advanced, :doc:`standalone
+setup <./standalone-setup>`.
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Contents:
+
+   get-started
+   helm-get-started
+   standalone-setup

From 11b487b6aa154fcef35fe91a5e3ef6e14fd2f774 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 29 Jul 2019 17:11:20 +0200
Subject: [PATCH 116/158] Re-gen deploy/ due to change in tmpl file

---
 install/generated_templates.gogen.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index 9ea292880..6492412fe 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,39 +19,39 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 27, 10, 13, 8, 679282456, time.UTC),
+			modTime: time.Date(2019, 7, 29, 15, 6, 44, 400020755, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 305203208, time.UTC),
+			modTime:          time.Date(2019, 7, 29, 12, 22, 48, 930282528, time.UTC),
 			uncompressedSize: 836,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x92\x4b\xaf\xd3\x30\x10\x85\xf7\xfe\x15\x47\xba\x8b\x0b\xe8\x26\xa8\x3b\x94\x5d\xdb\x05\x0b\x10\x8b\xf0\xd8\x20\x16\x63\x7b\x42\x4d\x5d\x3b\xf2\x23\x3c\xa2\xfc\x77\x94\xa4\x95\x9a\xb6\x20\x55\xba\x3b\x7b\x7c\xc6\x73\xe6\xe8\x2b\x8a\x42\x3c\xe0\xd3\x8e\x11\x39\x74\x46\x31\x48\x29\x9f\x5d\x7a\x82\xb2\x39\x26\x0e\x08\xde\x72\x7c\x02\x39\xbd\x28\x41\x1a\xa7\x8d\xfb\x0e\x0a\x2c\x1e\xe0\x9d\xfd\x0d\xc7\xac\x59\xa3\xf1\x01\xef\xb2\xe4\xe0\x38\x71\xc4\x4f\x93\x76\x53\x4b\x21\x29\xb2\x1e\x27\x70\x8c\x50\xde\xa5\xe0\x2d\x5e\xd4\x9b\xf5\xf6\x65\x29\xa8\x35\x5f\x38\x44\xe3\x5d\x85\x6e\x25\xf6\xc6\xe9\x0a\x1f\x67\x57\xeb\xd9\x94\x38\x70\x22\x4d\x89\x2a\x01\x58\x92\x6c\xe3\x78\x02\x1c\x1d\xb8\x42\x63\xf3\x2f\x71\x7e\xe9\x7b\x98\x06\xe5\x07\x3a\x70\x6c\x49\x31\x86\xe1\xf8\x3e\x5d\x2b\xf4\xfd\xf2\xb5\xef\xc1\x4e\x0f\x83\x18\x73\x39\x37\x14\x24\xa9\x92\x72\xda\xf9\x60\xfe\x50\x32\xde\x95\xfb\x37\xb1\x34\xfe\x75\xb7\x92\x9c\xe8\xe4\x77\x3b\x27\x54\x7b\xcb\xf7\x9a\x15\x21\x5b\x9e\x24\x05\xa8\x35\x6f\x83\xcf\x6d\xac\xf0\xf5\xf1\xd5\xe3\xb7\xa9\x2f\x70\xf4\x39\x28\x5e\x14\x3b\x0e\xf2\xac\x50\xc0\x79\x57\x1f\x85\x9f\xeb\xf7\xff\xd6\x3e\xc3\x86\x9b\x99\x80\xfb\x17\xf5\x96\x6b\x6e\x46\xd1\x69\xd1\xff\xcc\x17\xc0\x75\xb6\x8b\xff\x62\x96\x3f\x58\xa5\x63\x76\x37\xc1\xb9\xb2\x73\x89\xc1\x25\x27\xb7\xc8\xb0\x71\x3c\x69\x6e\x28\xdb\x34\xa3\x32\x12\xf5\x37\x00\x00\xff\xff\xfd\x7f\x67\x6a\x44\x03\x00\x00"),
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 27, 10, 13, 8, 678261702, time.UTC),
+			modTime:          time.Date(2019, 7, 29, 15, 6, 44, 400020755, time.UTC),
 			uncompressedSize: 5901,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\x4b\x52\x1e\x97\xe4\x85\x29\x84\xb6\x06\x17\x84\xbe\xa9\xb3\xaa\x78\x16\xac\x5d\x88\x45\xed\x54\x2b\x3c\x86\xf2\x64\x67\x07\x45\x7d\xaa\x88\xca\x85\xb4\x66\xa3\xb6\xc3\x27\x80\x78\xf0\x51\xd4\x79\x72\x98\xde\xb3\x45\xc2\xf6\xad\x69\xcb\x76\xcd\x1a\x97\x51\xc8\x58\x9d\x4f\xa6\x6c\xaf\xa8\xe4\x93\x52\xb4\x08\x02\x0a\xb5\xd9\xa0\x63\x4c\xed\x25\x74\x97\x6e\xc4\xcd\x90\xa1\x28\x2e\xcd\x11\x63\x4f\xab\x0a\xec\xb3\xb2\x51\xdb\x4a\xd4\xa3\x21\xca\x97\x20\x0c\xa0\xf1\xee\x10\x7c\xf8\x35\x12\xfd\x3a\x07\x61\x0a\x68\x8c\xb4\x15\x83\x79\xe0\x8f\xde\x7e\x0c\xd9\x16\xa6\x18\xa4\xa0\x69\x83\x04\x85\xd4\xa5\xfb\x2c\x03\x1c\x86\x6f\xc8\x40\xc2\xf6\x64\x06\x02\x50\x78\x0b\xaa\x62\x18\x85\x77\xf7\xef\x02\x46\xc0\x0b\x76\x8b\xd4\xd6\x28\x33\x2a\x67\xe7\x5a\x74\x6a\xa3\x64\xc0\x73\xa8\x1b\x57\x5b\x42\x7a\xf9\x27\x02\x39\x48\x89\xe8\x12\xa3\xc8\x01\x62\x7d\x7f\x22\x70\x20\xdc\x76\xbc\xc5\x8f\x44\x6c\x5b\x6f\x19\x5e\x28\x09\xcd\x14\xa1\x9f\x3d\x82\xd1\xe7\x7c\x17\x30\xba\x0f\xe7\x70\x51\xcf\xda\x43\xd2\x40\xba\xa8\x3b\x0c\x30\x6a\x2c\xcc\x72\xee\x91\xe4\x67\xa0\x2a\xb1\xc5\x58\xfd\xcc\x90\xc1\x5b\x65\x8a\xe0\x73\xc5\xa8\xe3\x50\x8e\x55\x1b\x11\x47\xa3\x20\x64\x6c\x09\xac\x9c\x04\x1e\x23\x40\xf8\x01\x16\x18\x13\x0a\x2b\x77\xe8\x02\x34\xb8\x33\x70\xf0\x62\x08\x5f\x9f\x4b\x1e\x09\x78\x5c\x60\xcd\x5e\x6c\x81\xad\xcd\x06\x9a\xa0\x2a\x87\x4e\xa8\xb2\x41\x8c\x2c\xc2\x8f\x7c\x95\xad\x6e\xb2\x9b\x29\xed\x7d\xa3\xf5\xbd\xd5\x4a\x1e\x72\x78\xbf\xb9\xb3\xfe\xde\x21\xa5\x9e\x38\x24\xdb\x38\x89\x94\x42\xbd\xc3\xff\x37\x48\x7e\x72\x06\x20\xeb\x26\x87\xbf\x5c\x57\x93\xc3\x2a\x74\x83\x1c\xfe\xfa\xfd\x47\x35\x4e\x12\xd6\xa5\xcc\x8b\x31\x3b\xf7\x61\xaa\xb8\xb9\xbe\xe1\xe6\xaa\xcc\xc6\xba\x2a\x94\xad\xd0\x03\x75\x52\x63\x13\x19\x97\x9b\x3d\x44\xd0\xbe\x17\xbe\xcc\x61\x89\x5e\x86\x58\x14\x4b\xa2\x92\xa7\x16\x1b\xe7\x28\xd0\xb6\xbb\x1e\x5b\xd5\xa2\x01\x65\x62\x78\x9e\x53\xe4\x21\x2a\x97\x93\x5b\x1d\xa3\x20\x8a\x4f\x46\x1f\x72\xf0\xae\x41\x96\xc6\x1d\x3d\x5c\xa8\x75\x87\x43\x5c\x01\x35\xba\x8d\x75\x12\x59\x68\x6c\xe1\xdc\xc1\x1f\x33\x3c\xed\xb2\x53\xdb\x5b\xe1\x3a\xdb\x23\xd9\xb7\x99\x9f\x94\xd3\x7b\x23\x75\x13\x2e\x3a\x0f\x22\x11\x8f\x7b\x10\x88\x9d\xee\x89\xc6\xdc\xb7\xe6\x1f\x98\xf5\xa4\x69\x0e\x60\x00\x05\x4a\x2d\x1c\x0f\x20\x6b\xdb\x26\xb5\xfa\x95\xae\x15\x6f\x73\xea\xbc\xb3\xd6\x2f\x33\xa2\xf2\x51\x07\x84\x99\x68\x9d\x8d\x88\x3a\x8b\x9a\xe7\x3d\x49\x22\x01\x4d\xab\x9c\x35\x01\xbf\x62\x6b\x98\x7d\xf8\xf2\xd3\xcf\xaf\x3f\xdd\xbd\x7d\xff\x6e\x16\x11\x6b\xce\xf1\xb0\x2d\x3a\x37\x6d\x2f\x89\x98\x80\xc8\xeb\x43\x04\x7f\xaf\x2f\xf9\x78\xd6\x17\xce\x7d\x1c\x8b\x93\x89\x1f\x75\x94\x21\x9a\xc7\xe8\x5e\x1b\x23\x4a\xd2\x39\x3b\xeb\x42\x4e\x12\x11\xa7\xfd\x37\x4d\x7a\x68\xbe\xfd\x20\x29\x0c\x08\xed\xd1\x19\x1e\x14\xcf\x2c\xde\x38\x5b\x71\x59\xf4\x0d\x76\x0e\x82\xb8\xdc\xba\x26\xc0\x61\xd0\x56\xee\xe8\x3c\xd9\x68\xda\xfc\x42\x5c\xc6\x70\x4f\xe2\xd2\x0a\xdd\xe0\x59\x4c\x9e\x2a\xe2\xd3\x1a\xe8\x5b\xc4\x57\x2a\x80\x3b\xd4\xb4\x33\x7d\xa5\x37\x3d\x52\x97\x4c\x15\x9b\xf1\x84\x6e\x8a\x0f\xa3\xd1\xac\x32\x9f\xf8\x10\xd3\x10\x17\x0e\x2c\x18\x33\xa5\x90\x25\x16\x1c\xd9\x34\xb5\xc3\x10\xc4\x49\xe4\xb0\xcc\x13\x29\xd6\x75\x53\x4e\xc2\xd0\x2d\x4c\x81\x71\x1e\x94\xf0\xa0\x4f\x4d\x5d\xeb\x03\x07\x82\xd2\x50\x8c\xb3\x86\xdf\x5b\xb6\xb2\xe1\x94\x86\x82\x0b\xdb\x5d\xc8\x03\x94\x76\x1f\x96\x19\x6b\x0c\x4a\x1f\xe6\x10\x3f\x0d\xdd\x62\x31\x38\x10\xa6\x54\x56\x7e\x3b\x1c\x65\x5d\x8b\xce\xa8\x95\x99\xd4\x0d\x4f\xbe\x19\xe3\x97\x4e\x43\xf2\x85\xe2\x55\x1b\x43\xf1\x3a\x92\xbe\xbf\x9f\x38\xc5\xb7\x8e\xd0\x87\x65\x69\x9a\xd8\xd1\x86\x9e\x9e\x57\x52\xef\x98\x32\xac\x2f\x09\x02\xa7\x16\x77\xd4\xb7\x57\x93\x99\x40\x11\x54\x0d\x85\x75\x2e\x44\x4f\x61\x11\xab\x69\x1d\x70\x3d\x74\xe3\xb0\xc5\xbd\xe8\x57\xa3\x97\xa9\x2d\xfd\xdd\x8a\x55\xc8\x43\x44\xb2\xcc\x4d\x0c\x61\x2c\x8c\xf8\xbe\x28\x94\xbb\x3d\x43\xfd\xd4\xac\xcf\xc9\x2c\x30\x26\xef\xcb\xe7\x5f\xe2\xb6\x29\xcc\x36\x7e\x7b\xa7\x7c\xd8\x80\x48\x79\xeb\x0e\x03\x5a\xbd\xe5\x39\x66\xa2\x9c\x7b\x50\xe3\xf4\xed\xf1\x08\xd9\x3b\xe5\x59\x52\x78\xb4\x98\x52\xac\x9d\x30\xb2\xec\x89\x7e\x0a\x7f\xc5\xe7\x0b\xb5\x09\x47\x7c\x37\xe8\x12\x67\x2d\x7c\xe0\x7b\x08\x69\xa0\x7f\x5a\x65\x12\x86\xd9\x7c\xd6\xbd\x82\x68\xc2\x94\x9d\x27\x81\xf3\x56\xb5\x17\x26\x94\x9f\x43\xce\xaa\x8c\x03\x68\x25\x8c\xda\xf0\x68\xc2\x05\x4a\xaa\x40\x17\x7d\x3d\x19\xf2\xc2\xf6\x66\x09\xa1\x31\x05\xba\x93\x00\x3a\xd4\xc2\xab\x16\xa1\x0e\x66\x75\xe9\xdd\x4e\x82\x78\x52\xf0\x83\x73\xd4\xac\x0b\xe5\x56\xf3\xf8\xf3\xbb\xe1\x49\x67\x0c\x4e\x78\xb2\xb9\x14\x9c\xf0\x0e\xd2\x47\xb5\xa7\xba\x20\xe0\x0b\xa1\xbb\xc4\xdf\x10\xba\x21\x73\x4c\x03\x97\xf9\x7f\xae\x84\xba\x68\x00\xf2\x87\x5e\x42\x4f\x35\x3e\x4a\x5d\x04\x5d\xe4\x7b\xba\xb7\x1c\x50\x34\xe1\xa1\x83\xe3\xc4\xdd\x40\xf9\x93\x5d\x24\x8d\x55\x87\xab\x1d\x6a\xde\x7e\x05\x46\x7b\x8e\x4e\x16\x73\xdd\xfe\x7d\x87\x07\x50\xc5\x8f\x03\xd9\x57\x5a\x65\x62\x15\x8b\x10\xbe\x71\x38\x59\x88\x2e\xe8\x0a\x9f\x0f\x8b\x81\x9e\x1e\xf7\xdd\xe0\x6f\xbe\x0f\x40\x02\x89\xc2\xc0\xac\xa9\xc9\x3b\x14\xd5\xac\x07\xac\x44\xc8\x0b\xcc\xb6\xd9\x1c\xfe\xc3\xf3\x3e\xbc\xd6\xb6\x29\x5e\x66\x61\xdf\xf3\x76\xc7\xf3\x1b\x41\x2d\x9c\x57\xb2\xd1\xc2\x41\xf7\xd4\xd0\x49\x39\xc5\xda\x4e\xeb\xed\x9e\x78\xa5\x90\x2c\x2b\x0b\x7b\x44\x16\x17\x09\x51\xab\xe5\x49\xf5\x33\x5b\x50\x74\x2b\xd6\x72\xf5\xdd\xcd\xf9\xff\xa9\xc3\x0f\xe8\xda\x0b\xaf\x78\x3c\x76\x8c\x8d\x86\xb3\xf6\x43\x8a\x78\x62\xc7\x48\xe9\x22\xea\xa2\x4f\x9e\x06\x9f\x27\xaf\x8b\xc9\x33\x21\xbb\x18\xf6\xd9\xd0\xfa\xa7\xb8\xa4\x15\x79\x34\x8b\xce\x84\xdb\xfc\xe6\xfa\x66\x75\xd5\x55\xf4\xab\xa2\x50\x71\x43\x60\x3c\x7b\xc5\xed\x7c\x02\x1d\xe3\xf7\xb1\xa5\x1d\x8f\xe0\x02\x3a\x3e\xc1\xbd\x08\x6f\xb4\x93\x5b\x30\xfe\xd6\x2b\xf8\x54\x77\xe2\xdf\xdc\x3d\xf4\xbd\x88\xe6\xdd\x88\xd4\xb8\xae\x33\x81\x29\xac\x27\xb0\x81\x18\x2a\x71\x08\x9b\x95\x6e\xc7\x1d\xdb\x90\xb6\x76\xd7\xd4\xa0\x88\x1a\x24\xb0\x06\xc8\x56\x08\x1f\x9a\x35\x3a\x83\x1e\x09\xc2\x83\x10\x8d\x2b\x74\x61\xa8\x5f\xde\x66\x77\xd6\xe0\x2c\xfd\xf2\x3a\x18\x90\x2e\xd1\x51\x39\x4d\xf7\xea\x7e\xd4\x09\xf6\x4d\xbe\x0c\x53\xd8\x6c\x35\xbb\xfa\x23\x00\x00\xff\xff\x3d\xd9\xc4\x43\x0d\x17\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\xcb\xc2\x4a\x5a\x92\x17\xa6\x10\xda\x1a\x5c\x10\xfa\xa6\xce\xaa\xe2\x59\xb0\x76\x21\x16\xb5\x53\xad\xf0\x18\xca\x93\x9d\x1d\x14\xf5\xa9\x22\x2a\x17\xd2\x9a\x8d\xda\x0e\x9f\x00\xe2\xc1\x47\x51\xe7\xc9\x61\x7a\xcf\x16\x09\xdb\xb7\xa6\x2d\xdb\x35\x6b\x5c\x46\x21\x63\x75\x3e\x99\xb2\xbd\xa2\x92\x4f\x4a\xd1\x22\x08\x28\xd4\x66\x83\x8e\x31\xb5\x97\xd0\x5d\xba\x11\x37\x43\x86\xa2\xb8\x34\x47\x8c\x3d\xad\x2a\xb0\xcf\xca\x46\x6d\x2b\x51\x8f\x86\x28\x5f\x82\x30\x80\xc6\xbb\x43\xf0\xe1\xd7\x48\xf4\xeb\x1c\x84\x29\xa0\x31\xd2\x56\x0c\xe6\x81\x3f\x7a\xfb\x31\x64\x5b\x98\x62\x90\x82\xa6\x0d\x12\x14\x52\x97\xee\xb3\x0c\x70\x18\xbe\x21\x03\x09\xdb\x93\x19\x08\x40\xe1\x2d\xa8\x8a\x61\x14\xde\xdd\xbf\x0b\x18\x01\x2f\xd8\x2d\x52\x5b\xa3\xcc\xa8\x9c\x9d\x6b\xd1\xa9\x8d\x92\x01\xcf\xa1\x6e\x5c\x6d\x09\xe9\xe5\x9f\x08\xe4\x20\x25\xa2\x4b\x8c\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xf1\x16\x3f\x12\xb1\x6d\xbd\x65\x78\xa1\x24\x34\x53\x84\x7e\xf6\x08\x46\x9f\xf3\x5d\xc0\xe8\x3e\x9c\xc3\x45\x3d\x6b\x0f\x49\x03\xe9\xa2\xee\x30\xc0\xa8\xb1\x30\xcb\xb9\x47\x92\x9f\x81\xaa\xc4\x16\x63\xf5\x33\x43\x06\x6f\x95\x29\x82\xcf\x15\xa3\x8e\x43\x39\x56\x6d\x44\x1c\x8d\x82\x90\xb1\x25\xb0\x72\x12\x78\x8c\x00\xe1\x07\x58\x60\x4c\x28\xac\xdc\xa1\x0b\xd0\xe0\xce\xc0\xc1\x8b\x21\x7c\x7d\x2e\x79\x24\xe0\x71\x81\x35\x7b\xb1\x05\xb6\x36\x1b\x68\x82\xaa\x1c\x3a\xa1\xca\x06\x31\xb2\x08\x3f\xf2\x55\xb6\xba\xc9\x6e\xa6\xb4\xf7\x8d\xd6\xf7\x56\x2b\x79\xc8\xe1\xfd\xe6\xce\xfa\x7b\x87\x94\x7a\xe2\x90\x6c\xe3\x24\x52\x0a\xf5\x0e\xff\xdf\x20\xf9\xc9\x19\x80\xac\x9b\x1c\xfe\x72\x5d\x4d\x0e\xab\xd0\x0d\x72\xf8\xeb\xf7\x1f\xd5\x38\x49\x58\x97\x32\x2f\xc6\xec\xdc\x87\xa9\xe2\xe6\xfa\x86\x9b\xab\x32\x1b\xeb\xaa\x50\xb6\x42\x0f\xd4\x49\x8d\x4d\x64\x5c\x6e\xf6\x10\x41\xfb\x5e\xf8\x32\x87\x25\x7a\x19\x62\x51\x2c\x89\x4a\x9e\x5a\x6c\x9c\xa3\x40\xdb\xee\x7a\x6c\x55\x8b\x06\x94\x89\xe1\x79\x4e\x91\x87\xa8\x5c\x4e\x6e\x75\x8c\x82\x28\x3e\x19\x7d\xc8\xc1\xbb\x06\x59\x1a\x77\xf4\x70\xa1\xd6\x1d\x0e\x71\x05\xd4\xe8\x36\xd6\x49\x64\xa1\xb1\x85\x73\x07\x7f\xcc\xf0\xb4\xcb\x4e\x6d\x6f\x85\xeb\x6c\x8f\x64\xdf\x66\x7e\x52\x4e\xef\x8d\xd4\x4d\xb8\xe8\x3c\x88\x44\x3c\xee\x41\x20\x76\xba\x27\x1a\x73\xdf\x9a\x7f\x60\xd6\x93\xa6\x39\x80\x01\x14\x28\xb5\x70\x3c\x80\xac\x6d\x9b\xd4\xea\x57\xba\x56\xbc\xcd\xa9\xf3\xce\x5a\xbf\xcc\x88\xca\x47\x1d\x10\x66\xa2\x75\x36\x22\xea\x2c\x6a\x9e\xf7\x24\x89\x04\x34\xad\x72\xd6\x04\xfc\x8a\xad\x61\xf6\xe1\xcb\x4f\x3f\xbf\xfe\x74\xf7\xf6\xfd\xbb\x59\x44\xac\x39\xc7\xc3\xb6\xe8\xdc\xb4\xbd\x24\x62\x02\x22\xaf\x0f\x11\xfc\xbd\xbe\xe4\xe3\x59\x5f\x38\xf7\x71\x2c\x4e\x26\x7e\xd4\x51\x86\x68\x1e\xa3\x7b\x6d\x8c\x28\x49\xe7\xec\xac\x0b\x39\x49\x44\x9c\xf6\xdf\x34\xe9\xa1\xf9\xf6\x83\xa4\x30\x20\xb4\x47\x67\x78\x50\x3c\xb3\x78\xe3\x6c\xc5\x65\xd1\x37\xd8\x39\x08\xe2\x72\xeb\x9a\x00\x87\x41\x5b\xb9\xa3\xf3\x64\xa3\x69\xf3\x0b\x71\x19\xc3\x3d\x89\x4b\x2b\x74\x83\x67\x31\x79\xaa\x88\x4f\x6b\xa0\x6f\x11\x5f\xa9\x00\xee\x50\xd3\xce\xf4\x95\xde\xf4\x48\x5d\x32\x55\x6c\xc6\x13\xba\x29\x3e\x8c\x46\xb3\xca\x7c\xe2\x43\x4c\x43\x5c\x38\xb0\x60\xcc\x94\x42\x96\x58\x70\x64\xd3\xd4\x0e\x43\x10\x27\x91\xc3\x32\x4f\xa4\x58\xd7\x4d\x39\x09\x43\xb7\x30\x05\xc6\x79\x50\xc2\x83\x3e\x35\x75\xad\x0f\x1c\x08\x4a\x43\x31\xce\x1a\x7e\x6f\xd9\xca\x86\x53\x1a\x0a\x2e\x6c\x77\x21\x0f\x50\xda\x7d\x58\x66\xac\x31\x28\x7d\x98\x43\xfc\x34\x74\x8b\xc5\xe0\x40\x98\x52\x59\xf9\xed\x70\x94\x75\x2d\x3a\xa3\x56\x66\x52\x37\x3c\xf9\x66\x8c\x5f\x3a\x0d\xc9\x17\x8a\x57\x6d\x0c\xc5\xeb\x48\xfa\xfe\x7e\xe2\x14\xdf\x3a\x42\x1f\x96\xa5\x69\x62\x47\x1b\x7a\x7a\x5e\x49\xbd\x63\xca\xb0\xbe\x24\x08\x9c\x5a\xdc\x51\xdf\x5e\x4d\x66\x02\x45\x50\x35\x14\xd6\xb9\x10\x3d\x85\x45\xac\xa6\x75\xc0\xf5\xd0\x8d\xc3\x16\xf7\xa2\x5f\x8d\x5e\xa6\xb6\xf4\x77\x2b\x56\x21\x0f\x11\xc9\x32\x37\x31\x84\xb1\x30\xe2\xfb\xa2\x50\xee\xf6\x0c\xf5\x53\xb3\x3e\x27\xb3\xc0\x98\xbc\x2f\x9f\x7f\x89\xdb\xa6\x30\xdb\xf8\xed\x9d\xf2\x61\x03\x22\xe5\xad\x3b\x0c\x68\xf5\x96\xe7\x98\x89\x72\xee\x41\x8d\xd3\xb7\xc7\x23\x64\xef\x94\x67\x49\xe1\xd1\x62\x4a\xb1\x76\xc2\xc8\xb2\x27\xfa\x29\xfc\x15\x9f\x2f\xd4\x26\x1c\xf1\xdd\xa0\x4b\x9c\xb5\xf0\x81\xef\x21\xa4\x81\xfe\x69\x95\x49\x18\x66\xf3\x59\xf7\x0a\xa2\x09\x53\x76\x9e\x04\xce\x5b\xd5\x5e\x98\x50\x7e\x0e\x39\xab\x32\x0e\xa0\x95\x30\x6a\xc3\xa3\x09\x17\x28\xa9\x02\x5d\xf4\xf5\x64\xc8\x0b\xdb\x9b\x25\x84\xc6\x14\xe8\x4e\x02\xe8\x50\x0b\xaf\x5a\x84\x3a\x98\xd5\xa5\x77\x3b\x09\xe2\x49\xc1\x0f\xce\x51\xb3\x2e\x94\x5b\xcd\xe3\xcf\xef\x86\x27\x9d\x31\x38\xe1\xc9\xe6\x52\x70\xc2\x3b\x48\x1f\xd5\x9e\xea\x82\x80\x2f\x84\xee\x12\x7f\x43\xe8\x86\xcc\x31\x0d\x5c\xe6\xff\xb9\x12\xea\xa2\x01\xc8\x1f\x7a\x09\x3d\xd5\xf8\x28\x75\x11\x74\x91\xef\xe9\xde\x72\x40\xd1\x84\x87\x0e\x8e\x13\x77\x03\xe5\x4f\x76\x91\x34\x56\x1d\xae\x76\xa8\x79\xfb\x15\x18\xed\x39\x3a\x59\xcc\x75\xfb\xf7\x1d\x1e\x40\x15\x3f\x0e\x64\x5f\x69\x95\x89\x55\x2c\x42\xf8\xc6\xe1\x64\x21\xba\xa0\x2b\x7c\x3e\x2c\x06\x7a\x7a\xdc\x77\x83\xbf\xf9\x3e\x00\x09\x24\x0a\x03\xb3\xa6\x26\xef\x50\x54\xb3\x1e\xb0\x12\x21\x2f\x30\xdb\x66\x73\xf8\x0f\xcf\xfb\xf0\x5a\xdb\xa6\x78\x99\x85\x7d\xcf\xdb\x1d\xcf\x6f\x04\xb5\x70\x5e\xc9\x46\x0b\x07\xdd\x53\x43\x27\xe5\x14\x6b\x3b\xad\xb7\x7b\xe2\x95\x42\xb2\xac\x2c\xec\x11\x59\x5c\x24\x44\xad\x96\x27\xd5\xcf\x6c\x41\xd1\xad\x58\xcb\xd5\x77\x37\xe7\xff\xa7\x0e\x3f\xa0\x6b\x2f\xbc\xe2\xf1\xd8\x31\x36\x1a\xce\xda\x0f\x29\xe2\x89\x1d\x23\xa5\x8b\xa8\x8b\x3e\x79\x1a\x7c\x9e\xbc\x2e\x26\xcf\x84\xec\x62\xd8\x67\x43\xeb\x9f\xe2\x92\x56\xe4\xd1\x2c\x3a\x13\x6e\xf3\x9b\xeb\x9b\xd5\x55\x57\xd1\xaf\x8a\x42\xc5\x0d\x81\xf1\xec\x15\xb7\xf3\x09\x74\x8c\xdf\xc7\x96\x76\x3c\x82\x0b\xe8\xf8\x04\xf7\x22\xbc\xd1\x4e\x6e\xc1\xf8\x5b\xaf\xe0\x53\xdd\x89\x7f\x73\xf7\xd0\xf7\x22\x9a\x77\x23\x52\xe3\xba\xce\x04\xa6\xb0\x9e\xc0\x06\x62\xa8\xc4\x21\x6c\x56\xba\x1d\x77\x6c\x43\xda\xda\x5d\x53\x83\x22\x6a\x90\xc0\x1a\x20\x5b\x21\x7c\x68\xd6\xe8\x0c\x7a\x24\x08\x0f\x42\x34\xae\xd0\x85\xa1\x7e\x79\x9b\xdd\x59\x83\xb3\xf4\xcb\xeb\x60\x40\xba\x44\x47\xe5\x34\xdd\xab\xfb\x51\x27\xd8\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xea\x8f\x00\x00\x00\xff\xff\x83\x3b\x2d\xb6\x0d\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 306300582, time.UTC),
+			modTime:          time.Date(2019, 7, 29, 12, 22, 48, 930282528, time.UTC),
 			uncompressedSize: 137,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x54\xca\x31\x0a\xc2\x40\x10\x85\xe1\x7e\x4f\xf1\x2e\xb0\x82\xed\x1c\x42\x0b\xc1\x7e\xc8\xbe\xc8\x62\xb2\x19\x93\x89\x18\x86\xdc\x5d\x14\x1b\xcb\x9f\xff\xcb\x39\x27\xb5\x7a\xe5\xbc\xd4\xa9\x09\x9e\xc7\x74\xaf\xad\x08\x2e\xec\x66\x7a\x1a\xe9\x5a\xd4\x55\x12\xd0\x74\xa4\xa0\x1f\xd6\x57\xbe\x55\xcf\x85\x36\x4c\x5b\x04\x6a\x8f\xc3\x49\x47\x2e\xa6\x1d\xb1\xef\x3f\xfa\x4d\x41\xc4\xff\x8d\x00\x5b\xf9\x30\xdf\x8c\x82\xb3\xe9\x63\x65\x7a\x07\x00\x00\xff\xff\x40\x21\xa1\xbb\x89\x00\x00\x00"),
 		},
 		"/memcache-dep.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-dep.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 306879513, time.UTC),
+			modTime:          time.Date(2019, 7, 29, 12, 22, 48, 930282528, time.UTC),
 			uncompressedSize: 874,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x93\xcd\x6e\x9c\x40\x10\x84\xef\x3c\x45\x49\x7b\x0d\x1b\x61\x69\x2f\xdc\xa2\x38\x89\x2c\x25\xd6\x5e\x9c\x7b\x7b\x68\xf0\x28\xf3\x97\xe9\x66\xb3\x04\xf9\xdd\xa3\xd9\x5f\x36\xf6\x9c\x80\xaa\xaf\xa7\xa6\x80\xba\xae\xab\x15\x3c\x7b\x43\xe6\x85\x3b\x74\x9c\x5c\x9c\x3c\x07\xc5\x28\xdc\xe1\x79\xc2\x57\x37\xee\xa1\x11\x07\x47\xb5\x82\x89\x41\xc9\x06\xce\xb0\x9e\x06\x86\x67\xa5\x8e\x94\xd6\x15\x25\xfb\x93\xb3\xd8\x18\x5a\x50\x4a\xf2\x71\xd7\x54\xbf\x6c\xe8\x5a\xdc\x5f\xc6\x56\x67\x7b\x5b\x01\x81\x3c\xb7\xd7\xdd\xe7\x19\xb6\xc7\xfa\x91\x3c\x4b\x22\xc3\x78\x7d\x3d\x99\x0e\xb7\x2d\xe6\xf9\x56\x9d\x67\x70\xe8\x8a\x4d\x12\x9b\x32\x31\x73\x72\xd6\x90\xb4\x68\x2a\x40\xd8\xb1\xd1\x98\x8b\x02\x78\x52\xf3\xf2\x9d\x9e\xd9\xc9\xf1\xc1\x9b\x00\x15\xa0\xec\x93\x23\xe5\x13\xb2\x08\x5b\x96\xbb\xa1\xdf\xe3\x81\x73\x94\xb2\x2e\x5d\x5d\x98\xfa\x5d\xa6\xac\x43\x9b\x0b\xa1\x6d\xd6\x9b\x75\xb3\xb9\xd5\xb7\xa3\x73\xdb\xe8\xac\x99\x5a\x3c\xf4\x8f\x51\xb7\x99\xa5\xd4\x7a\x76\x51\x1e\x16\xf9\x6a\xd4\x1e\x9b\xe6\x0e\xc0\x0a\x3f\x68\x6f\xfd\xe8\xcb\x0e\x31\x4f\xe5\x95\x8e\xc2\x1f\x60\x03\x3c\x0f\xf4\x3c\x29\xcb\x12\x7c\xc0\xc6\xe3\x06\x14\xfb\x97\xd1\xc7\x8c\x18\x18\x56\xd9\x2f\xed\x09\x4d\x73\xd7\x34\x58\xe1\x9e\x7b\x1a\x9d\x22\xc5\x7c\xcd\xb5\x2a\x9e\xdd\xee\x78\xf9\x14\x4c\xf4\x87\x8f\x4c\x23\x06\x56\xb8\x38\x08\x62\x0f\x26\xf3\x82\xcc\xbf\x47\x16\x05\x85\x0e\x99\x25\xc5\x20\xbc\xbe\x0c\x2a\x53\x6f\x4e\x78\xec\xd3\x38\xcb\x41\xaf\x07\x58\x74\xbf\x8d\x59\xdb\x63\xba\x8b\x2c\x6c\xc6\x6c\x75\xfa\x1c\x83\xf2\x5e\xdb\x05\x97\xc7\xf0\x49\x9e\x84\xf3\xff\xcc\x49\xfa\x96\xe3\x98\xde\x6a\xe4\x5c\xfc\xb3\xcd\x76\x67\x1d\x0f\xfc\x45\x0c\x39\xd2\xc3\xaf\xd0\x93\x13\xae\xfe\x05\x00\x00\xff\xff\x5d\x9a\x63\xab\x6a\x03\x00\x00"),
 		},
 		"/memcache-svc.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "memcache-svc.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 27, 10, 1, 12, 307499265, time.UTC),
+			modTime:          time.Date(2019, 7, 29, 12, 22, 48, 930282528, time.UTC),
 			uncompressedSize: 206,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8c\x3d\x0e\x02\x21\x10\x46\x7b\x4e\xf1\x5d\x00\x13\x2c\x39\x84\x8d\x89\xfd\x04\x3e\x23\x51\x58\x02\x64\x9b\xc9\xde\xdd\xb0\x6b\xe3\x76\xf3\xf3\xde\xb3\xd6\x1a\xa9\xe9\xc1\xd6\xd3\x52\x3c\x56\x67\xde\xa9\x44\x8f\x3b\xdb\x9a\x02\x4d\xe6\x90\x28\x43\xbc\x01\x8a\x64\x7a\x64\xe6\x20\xe1\xc5\xa8\x8a\xf4\xc4\xe5\x26\x99\xbd\x4a\x20\xb6\xed\x07\xed\xab\x87\xea\xff\x57\x15\x2c\x71\x62\xbd\x32\xcc\x62\x5d\xda\xe8\x73\x00\xec\x39\xbf\x5f\x0f\xc4\xc3\xb9\xab\x73\x06\xe8\xfc\x30\x8c\xa5\x1d\xce\xd9\xf8\x06\x00\x00\xff\xff\x20\x2f\xef\xba\xce\x00\x00\x00"),

From d8047b664d404a73bb3fc2e85d0b07225595db1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?=
 <luxas@users.noreply.github.com>
Date: Mon, 29 Jul 2019 19:14:16 +0300
Subject: [PATCH 117/158] Change go.mod import path to reflect the repo change

---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 35be0bf6e..2e8d634f4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/weaveworks/flux
+module github.com/fluxcd/flux
 
 go 1.12
 

From ed636a03826c41f6d49a0245ed5ae6b70144fc56 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Tue, 30 Jul 2019 11:56:34 +0300
Subject: [PATCH 118/158] Undo go mod fluxcd change

---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 2e8d634f4..35be0bf6e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/fluxcd/flux
+module github.com/weaveworks/flux
 
 go 1.12
 

From b023a0e44e678ab1fa748c4acb8504fad6793d0c Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:04:06 +0100
Subject: [PATCH 119/158] Correct installing.md to install/index.md

---
 README.md        | 2 +-
 remote/errors.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2268cf22e..7c2c03d51 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Get started by browsing through the documentation below:
   - [Introduction to Flux](/docs/introduction.md)
   - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/docs/how-it-works.md)
-  - [Considerations regarding installing Flux](/docs/installing.md)
+  - [Considerations regarding installing Flux](/docs/install/index.md)
   - [Flux <-> Helm integration](/docs/helm-integration.md)
 - Get Started with Flux
   - [Standalone Flux](/docs/get-started.md)
diff --git a/remote/errors.go b/remote/errors.go
index 3add0d187..0383db007 100644
--- a/remote/errors.go
+++ b/remote/errors.go
@@ -22,7 +22,7 @@ and try the operation again.
 Otherwise, please consult the installation instructions in our
 documentation:
 
-    https://github.com/weaveworks/flux/blob/master/docs/installing.md
+    https://github.com/weaveworks/flux/blob/master/docs/install/index.md
 
 If you are still stuck, please log an issue:
 
@@ -89,7 +89,7 @@ Otherwise, it is likely to be an ongoing problem until fluxd is
 updated and/or redeployed. For help, please consult the installation
 instructions:
 
-    https://github.com/weaveworks/flux/blob/master/docs/installing.md
+    https://github.com/weaveworks/flux/blob/master/docs/install/index.md
 
 If you are still stuck, please log an issue:
 

From 5fac36f4e104305e4dfe9656c154c91b24d0264f Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:05:47 +0100
Subject: [PATCH 120/158] Correct helm-get-started.md to
 install/helm-get-started.md

---
 CONTRIBUTING.md             | 2 +-
 README.md                   | 4 ++--
 chart/flux/README.md        | 2 +-
 docs/install/get-started.md | 4 ++--
 docs/install/index.md       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b27307bd5..9a6ba1c14 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ on.
 
 To set up Flux to test things, there's documentation about setting up a
 [standalone install](docs/get-started.md) and a [Helm
-install](docs/helm-get-started.md), which might be helpful.
+install](docs/install/helm-get-started.md), which might be helpful.
 
 Please talk to us on Slack, if you should get stuck anywhere. We appreciate
 any help and look forward to talking to you soon!
diff --git a/README.md b/README.md
index 7c2c03d51..e674c7af0 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ Get started by browsing through the documentation below:
   - [Flux <-> Helm integration](/docs/helm-integration.md)
 - Get Started with Flux
   - [Standalone Flux](/docs/get-started.md)
-  - [Flux using Helm](/docs/helm-get-started.md)
+  - [Flux using Helm](/docs/install/helm-get-started.md)
   - [Automation: annotations and locks](/docs/annotations-tutorial.md)
 - Operating Flux
   - [Using fluxctl to control Flux](/docs/fluxctl.md)
@@ -135,7 +135,7 @@ The Flux project adheres to the [CNCF Code of
 Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
 
 Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by contacting a *Flux* project maintainer, or the CNCF
+may be reported by contacting a _Flux_ project maintainer, or the CNCF
 mediator, Mishi Choudhary <mishi@linux.com>.
 
 To familiarise yourself with the project and how things work, you might
diff --git a/chart/flux/README.md b/chart/flux/README.md
index 3b946dc4d..2e81e5f49 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -37,7 +37,7 @@ until it can find one.
 ## Installation
 
 We put together a simple [Get Started
-guide](../../docs/helm-get-started.md) which takes about 5-10 minutes to follow.
+guide](../../docs/install/helm-get-started.md) which takes about 5-10 minutes to follow.
 You will have a fully working Flux installation deploying workloads to your cluster.
 
 ## Installing Flux using Helm
diff --git a/docs/install/get-started.md b/docs/install/get-started.md
index 7973ad7d9..fb1cc00a0 100644
--- a/docs/install/get-started.md
+++ b/docs/install/get-started.md
@@ -8,7 +8,7 @@ have Flux running in your cluster and it will be deploying any
 code changes for you.
 
 > **Note:** If you would like to install Flux using Helm, refer to the
-[Helm section](./helm-get-started.md).
+[Helm section](./install/helm-get-started.md).
 
 ### Prerequisites
 
@@ -56,7 +56,7 @@ want to use that too, be sure to create a fork of it on GitHub and
 add the git URL to the config file above. After that, set the `--git-path`
 flag to `--git-path=namespaces,workloads`, this is meant to exclude Helm
 manifests. Again, if you want to get started with Helm, please refer to the
-[Helm section](./helm-get-started.md).
+[Helm section](./install/helm-get-started.md).
 
 ### Deploying Flux to the cluster
 
diff --git a/docs/install/index.md b/docs/install/index.md
index df006e80f..516d8a79b 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -9,7 +9,7 @@ Here are the instructions to [install Flux on your own
 cluster](./get-started.md).
 
 If you are using Helm, we have a [separate section about
-this](./helm-get-started.md).
+this](./install/helm-get-started.md).
 
 You can also configure a more advanced, [standalone
 setup](./standalone-setup.md).

From d2146dcb3b0466f88a8dda33cb14fdc25d60d4a2 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:06:34 +0100
Subject: [PATCH 121/158] Correct get-started.md to install/get-started.md

---
 CONTRIBUTING.md | 2 +-
 README.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a6ba1c14..7e79ff960 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ the `blocked-needs-validation` label is removed, and the issue can be worked
 on.
 
 To set up Flux to test things, there's documentation about setting up a
-[standalone install](docs/get-started.md) and a [Helm
+[standalone install](docs/install/get-started.md) and a [Helm
 install](docs/install/helm-get-started.md), which might be helpful.
 
 Please talk to us on Slack, if you should get stuck anywhere. We appreciate
diff --git a/README.md b/README.md
index e674c7af0..3406f883c 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ Get started by browsing through the documentation below:
   - [Considerations regarding installing Flux](/docs/install/index.md)
   - [Flux <-> Helm integration](/docs/helm-integration.md)
 - Get Started with Flux
-  - [Standalone Flux](/docs/get-started.md)
+  - [Standalone Flux](/docs/install/get-started.md)
   - [Flux using Helm](/docs/install/helm-get-started.md)
   - [Automation: annotations and locks](/docs/annotations-tutorial.md)
 - Operating Flux

From 27a5ee037292d2bacd527ac1a346293789c0e813 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:08:26 +0100
Subject: [PATCH 122/158] Correct building.md to development/building.md

---
 CONTRIBUTING.md | 2 +-
 README.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7e79ff960..312df9e96 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,7 +73,7 @@ This is a rough outline of how to prepare a contribution:
 
 ### How to build and run the project
 
-Refer to the [building doc](docs/building.md) to find out how to build from
+Refer to the [building doc](docs/development/building.md) to find out how to build from
 source.
 
 Refer to the [Get Started Developing](docs/get-started-developing.md) guide for a walkthrough on developing Flux locally.
diff --git a/README.md b/README.md
index 3406f883c..35ddf08d8 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ To familiarise yourself with the project and how things work, you might
 be interested in the following:
 
 - [Our contributions guidelines](CONTRIBUTING.md)
-- [Build documentation](/docs/building.md)
+- [Build documentation](/docs/development/building.md)
 - [Release documentation](/internal_docs/releasing.md)
 
 ## <a name="help"></a>Getting Help

From 8227c8f02cc916bf105eec095ee0e6d7bd350984 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:09:36 +0100
Subject: [PATCH 123/158] Correct get-started-developing.md to
 development/get-started-development.md

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 312df9e96..1234476f4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,7 +76,7 @@ This is a rough outline of how to prepare a contribution:
 Refer to the [building doc](docs/development/building.md) to find out how to build from
 source.
 
-Refer to the [Get Started Developing](docs/get-started-developing.md) guide for a walkthrough on developing Flux locally.
+Refer to the [Get Started Developing](docs/development/get-started-developing.md) guide for a walkthrough on developing Flux locally.
 
 ### How to run the test suite
 

From 31e8b61e2e4267228b81e01acabbc90b633b16f3 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:10:19 +0100
Subject: [PATCH 124/158] Correct daemon.md to features/daemon.md

---
 docs/using/fluxctl.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using/fluxctl.md b/docs/using/fluxctl.md
index 76e992f58..a85fc9dd7 100644
--- a/docs/using/fluxctl.md
+++ b/docs/using/fluxctl.md
@@ -556,7 +556,7 @@ Commit customization
         --git-user
         --git-email
 
-        See [docs/daemon.md] for more information.
+        See [docs/features/daemon.md] for more information.
 
     3. Commit author
 

From c5f1efbe169737cb3e160aa1b0afec8127030aa9 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:11:13 +0100
Subject: [PATCH 125/158] Correct garbagecollection.md to
 features/garbagecollection.md

---
 chart/flux/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/flux/README.md b/chart/flux/README.md
index 2e81e5f49..a22a5632b 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -288,8 +288,8 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `helmOperator.affinity`                           | `{}`                                                 | Affinity properties for the helmOperator deployment
 | `kube.config`                                     | [See values.yaml](/chart/flux/values.yaml#L151-L165) | Override for kubectl default config in the Flux pod(s).
 | `prometheus.enabled`                              | `false`                                              | If enabled, adds prometheus annotations to Flux and helmOperator pod(s)
-| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/docs/garbagecollection.md))
-| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/docs/garbagecollection.md))
+| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/docs/features/garbagecollection.md))
+| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/docs/features/garbagecollection.md))
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
 

From adc24d2197791f7b7ff7d3044b4b5adcc6d11c84 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:11:56 +0100
Subject: [PATCH 126/158] Correct helm-integration.md to
 helm/helm-integration.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 35ddf08d8..f489624ab 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Its major features are:
 
 - [Automated git → cluster synchronisation](/docs/introduction.md#automated-git-cluster-synchronisation)
 - [Automated deployment of new container images](/docs/introduction.md#automated-deployment-of-new-container-images)
-- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/helm-integration.md) and more)
+- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/helm/helm-integration.md) and more)
 - No additional service or infrastructure needed - Flux lives inside your
   cluster
 - Straight-forward control over the state of deployments in the
@@ -103,7 +103,7 @@ Get started by browsing through the documentation below:
   - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/docs/how-it-works.md)
   - [Considerations regarding installing Flux](/docs/install/index.md)
-  - [Flux <-> Helm integration](/docs/helm-integration.md)
+  - [Flux <-> Helm integration](/docs/helm/helm-integration.md)
 - Get Started with Flux
   - [Standalone Flux](/docs/install/get-started.md)
   - [Flux using Helm](/docs/install/helm-get-started.md)

From 79f1934c9bac572a437abfe3ef500fbc70aa4775 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:12:19 +0100
Subject: [PATCH 127/158] Correct helm-operator.md to helm/helm-operator.md

---
 README.md            | 2 +-
 chart/flux/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f489624ab..11013c806 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ Get started by browsing through the documentation below:
   - [Automation: annotations and locks](/docs/annotations-tutorial.md)
 - Operating Flux
   - [Using fluxctl to control Flux](/docs/fluxctl.md)
-  - [Helm Operator](/docs/helm-operator.md)
+  - [Helm Operator](/docs/helm/helm-operator.md)
   - [Troubleshooting](/docs/troubleshooting.md)
   - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [Upgrading to Flux v1](/docs/upgrading-to-1.0.md)
diff --git a/chart/flux/README.md b/chart/flux/README.md
index a22a5632b..8ec047ae4 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -22,7 +22,7 @@ This means fluxd can fail to apply changes to HelmRelease resources.
 ### Helm
 
 Tiller should be running in the cluster, though
-[helm-operator](../../docs/helm-operator.md) will wait
+[helm-operator](../../docs/helm/helm-operator.md) will wait
 until it can find one.
 
 # Git repo

From 4cacf8dd54fa25a1217428f5853818853f15f79c Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:13:16 +0100
Subject: [PATCH 128/158] Correct standalone-setup.md to
 install/standalone-setup.md

---
 deploy/flux-deployment.yaml                 | 2 +-
 install/templates/flux-deployment.yaml.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 6e4012671..96e22e79e 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -35,7 +35,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/docs/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs/install/standalone-setup.md#using-a-private-git-host
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
index abcbcbcb9..2b08fd64c 100644
--- a/install/templates/flux-deployment.yaml.tmpl
+++ b/install/templates/flux-deployment.yaml.tmpl
@@ -36,7 +36,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/docs/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs/install/standalone-setup.md#using-a-private-git-host
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config

From 45c4fb7c34e970b65c33a0fa67ecdc5464fad02a Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:15:37 +0100
Subject: [PATCH 129/158] Correct annotations-tutorial.md to
 using/annotations-tutorial.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 11013c806..e801b7c48 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ Get started by browsing through the documentation below:
 - Get Started with Flux
   - [Standalone Flux](/docs/install/get-started.md)
   - [Flux using Helm](/docs/install/helm-get-started.md)
-  - [Automation: annotations and locks](/docs/annotations-tutorial.md)
+  - [Automation: annotations and locks](/docs/using/annotations-tutorial.md)
 - Operating Flux
   - [Using fluxctl to control Flux](/docs/fluxctl.md)
   - [Helm Operator](/docs/helm/helm-operator.md)

From a6016032bc411d417dc206cc8716027e353eb46e Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:16:07 +0100
Subject: [PATCH 130/158] Correct fluxctl.md to using/fluxctl.md

---
 README.md                              | 2 +-
 chart/flux/README.md                   | 2 +-
 chart/flux/templates/NOTES.txt         | 2 +-
 docs/features/fluxyaml-config-files.md | 2 +-
 git/errors.go                          | 2 +-
 internal_docs/releasing.md             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e801b7c48..7dd6cdf77 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ Get started by browsing through the documentation below:
   - [Flux using Helm](/docs/install/helm-get-started.md)
   - [Automation: annotations and locks](/docs/using/annotations-tutorial.md)
 - Operating Flux
-  - [Using fluxctl to control Flux](/docs/fluxctl.md)
+  - [Using fluxctl to control Flux](/docs/using/fluxctl.md)
   - [Helm Operator](/docs/helm/helm-operator.md)
   - [Troubleshooting](/docs/troubleshooting.md)
   - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
diff --git a/chart/flux/README.md b/chart/flux/README.md
index 8ec047ae4..568cec5ee 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -154,7 +154,7 @@ The [configuration](#configuration) section lists all the parameters that can be
 #### Setup Git deploy
 
 At startup Flux generates a SSH key and logs the public key.
-Find the SSH public key by installing [fluxctl](../../docs/fluxctl.md) and
+Find the SSH public key by installing [fluxctl](../../docs/using/fluxctl.md) and
 running:
 
 ```sh
diff --git a/chart/flux/templates/NOTES.txt b/chart/flux/templates/NOTES.txt
index d81e12603..c38c17d5a 100644
--- a/chart/flux/templates/NOTES.txt
+++ b/chart/flux/templates/NOTES.txt
@@ -3,7 +3,7 @@ Get the Git deploy key by either (a) running
   kubectl -n {{ .Release.Namespace }} logs deployment/{{ .Release.Name }} | grep identity.pub | cut -d '"' -f2
 
 or by (b) installing fluxctl through
-https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md#installing-fluxctl
+https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md#installing-fluxctl
 and running:
 
   fluxctl identity
diff --git a/docs/features/fluxyaml-config-files.md b/docs/features/fluxyaml-config-files.md
index 130259ec1..492f9cfad 100644
--- a/docs/features/fluxyaml-config-files.md
+++ b/docs/features/fluxyaml-config-files.md
@@ -26,7 +26,7 @@ Flux performs two types of actions on raw manifest files from the Git repository
 
 1. Read manifest files when performing a sync operation (i.e making sure that the status of the cluster reflects what's
    in the manifest files, adjusting it if necessary)
-2. Update the manifest files of [workload](https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md#what-is-a-workload).
+2. Update the manifest files of [workload](https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md#what-is-a-workload).
    Specifically, flux can update:
     * container images, when releasing a new image version. A release can happen manually or automatically, when a new
       container image is pushed to a repository.
diff --git a/git/errors.go b/git/errors.go
index c3827c574..a11087613 100644
--- a/git/errors.go
+++ b/git/errors.go
@@ -16,7 +16,7 @@ We need to clone a git repo to proceed, and you haven't supplied
 one. Please upload a config file, including a git repository URL, as
 described in
 
-    https://github.com/weaveworks/flux/blob/master/docs/fluxctl.md
+    https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md
 
 `,
 }
diff --git a/internal_docs/releasing.md b/internal_docs/releasing.md
index 5b7b126d2..866508d53 100644
--- a/internal_docs/releasing.md
+++ b/internal_docs/releasing.md
@@ -4,7 +4,7 @@ The release process needs to do these things:
 
  - create a new release on GitHub, with a tag
  - push Docker image(s) to Docker Hub
- - possibly upload the [`fluxctl` binaries](/docs/fluxctl.md#binary-releases) to the GitHub release
+ - possibly upload the [`fluxctl` binaries](/docs/using/fluxctl.md#binary-releases) to the GitHub release
  - make sure the version is entered into the checkpoint database so that up-to-date checks report back accurate information
  - close out the GitHub milestone that was used to track the release
 

From 18b3fdff81abe348a6d30e6fc77fb68a4f26156c Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:16:51 +0100
Subject: [PATCH 131/158] Correct upgrading-to-1.0.md to
 using/upgrading-to-1.0.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7dd6cdf77..1783eab99 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ Get started by browsing through the documentation below:
   - [Helm Operator](/docs/helm/helm-operator.md)
   - [Troubleshooting](/docs/troubleshooting.md)
   - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [Upgrading to Flux v1](/docs/upgrading-to-1.0.md)
+  - [Upgrading to Flux v1](/docs/using/upgrading-to-1.0.md)
 
 ### Integrations
 

From f8563da9f120f2b86537bbdbab8cbfee91cc9072 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:41:56 +0100
Subject: [PATCH 132/158] Correct redundant directory in the link to
 helm-get-started.md

---
 docs/install/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/install/index.md b/docs/install/index.md
index 516d8a79b..df006e80f 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -9,7 +9,7 @@ Here are the instructions to [install Flux on your own
 cluster](./get-started.md).
 
 If you are using Helm, we have a [separate section about
-this](./install/helm-get-started.md).
+this](./helm-get-started.md).
 
 You can also configure a more advanced, [standalone
 setup](./standalone-setup.md).

From 3121b016851fb064a060514bdde200b4a48d4ad7 Mon Sep 17 00:00:00 2001
From: Ryota <rytswd@gmail.com>
Date: Mon, 29 Jul 2019 21:48:31 +0100
Subject: [PATCH 133/158] Correct more redundant directory in the links

---
 docs/install/get-started.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/install/get-started.md b/docs/install/get-started.md
index fb1cc00a0..4de5f9a26 100644
--- a/docs/install/get-started.md
+++ b/docs/install/get-started.md
@@ -8,7 +8,7 @@ have Flux running in your cluster and it will be deploying any
 code changes for you.
 
 > **Note:** If you would like to install Flux using Helm, refer to the
-[Helm section](./install/helm-get-started.md).
+> [Helm section](./helm-get-started.md).
 
 ### Prerequisites
 
@@ -56,7 +56,7 @@ want to use that too, be sure to create a fork of it on GitHub and
 add the git URL to the config file above. After that, set the `--git-path`
 flag to `--git-path=namespaces,workloads`, this is meant to exclude Helm
 manifests. Again, if you want to get started with Helm, please refer to the
-[Helm section](./install/helm-get-started.md).
+[Helm section](./helm-get-started.md).
 
 ### Deploying Flux to the cluster
 
@@ -90,7 +90,7 @@ repository.
 
 Open GitHub, navigate to your fork, go to **Setting > Deploy keys**,
 click on **Add deploy key**, give it a `Title`, check **Allow write
-access**, paste the Flux public key and click **Add key**.  See the
+access**, paste the Flux public key and click **Add key**. See the
 [GitHub docs](https://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys)
 for more info on how to manage deploy keys.
 

From cae36707efab7366bff8a64536ea65a7ee9a07c5 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 30 Jul 2019 11:11:23 +0200
Subject: [PATCH 134/158] Re-gen generated templates

---
 install/generated_templates.gogen.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index 6492412fe..20afc50d1 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,7 +19,7 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 29, 15, 6, 44, 400020755, time.UTC),
+			modTime: time.Date(2019, 7, 30, 9, 7, 53, 602764277, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
@@ -30,10 +30,10 @@ var templates = func() http.FileSystem {
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 29, 15, 6, 44, 400020755, time.UTC),
-			uncompressedSize: 5901,
+			modTime:          time.Date(2019, 7, 30, 9, 7, 53, 602764277, time.UTC),
+			uncompressedSize: 5909,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\xcb\xc2\x4a\x5a\x92\x17\xa6\x10\xda\x1a\x5c\x10\xfa\xa6\xce\xaa\xe2\x59\xb0\x76\x21\x16\xb5\x53\xad\xf0\x18\xca\x93\x9d\x1d\x14\xf5\xa9\x22\x2a\x17\xd2\x9a\x8d\xda\x0e\x9f\x00\xe2\xc1\x47\x51\xe7\xc9\x61\x7a\xcf\x16\x09\xdb\xb7\xa6\x2d\xdb\x35\x6b\x5c\x46\x21\x63\x75\x3e\x99\xb2\xbd\xa2\x92\x4f\x4a\xd1\x22\x08\x28\xd4\x66\x83\x8e\x31\xb5\x97\xd0\x5d\xba\x11\x37\x43\x86\xa2\xb8\x34\x47\x8c\x3d\xad\x2a\xb0\xcf\xca\x46\x6d\x2b\x51\x8f\x86\x28\x5f\x82\x30\x80\xc6\xbb\x43\xf0\xe1\xd7\x48\xf4\xeb\x1c\x84\x29\xa0\x31\xd2\x56\x0c\xe6\x81\x3f\x7a\xfb\x31\x64\x5b\x98\x62\x90\x82\xa6\x0d\x12\x14\x52\x97\xee\xb3\x0c\x70\x18\xbe\x21\x03\x09\xdb\x93\x19\x08\x40\xe1\x2d\xa8\x8a\x61\x14\xde\xdd\xbf\x0b\x18\x01\x2f\xd8\x2d\x52\x5b\xa3\xcc\xa8\x9c\x9d\x6b\xd1\xa9\x8d\x92\x01\xcf\xa1\x6e\x5c\x6d\x09\xe9\xe5\x9f\x08\xe4\x20\x25\xa2\x4b\x8c\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xf1\x16\x3f\x12\xb1\x6d\xbd\x65\x78\xa1\x24\x34\x53\x84\x7e\xf6\x08\x46\x9f\xf3\x5d\xc0\xe8\x3e\x9c\xc3\x45\x3d\x6b\x0f\x49\x03\xe9\xa2\xee\x30\xc0\xa8\xb1\x30\xcb\xb9\x47\x92\x9f\x81\xaa\xc4\x16\x63\xf5\x33\x43\x06\x6f\x95\x29\x82\xcf\x15\xa3\x8e\x43\x39\x56\x6d\x44\x1c\x8d\x82\x90\xb1\x25\xb0\x72\x12\x78\x8c\x00\xe1\x07\x58\x60\x4c\x28\xac\xdc\xa1\x0b\xd0\xe0\xce\xc0\xc1\x8b\x21\x7c\x7d\x2e\x79\x24\xe0\x71\x81\x35\x7b\xb1\x05\xb6\x36\x1b\x68\x82\xaa\x1c\x3a\xa1\xca\x06\x31\xb2\x08\x3f\xf2\x55\xb6\xba\xc9\x6e\xa6\xb4\xf7\x8d\xd6\xf7\x56\x2b\x79\xc8\xe1\xfd\xe6\xce\xfa\x7b\x87\x94\x7a\xe2\x90\x6c\xe3\x24\x52\x0a\xf5\x0e\xff\xdf\x20\xf9\xc9\x19\x80\xac\x9b\x1c\xfe\x72\x5d\x4d\x0e\xab\xd0\x0d\x72\xf8\xeb\xf7\x1f\xd5\x38\x49\x58\x97\x32\x2f\xc6\xec\xdc\x87\xa9\xe2\xe6\xfa\x86\x9b\xab\x32\x1b\xeb\xaa\x50\xb6\x42\x0f\xd4\x49\x8d\x4d\x64\x5c\x6e\xf6\x10\x41\xfb\x5e\xf8\x32\x87\x25\x7a\x19\x62\x51\x2c\x89\x4a\x9e\x5a\x6c\x9c\xa3\x40\xdb\xee\x7a\x6c\x55\x8b\x06\x94\x89\xe1\x79\x4e\x91\x87\xa8\x5c\x4e\x6e\x75\x8c\x82\x28\x3e\x19\x7d\xc8\xc1\xbb\x06\x59\x1a\x77\xf4\x70\xa1\xd6\x1d\x0e\x71\x05\xd4\xe8\x36\xd6\x49\x64\xa1\xb1\x85\x73\x07\x7f\xcc\xf0\xb4\xcb\x4e\x6d\x6f\x85\xeb\x6c\x8f\x64\xdf\x66\x7e\x52\x4e\xef\x8d\xd4\x4d\xb8\xe8\x3c\x88\x44\x3c\xee\x41\x20\x76\xba\x27\x1a\x73\xdf\x9a\x7f\x60\xd6\x93\xa6\x39\x80\x01\x14\x28\xb5\x70\x3c\x80\xac\x6d\x9b\xd4\xea\x57\xba\x56\xbc\xcd\xa9\xf3\xce\x5a\xbf\xcc\x88\xca\x47\x1d\x10\x66\xa2\x75\x36\x22\xea\x2c\x6a\x9e\xf7\x24\x89\x04\x34\xad\x72\xd6\x04\xfc\x8a\xad\x61\xf6\xe1\xcb\x4f\x3f\xbf\xfe\x74\xf7\xf6\xfd\xbb\x59\x44\xac\x39\xc7\xc3\xb6\xe8\xdc\xb4\xbd\x24\x62\x02\x22\xaf\x0f\x11\xfc\xbd\xbe\xe4\xe3\x59\x5f\x38\xf7\x71\x2c\x4e\x26\x7e\xd4\x51\x86\x68\x1e\xa3\x7b\x6d\x8c\x28\x49\xe7\xec\xac\x0b\x39\x49\x44\x9c\xf6\xdf\x34\xe9\xa1\xf9\xf6\x83\xa4\x30\x20\xb4\x47\x67\x78\x50\x3c\xb3\x78\xe3\x6c\xc5\x65\xd1\x37\xd8\x39\x08\xe2\x72\xeb\x9a\x00\x87\x41\x5b\xb9\xa3\xf3\x64\xa3\x69\xf3\x0b\x71\x19\xc3\x3d\x89\x4b\x2b\x74\x83\x67\x31\x79\xaa\x88\x4f\x6b\xa0\x6f\x11\x5f\xa9\x00\xee\x50\xd3\xce\xf4\x95\xde\xf4\x48\x5d\x32\x55\x6c\xc6\x13\xba\x29\x3e\x8c\x46\xb3\xca\x7c\xe2\x43\x4c\x43\x5c\x38\xb0\x60\xcc\x94\x42\x96\x58\x70\x64\xd3\xd4\x0e\x43\x10\x27\x91\xc3\x32\x4f\xa4\x58\xd7\x4d\x39\x09\x43\xb7\x30\x05\xc6\x79\x50\xc2\x83\x3e\x35\x75\xad\x0f\x1c\x08\x4a\x43\x31\xce\x1a\x7e\x6f\xd9\xca\x86\x53\x1a\x0a\x2e\x6c\x77\x21\x0f\x50\xda\x7d\x58\x66\xac\x31\x28\x7d\x98\x43\xfc\x34\x74\x8b\xc5\xe0\x40\x98\x52\x59\xf9\xed\x70\x94\x75\x2d\x3a\xa3\x56\x66\x52\x37\x3c\xf9\x66\x8c\x5f\x3a\x0d\xc9\x17\x8a\x57\x6d\x0c\xc5\xeb\x48\xfa\xfe\x7e\xe2\x14\xdf\x3a\x42\x1f\x96\xa5\x69\x62\x47\x1b\x7a\x7a\x5e\x49\xbd\x63\xca\xb0\xbe\x24\x08\x9c\x5a\xdc\x51\xdf\x5e\x4d\x66\x02\x45\x50\x35\x14\xd6\xb9\x10\x3d\x85\x45\xac\xa6\x75\xc0\xf5\xd0\x8d\xc3\x16\xf7\xa2\x5f\x8d\x5e\xa6\xb6\xf4\x77\x2b\x56\x21\x0f\x11\xc9\x32\x37\x31\x84\xb1\x30\xe2\xfb\xa2\x50\xee\xf6\x0c\xf5\x53\xb3\x3e\x27\xb3\xc0\x98\xbc\x2f\x9f\x7f\x89\xdb\xa6\x30\xdb\xf8\xed\x9d\xf2\x61\x03\x22\xe5\xad\x3b\x0c\x68\xf5\x96\xe7\x98\x89\x72\xee\x41\x8d\xd3\xb7\xc7\x23\x64\xef\x94\x67\x49\xe1\xd1\x62\x4a\xb1\x76\xc2\xc8\xb2\x27\xfa\x29\xfc\x15\x9f\x2f\xd4\x26\x1c\xf1\xdd\xa0\x4b\x9c\xb5\xf0\x81\xef\x21\xa4\x81\xfe\x69\x95\x49\x18\x66\xf3\x59\xf7\x0a\xa2\x09\x53\x76\x9e\x04\xce\x5b\xd5\x5e\x98\x50\x7e\x0e\x39\xab\x32\x0e\xa0\x95\x30\x6a\xc3\xa3\x09\x17\x28\xa9\x02\x5d\xf4\xf5\x64\xc8\x0b\xdb\x9b\x25\x84\xc6\x14\xe8\x4e\x02\xe8\x50\x0b\xaf\x5a\x84\x3a\x98\xd5\xa5\x77\x3b\x09\xe2\x49\xc1\x0f\xce\x51\xb3\x2e\x94\x5b\xcd\xe3\xcf\xef\x86\x27\x9d\x31\x38\xe1\xc9\xe6\x52\x70\xc2\x3b\x48\x1f\xd5\x9e\xea\x82\x80\x2f\x84\xee\x12\x7f\x43\xe8\x86\xcc\x31\x0d\x5c\xe6\xff\xb9\x12\xea\xa2\x01\xc8\x1f\x7a\x09\x3d\xd5\xf8\x28\x75\x11\x74\x91\xef\xe9\xde\x72\x40\xd1\x84\x87\x0e\x8e\x13\x77\x03\xe5\x4f\x76\x91\x34\x56\x1d\xae\x76\xa8\x79\xfb\x15\x18\xed\x39\x3a\x59\xcc\x75\xfb\xf7\x1d\x1e\x40\x15\x3f\x0e\x64\x5f\x69\x95\x89\x55\x2c\x42\xf8\xc6\xe1\x64\x21\xba\xa0\x2b\x7c\x3e\x2c\x06\x7a\x7a\xdc\x77\x83\xbf\xf9\x3e\x00\x09\x24\x0a\x03\xb3\xa6\x26\xef\x50\x54\xb3\x1e\xb0\x12\x21\x2f\x30\xdb\x66\x73\xf8\x0f\xcf\xfb\xf0\x5a\xdb\xa6\x78\x99\x85\x7d\xcf\xdb\x1d\xcf\x6f\x04\xb5\x70\x5e\xc9\x46\x0b\x07\xdd\x53\x43\x27\xe5\x14\x6b\x3b\xad\xb7\x7b\xe2\x95\x42\xb2\xac\x2c\xec\x11\x59\x5c\x24\x44\xad\x96\x27\xd5\xcf\x6c\x41\xd1\xad\x58\xcb\xd5\x77\x37\xe7\xff\xa7\x0e\x3f\xa0\x6b\x2f\xbc\xe2\xf1\xd8\x31\x36\x1a\xce\xda\x0f\x29\xe2\x89\x1d\x23\xa5\x8b\xa8\x8b\x3e\x79\x1a\x7c\x9e\xbc\x2e\x26\xcf\x84\xec\x62\xd8\x67\x43\xeb\x9f\xe2\x92\x56\xe4\xd1\x2c\x3a\x13\x6e\xf3\x9b\xeb\x9b\xd5\x55\x57\xd1\xaf\x8a\x42\xc5\x0d\x81\xf1\xec\x15\xb7\xf3\x09\x74\x8c\xdf\xc7\x96\x76\x3c\x82\x0b\xe8\xf8\x04\xf7\x22\xbc\xd1\x4e\x6e\xc1\xf8\x5b\xaf\xe0\x53\xdd\x89\x7f\x73\xf7\xd0\xf7\x22\x9a\x77\x23\x52\xe3\xba\xce\x04\xa6\xb0\x9e\xc0\x06\x62\xa8\xc4\x21\x6c\x56\xba\x1d\x77\x6c\x43\xda\xda\x5d\x53\x83\x22\x6a\x90\xc0\x1a\x20\x5b\x21\x7c\x68\xd6\xe8\x0c\x7a\x24\x08\x0f\x42\x34\xae\xd0\x85\xa1\x7e\x79\x9b\xdd\x59\x83\xb3\xf4\xcb\xeb\x60\x40\xba\x44\x47\xe5\x34\xdd\xab\xfb\x51\x27\xd8\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xea\x8f\x00\x00\x00\xff\xff\x83\x3b\x2d\xb6\x0d\x17\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\xcb\xc2\x4a\x5a\x2a\x43\x5e\x68\xbd\x24\x2f\x4c\x21\xb4\x35\xb8\x20\xf4\x4d\x9d\x55\xc5\xb3\x60\xf5\x42\x2c\x6a\xa7\x5a\xe1\x31\x94\x29\x3b\x3d\x28\xec\x53\x46\x54\x2e\xa4\x35\x1b\xb5\x1d\x3e\x01\xc4\x83\x8f\xa2\xce\x93\xc3\xf4\xbe\x2d\x12\xb6\x6f\x4d\x5f\xb6\x6b\xd6\xb8\x8c\x42\xc6\x2a\x7d\x32\x75\x7b\x45\x25\x9f\x94\xa2\x45\x10\x50\xa8\xcd\x06\x1d\x63\x6b\x2f\xa1\xbb\x7c\x23\x7e\x86\x4c\x45\x71\x69\xae\x18\x83\x5a\x55\x60\x9f\x9d\x8d\xda\x56\xa2\x1e\x0d\x51\xbe\x04\x61\x00\x8d\x77\x87\xe0\xc3\xaf\x91\xe8\xd7\x39\x08\x53\x40\x63\xa4\xad\x18\xd4\x03\x7f\xf4\xf6\x63\xc8\xba\x30\xc5\x20\x05\x4d\x1b\x24\x28\xa4\x2e\xed\x67\x19\xe0\x30\x7c\x43\x06\x12\xb6\x27\x33\x10\x00\xc3\x5b\x50\x15\xc3\x29\xbc\xbb\x7f\x17\xb0\x02\x5e\xb0\x5b\xa4\xb6\x46\x99\x51\x39\x3b\xd7\xa2\x53\x1b\x25\x03\xae\x43\xdd\xb8\xda\x12\xd2\xcb\x3f\x11\xc8\x41\x4a\x44\x99\x18\x45\x0e\x10\xeb\xfb\x13\x81\x03\xe1\xb6\xe3\x6d\x7e\x24\x62\xdb\x7a\xcb\x30\x43\x49\x68\xa6\x48\xfd\xec\x11\xac\x3e\xe7\xbb\x80\xd5\x7d\x38\x87\x0b\x7b\xd6\x26\x92\x46\xd2\x45\xdd\x61\x80\x53\x63\x61\x96\x73\xaf\x24\x3f\x03\x55\x89\x2d\xc6\xea\x67\x86\x0c\xde\x2a\x53\x04\x9f\x2b\x46\x1f\x87\x72\xac\xda\x88\x3c\x1a\x05\x21\x63\x4c\x60\xe5\x24\xf0\x38\x01\xc2\x0f\xf0\xc0\xd8\x50\x58\xb9\x43\x17\x20\xc2\x9d\x81\x84\x17\x43\xf8\xfa\x5c\xf2\x68\xc0\x63\x03\x6b\xf6\x62\x0b\x6c\x6d\x36\xd0\x04\x55\x39\x74\x42\x95\x0d\x62\x64\x11\x7e\xe4\xab\x6c\x75\x93\xdd\x4c\x69\xef\x1b\xad\xef\xad\x56\xf2\x90\xc3\xfb\xcd\x9d\xf5\xf7\x0e\x29\xf5\xc4\x21\xd9\xc6\x49\xa4\x14\xf2\x1d\xfe\xbf\x41\xf2\x93\x33\x00\x59\x37\x39\xfc\xe5\xba\x9a\x1c\x56\xa1\x2b\xe4\xf0\xd7\xef\x3f\xaa\x71\xa2\xb0\x2e\x65\x5e\x8c\xd9\xb9\x0f\xd3\xc5\xcd\xf5\x0d\x37\x59\x65\x36\xd6\x55\xa1\x6c\x85\x1e\xa8\x93\x1a\x9b\xc8\xb8\xdc\xf4\x21\x82\xf7\xbd\xf0\x65\x0e\x4b\xf4\x32\xc4\xa2\x58\x12\x95\x3c\xbd\xd8\x38\x4f\x81\xb6\xdd\xf5\xd8\xaa\x16\x0d\x28\x13\xc3\xf3\x9c\x22\x0f\x51\xb9\x9c\xdc\xea\x18\x05\x51\x7c\x32\xfa\x90\x83\x77\x0d\xb2\x34\xee\xec\xe1\x42\xad\x3b\x1c\xe2\x0a\xa8\xd1\x6d\xac\x93\xc8\x42\x63\x2b\xe7\x4e\xfe\x98\xe1\x69\xb7\x9d\xda\xde\x0a\xd7\xd9\x1e\xc9\xbe\xcd\xfc\xa4\x9c\xde\x1b\xa9\x9b\x70\xd1\x79\x20\x89\x78\xdc\x83\x40\xec\x78\x4f\x34\xe8\xbe\x45\xff\xc0\xac\x27\xcd\x73\x00\x03\x28\x50\x6a\xe1\x78\x10\x59\xdb\x36\xa9\xd5\xaf\x74\xad\x78\x9b\x53\xe7\x9d\xb5\x7e\x99\x11\x95\x8f\x3a\x20\xcc\x44\xeb\x6c\x44\xd4\x59\xd4\x3c\xef\x49\x12\x09\x68\x5a\xe5\xac\x09\xf8\x15\x5b\xc3\xec\xc3\x97\x9f\x7e\x7e\xfd\xe9\xee\xed\xfb\x77\xb3\x88\x58\x73\x8e\x87\x6d\xd1\xb9\x69\x7b\x49\xc4\x04\x44\x5e\x1f\x22\xf8\x7b\x7d\xc9\xc7\xb3\xbe\x70\xee\xe3\x58\x9c\x4c\xfc\xa8\xa3\x0c\xd1\x3c\x4e\xf7\xda\x18\x51\x92\xce\xd9\x59\x17\x72\x92\x88\x38\xed\xbf\x69\xd2\x43\xf3\xed\x07\x4a\x61\x40\x68\x8f\xce\xf0\xc0\x78\x66\xf1\xc6\xd9\x8a\xcb\xa2\x6f\xb0\x73\x10\xc4\xe5\xd6\x35\x01\x0e\x83\xb6\x72\x47\xe7\xc9\x46\xd3\xe6\x17\xe2\x32\x86\x7b\x12\x97\x56\xe8\x06\xcf\x62\xf2\x54\x11\x9f\xd6\x40\xdf\x22\xbe\x52\x01\xdc\xa1\xa6\x9d\xe9\x2b\xbd\xe9\x91\xba\x64\xaa\xd8\x8c\x27\x74\x53\x7c\x18\x8d\x66\x95\xf9\xc4\x87\x98\x86\xb8\x78\x60\xc1\x98\x29\x85\x2c\xb1\xe0\xc8\xa6\xa9\x1d\x86\x20\x4e\x22\x87\x65\x9e\x48\xb1\xae\x9b\x72\x12\x86\x6e\x71\x0a\x8c\xf3\xa0\x84\x07\x7e\x6a\xea\x5a\x1f\x38\x10\x94\x86\x62\x9c\x35\xfc\xde\xb2\x95\x0d\xa7\x34\x14\x5c\xd8\xf2\x42\x1e\xa0\xb4\xfb\xb0\xd4\x58\x63\x50\xfa\x30\x87\xf8\x69\xe8\x16\x8b\xc1\x81\x30\xa5\xb2\xf2\xdb\xe1\x28\xeb\x5a\x74\x46\xad\xcc\xa4\x6e\x78\x02\xce\x18\xbf\x74\x1a\x92\x2f\x14\xaf\xda\x18\x8a\xd7\x91\xf4\xfd\xfd\xc4\x29\xbe\x75\x84\x3e\x2c\x4d\xd3\xc4\x8e\x36\xf4\xf4\xbc\x9a\x7a\xc7\x94\x61\x8d\x49\x10\x38\xb5\xb8\xa3\xbe\xbd\x9a\xcc\x04\x8a\xa0\x6a\x28\xac\x75\x21\x7a\x0a\x8b\x58\x4d\xeb\x80\xeb\xa1\x1b\x87\x6d\xee\x45\xbf\x22\xbd\x4c\x6d\xe9\xef\x56\xac\x42\x1e\x22\x92\xa5\x6e\x62\x08\x63\x61\xc4\xf7\x45\xa1\xdc\xed\x19\xea\xa7\x66\x7d\x4e\x66\x81\x31\x79\x5f\x3e\xff\x12\xb7\x4e\x61\xb6\xf1\xdb\x3b\xe5\xc3\x26\x44\xca\x5b\x77\x18\xd0\xea\x2d\xcf\x31\x13\xe5\xdc\x83\x1a\xa7\x6f\x8f\x47\xc8\xde\x29\xcf\x92\xc2\xe3\xc5\x94\x62\xed\x84\x91\x65\x4f\xf4\x53\xf8\x2b\x3e\x63\xa8\x4d\x38\xe2\xbb\x41\x97\x38\x6b\xe1\x03\xdf\x43\x48\x03\xfd\xd3\x2a\x93\x30\xcc\xe6\xb3\xee\x35\x44\x13\xa6\xec\x3c\x09\x9c\xb7\xaa\xbd\x30\xa1\xfc\x1c\x72\x56\x65\x1c\x40\x2b\x61\xd4\x86\x47\x13\x2e\x50\x52\x05\xba\xe8\xeb\xc9\x90\x17\xb6\x38\x4b\x08\x8d\x29\xd0\x9d\x04\xd0\xa1\x16\x5e\xb5\x08\x75\x30\xab\x4b\xef\x76\x12\xc4\x93\x82\x1f\x9c\xa3\x66\x5d\x28\xb7\x9a\xc7\x9f\xdf\x0d\x4f\x3b\x63\x70\xc2\xd3\xcd\xa5\xe0\x84\xf7\x90\x3e\xaa\x3d\xd5\x05\x01\x5f\x08\xdd\x25\xfe\x86\xd0\x0d\x99\x63\x1a\xb8\xcc\xff\x73\x25\xd4\x45\x03\x90\x3f\xf4\x12\x7a\xaa\xf1\x71\xea\x22\xe8\x22\xdf\xd3\xbd\xe5\x80\xa2\x09\x0f\x1e\x1c\x27\xee\x06\xca\x9f\xec\x22\x69\xac\x3a\x5c\xed\x50\xf3\xf6\x2b\x30\xda\x73\x74\xb2\x98\xeb\xf6\xef\x3b\x3c\x80\x2a\x7e\x1c\xc8\xbe\xd2\x2a\x13\xab\x58\x84\xf0\x8d\xc3\xc9\x42\x74\x41\x57\xf8\x7c\x58\x0c\xf4\xf4\xb8\xef\x06\x7f\xf3\x7d\x00\x12\x48\x14\x06\x66\x4d\x4d\xde\xa1\xa8\x66\x3d\x60\x25\x42\x5e\x60\xb6\xcd\xe6\xf0\x1f\x9e\xf7\xe1\xb5\xb6\x4d\xf1\x32\x0b\xfb\x9e\xb7\x3b\x9e\xdf\x08\x6a\xe1\xbc\x92\x8d\x16\x0e\xba\x27\x87\x4e\xca\x29\xd6\x76\x5a\x6f\xf7\xc4\x2b\x85\x64\x59\x59\xd8\x23\xb2\xb8\x48\x88\x5a\x2d\x4f\xaa\x9f\xd9\x82\xa2\x5b\xb1\x96\xab\xef\x6e\xce\xff\x4f\x1d\x7e\x40\xd7\x5e\x78\xcd\xe3\xb1\x63\x6c\x34\x9c\xb5\x1f\x52\xc4\x13\x3b\x46\x4a\x17\x51\x17\x7d\xf2\x44\xf8\x3c\x79\x65\x4c\x9e\x0b\xd9\xc5\xb0\xcf\x86\xd6\x3f\xc5\x25\xad\xc8\xa3\x59\x74\x26\xdc\xe6\x37\xd7\x37\xab\xab\xae\xa2\x5f\x15\x85\x8a\x1b\x02\xe3\xd9\x2b\x6e\xe7\x13\xe8\x18\xbf\x8f\x2d\xed\x78\x04\x17\xd0\xf1\x09\xee\x45\x78\xab\x9d\xdc\x82\xf1\xb7\x5e\xc1\xa7\xba\x13\xff\xe6\xee\xa1\xef\x45\x34\xef\x46\xa4\xc6\x75\x9d\x09\x4c\x61\x3d\x81\x0d\xc4\x50\x89\x43\xd8\xac\x74\x3b\xee\xd8\x86\xb4\xb5\xbb\xa6\x06\x45\xd4\x20\x81\x35\x40\xb6\x42\xf8\xd0\xac\xd1\x19\xf4\x48\x10\x1e\x84\x68\x5c\xa1\x0b\x43\xfd\xf2\x36\xbb\xb3\x06\x67\xe9\x97\xd7\xc1\x80\x74\x89\x8e\xca\x69\xba\x57\xf7\xa3\x4e\xb0\x6f\xf2\x65\x98\xc2\x66\xab\xd9\xd5\x1f\x01\x00\x00\xff\xff\xa8\x51\xbb\xed\x15\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",

From e66dfafdecc7e74113e7b13712effca333ad62fc Mon Sep 17 00:00:00 2001
From: Daniel Holbach <daniel@weave.works>
Date: Tue, 30 Jul 2019 14:25:56 +0200
Subject: [PATCH 135/158] point to new mailing list

---
 CONTRIBUTING.md | 8 ++++----
 README.md       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1234476f4..9f388c35c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,10 +39,10 @@ The project uses Slack: To join the conversation, simply join the
 [#flux](https://cloud-native.slack.com/messages/flux/) channel.
 
 The Flux developers use a mailing list to discuss development as well.
-Simply subscribe to [flux-dev on Google
-Groups](https://groups.google.com/forum/#!forum/flux-dev) to join the
-conversation (this will also add an invitation to your Google calendar
-for our [Flux meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#)).
+Simply subscribe to [flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev)
+to join the conversation (this will also add an invitation to your
+Google calendar for our [Flux
+meeting](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit#)).
 
 ## Getting Started
 
diff --git a/README.md b/README.md
index 1783eab99..474624e4e 100644
--- a/README.md
+++ b/README.md
@@ -154,7 +154,7 @@ If you have any questions about Flux and continuous delivery:
   slack and ask a question on the [#flux](https://cloud-native.slack.com/messages/flux/)
   channel.
 - To be part of the conversation about Flux's development, join the
-  [flux-dev mailing list](https://groups.google.com/forum/#!forum/flux-dev).
+  [flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
 - [File an issue.](https://github.com/fluxcd/flux/issues/new)
 
 Your feedback is always welcome!

From 5e549fa882f29c368b17ee820e07f72947f8c166 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 30 Jul 2019 18:14:54 +0200
Subject: [PATCH 136/158] Restructure and split Flux and Helm op docs

---
 CONTRIBUTING.md                               |   8 +-
 README.md                                     |  22 +-
 chart/flux/README.md                          |  10 +-
 .../deployment-pipeline.png                   | Bin
 docs/{images => _files}/flux-cd-diagram.png   | Bin
 docs/{images => _files}/weave-flux.png        | Bin
 docs/contributing/building.md                 |  33 ++
 docs/contributing/get-started-developing.md   | 287 ++++++++++++++++++
 docs/contributing/index.rst                   |  11 +
 docs/development/building.md                  |  28 --
 docs/development/get-started-developing.md    | 211 -------------
 docs/development/index.rst                    |  15 -
 docs/faq.md                                   |  77 ++---
 docs/features/index.rst                       |  16 -
 docs/{install => get-started}/index.rst       |  27 +-
 docs/guides/index.rst                         |  12 +
 docs/guides/provide-own-ssh-key.md            |  36 +++
 docs/{using => guides}/upgrading-to-1.0.md    |  16 +-
 docs/guides/use-private-git-host.md           |  87 ++++++
 docs/helm-operator/faq.md                     |  42 +++
 docs/helm-operator/guides/index.rst           |  10 +
 .../guides/upgrading-to-beta.md}              |   6 +-
 docs/helm-operator/index.rst                  |  15 +
 .../helmrelease-custom-resource.md}           | 201 ++----------
 docs/helm-operator/references/index.rst       |  11 +
 docs/helm-operator/references/operator.md     |  40 +++
 docs/helm-operator/troubleshooting.md         |  27 ++
 .../tutorials/get-started.md}                 |  66 +---
 docs/helm-operator/tutorials/index.rst        |  10 +
 docs/helm/index.rst                           |  14 -
 docs/index.rst                                |  35 ++-
 docs/install/index.md                         |  17 --
 docs/install/standalone-setup.md              | 187 ------------
 .../blueprint.md}                             |  17 +-
 docs/{features => references}/daemon.md       |  60 ++--
 docs/{using => references}/fluxctl.md         |  14 +-
 .../fluxyaml-config-files.md                  |   6 +-
 .../garbagecollection.md                      |  14 +-
 docs/{using => references}/git-gpg.md         |   0
 docs/references/helm-operator-integration.md  | 123 ++++++++
 docs/references/index.rst                     |  17 ++
 docs/{using => references}/monitoring.md      |   0
 docs/troubleshooting.md                       |  46 +--
 .../driving-flux.md}                          |  12 +-
 .../get-started-helm.md}                      |  28 +-
 docs/{install => tutorials}/get-started.md    |  85 +++---
 docs/tutorials/index.rst                      |  12 +
 docs/using/index.rst                          |  16 -
 internal_docs/releasing.md                    |   2 +-
 49 files changed, 1031 insertions(+), 998 deletions(-)
 rename docs/{images => _files}/deployment-pipeline.png (100%)
 rename docs/{images => _files}/flux-cd-diagram.png (100%)
 rename docs/{images => _files}/weave-flux.png (100%)
 create mode 100644 docs/contributing/building.md
 create mode 100644 docs/contributing/get-started-developing.md
 create mode 100644 docs/contributing/index.rst
 delete mode 100644 docs/development/building.md
 delete mode 100644 docs/development/get-started-developing.md
 delete mode 100644 docs/development/index.rst
 delete mode 100644 docs/features/index.rst
 rename docs/{install => get-started}/index.rst (52%)
 create mode 100644 docs/guides/index.rst
 create mode 100644 docs/guides/provide-own-ssh-key.md
 rename docs/{using => guides}/upgrading-to-1.0.md (89%)
 create mode 100644 docs/guides/use-private-git-host.md
 create mode 100644 docs/helm-operator/faq.md
 create mode 100644 docs/helm-operator/guides/index.rst
 rename docs/{helm/helm-upgrading-to-beta.md => helm-operator/guides/upgrading-to-beta.md} (96%)
 create mode 100644 docs/helm-operator/index.rst
 rename docs/{helm/helm-integration.md => helm-operator/references/helmrelease-custom-resource.md} (72%)
 create mode 100644 docs/helm-operator/references/index.rst
 create mode 100644 docs/helm-operator/references/operator.md
 create mode 100644 docs/helm-operator/troubleshooting.md
 rename docs/{helm/helm-operator.md => helm-operator/tutorials/get-started.md} (55%)
 create mode 100644 docs/helm-operator/tutorials/index.rst
 delete mode 100644 docs/helm/index.rst
 delete mode 100644 docs/install/index.md
 delete mode 100644 docs/install/standalone-setup.md
 rename docs/{how-it-works.md => references/blueprint.md} (87%)
 rename docs/{features => references}/daemon.md (83%)
 rename docs/{using => references}/fluxctl.md (99%)
 rename docs/{features => references}/fluxyaml-config-files.md (97%)
 rename docs/{features => references}/garbagecollection.md (84%)
 rename docs/{using => references}/git-gpg.md (100%)
 create mode 100644 docs/references/helm-operator-integration.md
 create mode 100644 docs/references/index.rst
 rename docs/{using => references}/monitoring.md (100%)
 rename docs/{using/annotations-tutorial.md => tutorials/driving-flux.md} (95%)
 rename docs/{install/helm-get-started.md => tutorials/get-started-helm.md} (87%)
 rename docs/{install => tutorials}/get-started.md (62%)
 create mode 100644 docs/tutorials/index.rst
 delete mode 100644 docs/using/index.rst

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9f388c35c..a8c8bbb8f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,8 +18,8 @@ the `blocked-needs-validation` label is removed, and the issue can be worked
 on.
 
 To set up Flux to test things, there's documentation about setting up a
-[standalone install](docs/install/get-started.md) and a [Helm
-install](docs/install/helm-get-started.md), which might be helpful.
+[standalone install](docs/tutorials/get-started.md) and a [Helm
+install](docs/tutorials/get-started-helm.md), which might be helpful.
 
 Please talk to us on Slack, if you should get stuck anywhere. We appreciate
 any help and look forward to talking to you soon!
@@ -73,10 +73,10 @@ This is a rough outline of how to prepare a contribution:
 
 ### How to build and run the project
 
-Refer to the [building doc](docs/development/building.md) to find out how to build from
+Refer to the [building doc](docs/contributing/building.md) to find out how to build from
 source.
 
-Refer to the [Get Started Developing](docs/development/get-started-developing.md) guide for a walkthrough on developing Flux locally.
+Refer to the [Get Started Developing](docs/contributing/get-started-developing.md) guide for a walkthrough on developing Flux locally.
 
 ### How to run the test suite
 
diff --git a/README.md b/README.md
index 474624e4e..6ba306cfe 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ change is atomic and transactional, git has your audit log. Each transaction
 either fails or succeeds cleanly. You're entirely code centric and don't need
 new infrastructure.
 
-![Deployment Pipeline](docs/images/flux-cd-diagram.png)
+![Deployment Pipeline](docs/_files/flux-cd-diagram.png)
 
 [![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
 [![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
@@ -48,7 +48,7 @@ Its major features are:
 
 - [Automated git → cluster synchronisation](/docs/introduction.md#automated-git-cluster-synchronisation)
 - [Automated deployment of new container images](/docs/introduction.md#automated-deployment-of-new-container-images)
-- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/helm/helm-integration.md) and more)
+- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/references/helm-operator-integration.md) and more)
 - No additional service or infrastructure needed - Flux lives inside your
   cluster
 - Straight-forward control over the state of deployments in the
@@ -101,19 +101,19 @@ Get started by browsing through the documentation below:
 - Background about Flux
   - [Introduction to Flux](/docs/introduction.md)
   - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [How it works](/docs/how-it-works.md)
+  - [How it works](/docs/references/blueprint.md)
   - [Considerations regarding installing Flux](/docs/install/index.md)
-  - [Flux <-> Helm integration](/docs/helm/helm-integration.md)
+  - [Flux <-> Helm integration](/docs/references/helm-operator-integration.md)
 - Get Started with Flux
-  - [Standalone Flux](/docs/install/get-started.md)
-  - [Flux using Helm](/docs/install/helm-get-started.md)
-  - [Automation: annotations and locks](/docs/using/annotations-tutorial.md)
+  - [Standalone Flux](/docs/tutorials/get-started.md)
+  - [Flux using Helm](/docs/tutorials/get-started-helm.md)
+  - [Automation: annotations and locks](/docs/tutorials/driving-flux.md)
 - Operating Flux
-  - [Using fluxctl to control Flux](/docs/using/fluxctl.md)
-  - [Helm Operator](/docs/helm/helm-operator.md)
+  - [Using fluxctl to control Flux](/docs/references/fluxctl.md)
+  - [Helm Operator](/docs/helm-operator/)
   - [Troubleshooting](/docs/troubleshooting.md)
   - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [Upgrading to Flux v1](/docs/using/upgrading-to-1.0.md)
+  - [Upgrading to Flux v1](/docs/guides/upgrading-to-1.0.md)
 
 ### Integrations
 
@@ -142,7 +142,7 @@ To familiarise yourself with the project and how things work, you might
 be interested in the following:
 
 - [Our contributions guidelines](CONTRIBUTING.md)
-- [Build documentation](/docs/development/building.md)
+- [Build documentation](/docs/contributing/building.md)
 - [Release documentation](/internal_docs/releasing.md)
 
 ## <a name="help"></a>Getting Help
diff --git a/chart/flux/README.md b/chart/flux/README.md
index 568cec5ee..afdd0367b 100755
--- a/chart/flux/README.md
+++ b/chart/flux/README.md
@@ -22,7 +22,7 @@ This means fluxd can fail to apply changes to HelmRelease resources.
 ### Helm
 
 Tiller should be running in the cluster, though
-[helm-operator](../../docs/helm/helm-operator.md) will wait
+[helm-operator](../../docs/helm-operator/references/operator.md) will wait
 until it can find one.
 
 # Git repo
@@ -37,7 +37,7 @@ until it can find one.
 ## Installation
 
 We put together a simple [Get Started
-guide](../../docs/install/helm-get-started.md) which takes about 5-10 minutes to follow.
+guide](../../docs/tutorials/get-started-helm.md) which takes about 5-10 minutes to follow.
 You will have a fully working Flux installation deploying workloads to your cluster.
 
 ## Installing Flux using Helm
@@ -154,7 +154,7 @@ The [configuration](#configuration) section lists all the parameters that can be
 #### Setup Git deploy
 
 At startup Flux generates a SSH key and logs the public key.
-Find the SSH public key by installing [fluxctl](../../docs/using/fluxctl.md) and
+Find the SSH public key by installing [fluxctl](../../docs/references/fluxctl.md) and
 running:
 
 ```sh
@@ -288,8 +288,8 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `helmOperator.affinity`                           | `{}`                                                 | Affinity properties for the helmOperator deployment
 | `kube.config`                                     | [See values.yaml](/chart/flux/values.yaml#L151-L165) | Override for kubectl default config in the Flux pod(s).
 | `prometheus.enabled`                              | `false`                                              | If enabled, adds prometheus annotations to Flux and helmOperator pod(s)
-| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/docs/features/garbagecollection.md))
-| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/docs/features/garbagecollection.md))
+| `syncGarbageCollection.enabled`                   | `false`                                              | If enabled, fluxd will delete resources that it created, but are no longer present in git (experimental, see [garbage collection](/docs/references/garbagecollection.md))
+| `syncGarbageCollection.dry`                       | `false`                                              | If enabled, fluxd won't delete any resources, but log the garbage collection output (experimental, see [garbage collection](/docs/references/garbagecollection.md))
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
 
diff --git a/docs/images/deployment-pipeline.png b/docs/_files/deployment-pipeline.png
similarity index 100%
rename from docs/images/deployment-pipeline.png
rename to docs/_files/deployment-pipeline.png
diff --git a/docs/images/flux-cd-diagram.png b/docs/_files/flux-cd-diagram.png
similarity index 100%
rename from docs/images/flux-cd-diagram.png
rename to docs/_files/flux-cd-diagram.png
diff --git a/docs/images/weave-flux.png b/docs/_files/weave-flux.png
similarity index 100%
rename from docs/images/weave-flux.png
rename to docs/_files/weave-flux.png
diff --git a/docs/contributing/building.md b/docs/contributing/building.md
new file mode 100644
index 000000000..f951bbfa7
--- /dev/null
+++ b/docs/contributing/building.md
@@ -0,0 +1,33 @@
+# Building
+
+You'll need a working `go` environment version >= 1.11 (official releases are built against `1.12`).
+It's also expected that you have a Docker daemon for building images.
+
+Clone the repository. The project uses [Go Modules](https://github.com/golang/go/wiki/Modules),
+so if you explicitly define `$GOPATH` you should clone somewhere else.
+
+Then, from the root directory:
+
+```sh
+make
+```
+
+This makes Docker images, and installs binaries to `$GOBIN` (if you define it) or `$(go env GOPATH)/bin`.
+
+> **Note:** the default target architecture is amd64. If you would like
+> to try to build Docker images and binaries for a different
+> architecture you will have to set ARCH variable:
+>
+> ```sh
+> $ make ARCH=<target_arch>
+> ```
+
+## Running tests
+
+```sh
+# Unit tests
+make test
+
+# End-to-end tests
+make e2e
+```
diff --git a/docs/contributing/get-started-developing.md b/docs/contributing/get-started-developing.md
new file mode 100644
index 000000000..71ea6ac5c
--- /dev/null
+++ b/docs/contributing/get-started-developing.md
@@ -0,0 +1,287 @@
+# Get started developing
+
+This guide shows a workflow for making a small (actually, tiny) change
+to Flux, building and testing that change locally.
+
+## TL;DR
+
+From a very high level, there are at least 3 ways you can develop on
+Flux once you have your environment set up:
+
+1. The "minimalist" approach (only requires and `kubectl`):
+
+     1. `make`
+     2. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`)
+        for what you just built and paste it into `/deploy/flux-deployment.yaml`
+        as the image you're targeting to deploy
+     3. deploy the resources in `/develop/*.yaml` manually with
+        `kubectl apply`
+     4. make a change to the code
+     6. see your code changes have been deployed
+     7. repeat
+
+2. Use `freshpod` to deploy changes to the `/deploy` directory resources:
+
+     1. `make`
+     2. make a change to the code
+     3. see your changes have been deployed
+     4. repeat
+
+3. Remote cluster development approach:
+
+     1. ensure local `kubectl` access to a remote Kubernetes cluster
+     2. have an available local memcached instance
+     3. make a change to the code
+     4. ```sh
+        go run cmd/fluxd/main.go \
+            --memcached-hostname localhost  \
+            --memcached-port 11211 \
+            --memcached-service "" \
+            --git-url git@github.com:fluxcd/flux-get-started \
+            --k8s-in-cluster=false
+        ```
+
+This guide covers approaches 1 and 2 using `minikube`. `freshpod` is
+superseded by `Skaffold` and is generally the future.  That said,
+`freshpod` is very simple to use and reason about (and is still well
+supported by `minikube`) which is why it's used in this guide.
+
+## Run `fluxcd/flux-getting-started`
+
+We're going to make some changes soon enough, but just to get a good
+baseline please follow the ["Get started with Flux"](../tutorials/get-started.md)
+tutorial and run the `fluxcd/flux-getting-started` repo through its
+normal paces.
+
+Now that we know everything is working with `flux-getting-started`,
+we're going to try and do nearly the same thing as `flux-getting-started`,
+except instead of using official releases of flux, we're going to build
+and run what we have locally.
+
+## Prepare your environment
+
+1. Install the prerequisites. This guide is written from running Linux,
+   but the same instructions will generally apply to OSX. Although
+   everything you need has been known to work independently in Windows
+   from time to time, results may vary.
+
+    - [`minikube`](https://kubernetes.io/docs/tasks/tools/install-minikube/)
+    - [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
+    - [`docker`](https://docs.docker.com/install/)
+    - [`go`](https://golang.org/doc/install)
+
+2. Configure your environment so you can run tests. Run:
+
+    ```sh
+    make test
+    ```
+
+3. We want to make sure we're starting fresh. Tell `minikube` to clear
+   any previously running clusters:
+
+    ```sh
+    minikube delete
+    ```
+
+4. The [`minikube` addon](https://github.com/kubernetes/minikube/blob/master/docs/addons.md)
+   called [freshpod](https://github.com/GoogleCloudPlatform/freshpod)
+   that will be very useful to us later. You'll see. It's gonna be cool.
+
+   ```sh
+   minikube addons enable freshpod
+   ```
+
+5. This part is really important. You're going to set some environment
+   variables which will intercept any images pulled by docker. Run
+   `minikube docker-env` to see what we're talking about. You'll get an
+   output that shows you what the script is doing. Thankfully, it's not
+   terribly complicated - it just sets some environment variables which
+   will allow `minikube` to man-in-the-middle the requests Kubernetes
+   makes to pull images. It will look something like this:
+
+   ```sh
+   export DOCKER_TLS_VERIFY="1"
+   export DOCKER_HOST="tcp://192.168.99.128:2376"
+   export DOCKER_CERT_PATH="/home/fluxrulez/.minikube/certs"
+   export DOCKER_API_VERSION="1.35"
+   # Run this command to configure your shell:
+   # eval $(minikube docker-env)
+    ```
+
+   So, as the script suggests, run the following command:
+
+   ```sh
+   eval $(minikube docker-env)
+   ```
+
+   Now, be warned. These are local variables. This means that if you
+   run this `eval` in one terminal and then switch to another for later
+   when we build the Flux project, you're gonna hit some issues.
+   For one, you'll know it isn't working because Kubernetes will tell
+   you that it can't pull the image when you run `kubectl get pods`:
+
+   ```sh
+   NAME                        READY   STATUS         RESTARTS   AGE
+   flux-7f6bd57699-shx9v       0/1     ErrImagePull   0          35s
+   ```
+
+## Prepare the repository
+
+1. Fork the [repo on GitHub](https://github.com/fluxcd/flux).
+
+2. Clone `git@github.com:<YOUR-GITHUB-USERNAME>/flux.git` replacing
+   `<YOUR-GITHUB-USERNAME>` with your GitHub username.
+
+   In the same terminal you ran `eval $(minikube docker-env)`, run
+   `GO111MODULE=on go mod download` followed by `make` from the root
+   directory of the Flux repo.  You'll see docker's usual output as it
+   builds the image layers.  Once it's done, you should see something
+   like this in the middle of the output:
+
+   ```sh
+   Successfully built 606610e0f4ef
+   Successfully tagged docker.io/fluxcd/flux:latest
+   Successfully tagged docker.io/fluxcd/flux:master-a86167e4
+   ```
+
+   This confirms that a new docker image was tagged for your image.
+
+3. Open up [`deploy/flux-deployment.yaml`](https://github.com/fluxcd/flux/blob/master/deploy/flux-deployment.yaml)
+   and update the image at `spec.template.spec.containers[0].image` to
+   be simply `docker.io/fluxcd/flux`. While we're here, also change
+   the `--git-url` to point towards your fork. It will look something
+   like this in the YAML:
+
+   ```yaml
+   spec:
+     template:
+       spec:
+         containers:
+         - name: flux
+           image: docker.io/fluxcd/flux
+           imagePullPolicy: IfNotPresent
+           args:
+             - --git-url=git@github.com:<YOUR-GITHUB-USERNAME>/flux-getting-started
+             - --git-branch=master
+    ```
+
+4. We're ready to apply your newly-customized deployment! Since `kubectl`
+   will apply all the Kubernetes manifests it finds (recursively) in a
+   folder, we simply need to pass the directory to `kubectl apply`:
+
+   ```sh
+   kubectl apply --filename ./deploy
+   ````
+
+   You should see an output similar to:
+
+   ```sh
+   serviceaccount/flux created
+   clusterrole.rbac.authorization.k8s.io/flux created
+   clusterrolebinding.rbac.authorization.k8s.io/flux created
+   deployment.apps/flux created
+   secret/flux-git-deploy created
+   deployment.apps/memcached created
+   service/memcached created
+   secret/flux-git-deploy configured
+   ```
+
+   Congrats you just deployed your local Flux to your default namespace.
+   Check that everything is running:
+
+   ```sh
+   kubectl get pods --selector=name=flux
+   ```
+
+   You should get an output that looks like:
+
+   ```sh
+   NAME                   READY   STATUS    RESTARTS   AGE
+   flux-6f7fd5bbc-hpq85   1/1     Running   0          38s
+   ```
+
+   If (instead) you see that Ready is showing `0/1` and/or the status is
+   `ErrImagePull` double back on the instructions and make sure you did
+   everything correctly and in order.
+
+5. Pull the logs for your "fresh off of master" copy of Flux that you
+   just deployed locally to `minikube`:
+
+   ```sh
+   kubectl logs --selector=name=flux
+   ```
+
+   You should see an output that looks something like this:
+
+   ```sh
+   ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/fluxcd/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
+   ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/fluxcd/flux    successful=60 attempted=60
+   ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
+   ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
+   ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
+   ts=2019-02-28T18:58:51.017452675Z caller=warming.go:364 component=warmer updated=memcached successful=66 attempted=66
+   ts=2019-02-28T18:58:51.020061586Z caller=images.go:17 component=sync-loop msg="polling images"
+   ts=2019-02-28T18:58:51.020113243Z caller=images.go:27 component=sync-loop msg="no automated services"
+   ```
+
+## Make some changes
+
+1. Now for the part you've been waiting for! We're going to make a
+   cosmetic change to our local copy of Flux. Navigate to [git/operations.go](https://github.com/fluxcd/flux/blob/master/git/operations.go).
+   In it, you will find a private function to this package that goes
+   by the name `execGitCmd`. Paste the following as the (new) first
+   line of the function:
+
+   ```go
+   fmt.Println("executing git command ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ")
+   ```
+
+2. Run `make` again. Once this finishes you can check on your running
+   pods with:
+
+   ```sh
+   kubectl get pods --selector=name=flux
+   ```
+
+   Keep your eye on the `AGE` column. It should be just a few seconds
+   old if you check out the `AGE` column:
+
+   ```sh
+   NAME                   READY   STATUS    RESTARTS   AGE
+   flux-6f7fd5bbc-6j9d5   1/1     Running   0          10s
+   ```
+
+   This pod was deployed even though we didn't run any `kubectl`
+   commands or interact with Kubernetes directly because of the
+   `freshpod` `minikube` addon that we enabled earlier. Freshpod saw
+   that a new Docker image was tagged for `docker.io/fluxcd/flux:latest`
+   and it went ahead and redeployed that pod for us.
+
+   Consider that simply applying the `flux-deployment.yaml` file again
+   wouldn't do anything since the actual image we're targeting (which
+   is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's
+   the same difference) hasn't changed.  The Kubernetes api server will
+   get that JSON request from `kubectl` and go: "right... so nothing has
+   changed in the file so I have nothing to do... IGNORE!".
+
+   There is another way to do this, of course. Remember that before when
+   we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>`
+   syntax (in our specific example above it was `:master-a86167e4`).
+   We could, in theory, grab that tag every time we `make`, and then
+   paste it into `spec.template.spec.containers[0].image` of our
+   deployment. That's tedious and error prone. Instead, `freshpod` cuts
+   this step out for us and accomplishes the same end goal.
+
+3. Check the logs again (with `kubectl logs --selector=name=flux`) to
+   find that your obnoxious chain of `Z`s is present.
+
+## Congratulations!
+
+You have now modified Flux and deployed that change locally. From here
+on out, you simply need to run `make` after you save your changes and
+wait a few seconds for your new pod to be deployed to `minikube`.
+Keep in mind, that (as in the situation where you run `make` without
+saving any changes) if the Docker image you pointed to in the
+Kubernetes deployment for Flux is not Successfully tagged, `freshpod`
+won't have anything new to deploy.
+Other than that, you should be good to go!
diff --git a/docs/contributing/index.rst b/docs/contributing/index.rst
new file mode 100644
index 000000000..a4f190e3b
--- /dev/null
+++ b/docs/contributing/index.rst
@@ -0,0 +1,11 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Contributing
+============
+
+.. toctree::
+   :maxdepth: 1
+
+   get-started-developing
+   building
diff --git a/docs/development/building.md b/docs/development/building.md
deleted file mode 100644
index 559cc6041..000000000
--- a/docs/development/building.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Building Weave Flux
-
-You'll need a working `go` environment version >= 1.11 (official releases are built against `1.12`).
-It's also expected that you have a Docker daemon for building images.
-
-Clone the respository. The project uses Go Modules, so if you explicitly define `$GOPATH` you should
-clone somewhere else
-
-Then, from the root directory,
-
-```sh
-$ make
-```
-
-This makes Docker images, and installs binaries to `$GOBIN` (if you define it) or `$(go env GOPATH)/bin`.
-
-Note: The default target architecture is amd64. If you would like to try to build Docker images
-and binaries for a different architecture you will have to set ARCH variable,
-
-```sh
-$ make ARCH=<target_arch>
-```
-
-## Running tests
-
-```sh
-$ make test
-```
diff --git a/docs/development/get-started-developing.md b/docs/development/get-started-developing.md
deleted file mode 100644
index 0ccd7e7eb..000000000
--- a/docs/development/get-started-developing.md
+++ /dev/null
@@ -1,211 +0,0 @@
-# Get Started Developing Flux
-
-This guide shows a workflow for making a small (actually, tiny) change to Flux, building and testing that change locally.
-
-> ### TL;DR
->
-> From a very high level, there are at least 3 ways you can develop on Flux once you have your environment set up:
-> 1. The "minimalist" approach (only requires and `kubectl`):
->    1. `make`
->    1. copy the specific image tag (e.g. `docker.io/fluxcd/flux:master-a86167e4`) for what you just built and paste it into `/deploy/flux-deployment.yaml` as the image you're targeting to deploy
->    1. deploy the resources in `/develop/*.yaml` manually with `kubectl apply`
->    1. make a change to the code
->    1. see your code changes have been deployed
->    1. repeat
-> 1. Use `freshpod` to deploy changes to the `/deploy` directory resources:
->    1. `make`
->    1. make a change to the code
->    1. see your code changes have been deployed
->    1. repeat
-> 1. Remote cluster development approach:
->    1. ensure local kubectl access to a remote kubernetes cluster.
->    1. have an available local memcached instance.
->    1. make a change to the code
->    1. ```bash
->          go run cmd/fluxd/main.go \
->           --memcached-hostname localhost  \
->           --memcached-port 11211 \
->           --memcached-service "" \
->           --git-url git@github.com:weaveworks/flux-get-started \
->           --k8s-in-cluster=false
->       ```
->    1. repeat
-> 1. Use `helm` and `skaffold` together to deploy changes to the Flux helm chart.
->    1. `make`
->    1. make a change to the code
->    1. see your code changes have been deployed
->    1. repeat
->
-> This guide covers approaches 1 and 2 using `minikube`. `freshpod` is superseded by `Skaffold` and is generally the future.  That said, `freshpod` is very simple to use and reason about (and is still well supported by `minikube`) which is why it's used in this guide.
-
-## Run `flux-getting-started`
-
-We're going to make some changes soon enough, but just to get a good baseline please follow the [Getting Started](../install/get-started.md) guide and run the `flux-getting-started` repo through its normal paces.
-
-Now that we know everything is working with `flux-getting-started`, we're going to try and do nearly the same thing as `flux-getting-started`, except instead of using official releases of flux, we're going to build and run what we have locally.
-
-## Prepare your Environment
-
-1. Install the prerequisites.  This guide is written from running Linux, but the same instructions will generally apply to OSX.  Although everything you need has been known to work independently in Windows from time to time, results may vary.
-    - [Minikube](https://kubernetes.io/docs/tasks/tools/install-minikube/)
-    - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-    - [Docker](https://docs.docker.com/install/)
-    - [Go](https://golang.org/doc/install)
-
-1. Configure your enviroment so you can run tests.  Run:
-
-    ```sh
-    make test
-    ```
-
-1. We want to make sure we're starting fresh.  Tell Minikube to clear any previously running clusters.
-
-    ```sh
-    minikube delete
-    ```
-
-1. The [Minikube addon](https://github.com/kubernetes/minikube/blob/master/docs/addons.md) called [freshpod](https://github.com/GoogleCloudPlatform/freshpod) that will be very useful to us later.  You'll see.  It's gonna be cool.
-    ```sh
-    minikube addons enable freshpod
-    ```
-
-1. This part is really important.  You're going to set some environment variables which will intercept any images pulled by docker.  Run `minikube docker-env` to see what we're talking about.  You'll get an output that shows you what the script is doing.  Thankfully, it's not terribly complicated - it just sets some environment variables which will allow Minikube to man-in-the-middle the requests Kubernetes makes to pull images.  It will look something like this:
-
-    ```sh
-    export DOCKER_TLS_VERIFY="1"
-    export DOCKER_HOST="tcp://192.168.99.128:2376"
-    export DOCKER_CERT_PATH="/home/fluxrulez/.minikube/certs"
-    export DOCKER_API_VERSION="1.35"
-    # Run this command to configure your shell:
-    # eval $(minikube docker-env)
-    ```
-
-    So, as the script suggests, run the following command:
-
-    ```sh
-    eval $(minikube docker-env)
-    ```
-
-    Now, be warned. These are local variables.  This means that if you run this `eval` in one terminal and then switch to another for later when we build the Flux project, you're gonna hit some issues.  For one, you'll know it isn't working because Kubernetes will tell you that it can't pull the image when you run `kubectl get pods`:
-
-    ```sh
-    NAME                        READY   STATUS         RESTARTS   AGE
-    flux-7f6bd57699-shx9v       0/1     ErrImagePull   0          35s
-    ```
-
-## Prepare the Repository
-
-1. Fork the [repo on GitHub](https://github.com/weaveworks/flux).
-
-1. Clone `git@github.com:<YOUR-GITHUB-USERNAME>/flux.git` replacing `<YOUR-GITHUB-USERNAME>` with your GitHub username.
-
-    In the same terminal you ran `eval $(minikube docker-env)`, run `GO111MODULE=on go mod download` followed by `make` from the root directory of the Flux repo.  You'll see docker's usual output as it builds the image layers.  Once it's done, you should see something like this in the middle of the output:
-
-    ```sh
-    Successfully built 606610e0f4ef
-    Successfully tagged docker.io/fluxcd/flux:latest
-    Successfully tagged docker.io/fluxcd/flux:master-a86167e4
-    ```
-
-    This confirms that a new docker image was tagged for your image.
-
-1. Open up [`deploy/flux-deployment.yaml`](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) and update the image at `spec.template.spec.containers[0].image` to be simply `docker.io/weaveworks/flux`.  While we're here, also change the `git-url` to point towards your fork.  It will look something like this in the yaml:
-
-    ```yaml
-    spec:
-      template:
-        spec:
-          containers:
-          - name: flux
-            image: docker.io/fluxcd/flux
-            imagePullPolicy: IfNotPresent
-            args:
-              - --git-url=git@github.com:<YOUR-GITHUB-USERNAME>/flux-getting-started
-              - --git-branch=master
-    ```
-
-1. We're ready to apply your newly-customized deployment!  Since `kubectl` will apply all the Kubernetes manifests it finds (recursively) in a folder, we simply need to pass the directory to `kubectl apply`
-
-    ```sh
-    kubectl apply --filename ./deploy
-    ````
-
-    You should see an output similar to:
-
-    ```sh
-    serviceaccount/flux created
-    clusterrole.rbac.authorization.k8s.io/flux created
-    clusterrolebinding.rbac.authorization.k8s.io/flux created
-    deployment.apps/flux created
-    secret/flux-git-deploy created
-    deployment.apps/memcached created
-    service/memcached created
-    secret/flux-git-deploy configured
-    ```
-
-    Congrats you just deployed your local Flux to your default namespace.  Check that everything is running:
-
-    ```sh
-    kubectl get pods --selector=name=flux
-    ```
-
-    You should get an output that looks like:
-
-    ```sh
-    NAME                   READY   STATUS    RESTARTS   AGE
-    flux-6f7fd5bbc-hpq85   1/1     Running   0          38s
-    ```
-
-    If (instead) you see that Ready is showing `0/1` and/or the status is `ErrImagePull` double back on the instructions and make sure you did everything correctly and in order.
-
-1. Pull the logs for your "fresh off of master" copy of Flux that you just deployed locally to Minikube:
-
-    ```sh
-    kubectl logs --selector=name=flux
-    ```
-
-    You should see an output that looks something like this:
-
-    ```sh
-    ts=2019-02-28T18:58:45.091531939Z caller=warming.go:268 component=warmer info="refreshing image" image=docker.io/weaveworks/flux tag_count=60 to_update=60 of_which_refresh=0 of_which_missing=60
-    ts=2019-02-28T18:58:46.233723421Z caller=warming.go:364 component=warmer updated=docker.io/weaveworks/flux    successful=60 attempted=60
-    ts=2019-02-28T18:58:46.234086642Z caller=images.go:17 component=sync-loop msg="polling images"
-    ts=2019-02-28T18:58:46.234125646Z caller=images.go:27 component=sync-loop msg="no automated services"
-    ts=2019-02-28T18:58:46.749598558Z caller=warming.go:268 component=warmer info="refreshing image" image=memcached    tag_count=66 to_update=66 of_which_refresh=0 of_which_missing=66
-    ts=2019-02-28T18:58:51.017452675Z caller=warming.go:364 component=warmer updated=memcached successful=66 attempted=66
-    ts=2019-02-28T18:58:51.020061586Z caller=images.go:17 component=sync-loop msg="polling images"
-    ts=2019-02-28T18:58:51.020113243Z caller=images.go:27 component=sync-loop msg="no automated services"
-    ```
-
-## Make Some Changes
-
-1. Now for the part you've been waiting for!  We're going to make a cosmetic change to our local copy of Flux.  Navigate to [git/operations.go](https://github.com/weaveworks/flux/blob/master/git/operations.go).  In it, you will find a private function to this package that goes by the name `execGitCmd`.  Paste the following as the (new) first line of the function:
-
-    ```go
-    fmt.Println("executing git command ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ")
-    ```
-
-1. Run `make` again.  Once this finishes you can check on your running pods with
-
-    ```sh
-    kubectl get pods --selector=name=flux
-    ```
-
-    Keep your eye on the `AGE` column.  It should be just a few seconds old if you check out the `AGE` column:
-
-    ```sh
-    NAME                   READY   STATUS    RESTARTS   AGE
-    flux-6f7fd5bbc-6j9d5   1/1     Running   0          10s
-    ```
-
-    This pod was deployed even though we didn't run any `kubectl` commands or interact with Kubernetes directly because of the `freshpod` Minikube addon that we enabled earlier.  Freshpod saw that a new Docker image was tagged for `docker.io/fluxcd/flux:latest` and it went ahead and redeployed that pod for us.
-
-    Consider that simply applying the `flux-deployment.yaml` file again wouldn't do anything since the actual image we're targeting (which is actually `docker.io/fluxcd/flux` with no `:latest` tag, but it's the same difference) hasn't changed.  The Kubernetes api server will get that JSON request from kubectl and go: "right... so nothing has changed in the file so I have nothing to do... IGNORE!".
-
-    There is another way to do this, of course.  Remember that before when we ran `make` that we did _also_ get an image tagged with the `:<branch>-<commit hash>` syntax (in our specific example above it was `:master-a86167e4`).  We could, in theory, grab that tag every time we `make`, and then paste it into `spec.template.spec.containers[0].image` of our deployment.  That's tedious and error prone.  Instead, `freshpod` cuts this step out for us and accomplishes the same end goal.
-
-2. Check the logs again (with `kubectl logs --selector=name=flux`) to find that your obnoxious chain of `Z`s is present.
-
-## Congratulations!
-
-You have now modified Flux and deployed that change locally.  From here on out, you simply need to run `make` after you save your changes and wait a few seconds for your new pod to be deployed to minikube.  Keep in mind, that (as in the situation where you run `make` without saving any changes) if the docker image you pointed to in the Kubernetes deployment for Flux is not Successfully tagged, `freshpod` won't have anything new to deploy.  Other than that, you should be good to go!
diff --git a/docs/development/index.rst b/docs/development/index.rst
deleted file mode 100644
index 7a39bb441..000000000
--- a/docs/development/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Developing the Flux codebase
-==============================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-
-   get-started-developing
-   building
diff --git a/docs/faq.md b/docs/faq.md
index 6453a2444..46e90a7d7 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,4 +1,4 @@
-# Flux FAQ
+# Frequently asked questions
 
 ## General questions
 
@@ -49,9 +49,7 @@ example. We may return to the matter of staged deployments.
 ### Are there prerelease builds I can run?
 
 There are builds from CI for each merge to master branch. See
-[weaveworks/flux-prerelease](https://hub.docker.com/r/weaveworks/flux-prerelease/tags)
-and
-[weaveworks/helm-operator-prerelease](https://hub.docker.com/r/weaveworks/helm-operator-prerelease/tags).
+[fluxcd/flux-prerelease](https://hub.docker.com/r/fluxcd/flux-prerelease/tags).
 
 ## Technical questions
 
@@ -65,7 +63,7 @@ application code as you like, to be clear -- see
 There's no principled reason for this, it's just
 a consequence of time and effort being in finite supply. If you have a
 use for multiple git repo support, please comment in
-https://github.com/weaveworks/flux/issues/1164.
+https://github.com/fluxcd/flux/issues/1164.
 
 In the meantime, for some use cases you can run more than one Flux
 daemon and point them at different repos. If you do this, consider
@@ -107,7 +105,7 @@ fluxctl release --controller=deployment/foo --update-image=bar:v2
 
 The image tag will be updated in the git repository upon applying the command.
 
-For more information about Flux commands see [the fluxctl docs](./using/fluxctl.md).
+For more information about Flux commands see [the `fluxctl` docs](references/fluxctl.md).
 
 ### Does Flux automatically sync changes back to git?
 
@@ -117,13 +115,13 @@ No. It applies changes to git only when a Flux command or API call makes them.
 
 Flux has an experimental (for now) garbage collection feature,
 enabled by passing the command-line flag `--sync-garbage-collection`
-to fluxd.
+to `fluxd`.
 
 The garbage collection is conservative: it is designed to not delete
-resources that were not created by fluxd. This means it will sometimes
-_not_ delete resources that _were_ created by fluxd, when
+resources that were not created by `fluxd`. This means it will sometimes
+_not_ delete resources that _were_ created by `fluxd`, when
 reconfigured. Read more about garbage collection
-[here](./features/garbagecollection.md).
+[here](references/garbagecollection.md).
 
 ### How do I give Flux access to an image registry?
 
@@ -148,7 +146,7 @@ There are exceptions:
 
 To work around exceptional cases, you can mount a docker config into
 the Flux container. See the argument `--docker-config` in [the daemon
-arguments reference](./features/daemon.md).
+arguments reference](references/daemon.md).
 
 See also
 [Why are my images not showing up in the list of images?](#why-are-my-images-not-showing-up-in-the-list-of-images)
@@ -169,7 +167,7 @@ registries if you spam them with requests.
 
 If you are using GCP/GKE/GCR, you will likely want much lower rate
 limits. Please see
-[weaveworks/flux#1016](https://github.com/weaveworks/flux/issues/1016)
+[fluxcd/flux#1016](https://github.com/fluxcd/flux/issues/1016)
 for specific advice.
 
 ### How often does Flux check for new git commits (and can I make it sync faster)?
@@ -211,7 +209,7 @@ Then create a new secret named `flux-git-deploy`, using your private key as the
 
 `kubectl create secret generic flux-git-deploy --from-file=identity=/full/path/to/private_key`
 
-Now restart fluxd to re-read the k8s secret (if it is running):
+Now restart `fluxd` to re-read the k8s secret (if it is running):
 
 `kubectl delete $(kubectl get pod -o name -l name=flux)`
 
@@ -231,7 +229,7 @@ service, or running your own git host, you need to supply your own
 host key(s).
 
 How to do this is documented in
-[the standalone setup doc](./install/standalone-setup.md).
+["Using a private Git host"](./guides/use-private-git-host.md).
 
 ### Why does my CI pipeline keep getting triggered?
 
@@ -279,7 +277,7 @@ attempts to scan for workloads.
 
 ### Can I change the namespace Flux puts things in by default?
 
-Yes. The fluxd image has a "kubeconfig" file baked in, which specifies
+Yes. The `fluxd` image has a "kubeconfig" file baked in, which specifies
 a default namespace of `"default"`. That means any manifest not
 specifying a namespace (in `.metadata.namespace`) will be given the
 namespace `"default"` when applied to the cluster.
@@ -287,12 +285,12 @@ namespace `"default"` when applied to the cluster.
 You can override this by mounting your own "kubeconfig" file into the
 container from a configmap, and using the `KUBECONFIG` environment
 entry to point to it. The [example
-deployment](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) shows how to do this, in
+deployment](https://github.com/fluxcd/flux/blob/master/deploy/flux-deployment.yaml) shows how to do this, in
 commented out sections -- it needs extra bits of config in three
 places (the `volume`, `volumeMount`, and `env` entries).
 
 The easiest way to create a suitable "kubeconfig" will be to adapt the
-[file that is baked into the image](https://github.com/weaveworks/flux/blob/master/docker/kubeconfig). Save that
+[file that is baked into the image](https://github.com/fluxcd/flux/blob/master/docker/kubeconfig). Save that
 locally as `my-kubeconfig`, edit it to change the default namespace,
 then create the configmap, in the same namespace you run Flux in, with
 something like:
@@ -323,7 +321,7 @@ Sometimes it might be easier to annotate a *running resource in
 the cluster* as opposed to committing a change to git. Please note
 that this will only work with resources of the type `namespace`
 and the set of controllers in
-[resourcekinds.go](https://github.com/weaveworks/flux/blob/master/cluster/kubernetes/resourcekinds.go),
+[resourcekinds.go](https://github.com/fluxcd/flux/blob/master/cluster/kubernetes/resourcekinds.go),
 namely `deployment`, `daemonset`, `cronjob`, `statefulset` and
 `fluxhelmrelease`).
 
@@ -336,7 +334,7 @@ kubectl annotate <resource> "flux.weave.works/ignore"-
 
 Mixing both kinds of annotations (in-git and in-cluster), can make
 it a bit hard to figure out how/where to undo the change (cf
-[flux#1211](https://github.com/weaveworks/flux/issues/1211)).
+[flux#1211](https://github.com/fluxcd/flux/issues/1211)).
 
 The full story is this: Flux looks at the files and the running
 resources when deciding whether what to apply. But it gets the
@@ -386,44 +384,5 @@ Flux experimentally supports technology-agnostic manifest factorization through
 `.flux.yaml` configuration files placed in the Git repository. To enable this
 feature please supply `fluxd` with flag `--manifest-generation=true`.
 
-See [`.flux.yaml` configuration files documentation](./features/fluxyaml-config-files.md) for
+See [`.flux.yaml` configuration files documentation](references/fluxyaml-config-files.md) for
 further details.
-
-## Flux Helm Operator questions
-
-### I'm using SSL between Helm and Tiller. How can I configure Flux to use the certificate?
-
-When installing Flux, you can supply the CA and client-side certificate using the `helmOperator.tls` options,
-more details [here](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md#installing-weave-flux-helm-operator-and-helm-with-tls-enabled).
-
-### I've deleted a HelmRelease file from Git. Why is the Helm release still running on my cluster?
-
-Flux doesn't delete resources, there is an [issue](https://github.com/weaveworks/flux/issues/738) opened about this topic on GitHub.
-In order to delete a Helm release first remove the file from Git and afterwards run:
-
-```yaml
-kubectl delete helmrelease/my-release
-```
-
-The Flux Helm operator will receive the delete event and will purge the Helm release.
-
-### I've manually deleted a Helm release. Why is Flux not able to restore it?
-
-If you delete a Helm release with `helm delete my-release`, the release name can't be reused.
-You need to use the `helm delete --purge` option only then Flux will be able reinstall a release.
-
-### I have a dedicated Kubernetes cluster per environment and I want to use the same Git repo for all. How can I do that?
-
-*Option 1*
-For each cluster create a directory in your config repo.
-When installing Flux Helm chart set the Git path using `--set git.path=k8s/cluster-name`
-and set a unique label for each cluster `--set git.label=cluster-name`.
-
-You can have one or more shared dirs between clusters. Assuming your shared dir is located
-at `k8s/common` set the Git path as `--set git.path="k8s/common\,k8s/cluster-name"`.
-
-*Option 2*
-For each cluster create a Git branch in your config repo.
-When installing Flux Helm chart set the Git branch using `--set git.branch=cluster-name`
-and set a unique label for each cluster `--set git.label=cluster-name`.
-
diff --git a/docs/features/index.rst b/docs/features/index.rst
deleted file mode 100644
index 3ffca535b..000000000
--- a/docs/features/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-
-Flux Features
-==============================================
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
-   daemon
-   fluxyaml-config-files
-   garbagecollection
diff --git a/docs/install/index.rst b/docs/get-started/index.rst
similarity index 52%
rename from docs/install/index.rst
rename to docs/get-started/index.rst
index a2400b939..4de102604 100644
--- a/docs/install/index.rst
+++ b/docs/get-started/index.rst
@@ -1,28 +1,19 @@
-======================
-Prerequisites for Flux
-======================
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Get started
+===========
 
 All you need is a Kubernetes cluster and a git repo. The git repo
 contains `manifests <https://kubernetes.io/docs/concepts/configuration/overview/>`_
 (as YAML files) describing what should run in the cluster. Flux imposes
 :doc:`some requirements <../requirements>` on these files.
 
-Installing Weave Flux
-=====================
+Installing Flux
+---------------
 
 Here are the instructions to :doc:`install Flux on your own
-cluster <./get-started>`.
+cluster <../tutorials/get-started>`.
 
 If you are using Helm, we have a :doc:`separate section about
-this <./helm-get-started>`.
-
-You can also configure a more advanced, :doc:`standalone
-setup <./standalone-setup>`.
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
-   get-started
-   helm-get-started
-   standalone-setup
+this <../tutorials/get-started-helm>`.
diff --git a/docs/guides/index.rst b/docs/guides/index.rst
new file mode 100644
index 000000000..00f15501d
--- /dev/null
+++ b/docs/guides/index.rst
@@ -0,0 +1,12 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Guides
+======
+
+.. toctree::
+   :maxdepth: 1
+
+   provide-own-ssh-key
+   use-private-git-host
+   upgrading-to-1.0
diff --git a/docs/guides/provide-own-ssh-key.md b/docs/guides/provide-own-ssh-key.md
new file mode 100644
index 000000000..d747533aa
--- /dev/null
+++ b/docs/guides/provide-own-ssh-key.md
@@ -0,0 +1,36 @@
+# Providing your own SSH key
+
+Flux connects to the repository using an SSH key it retrieves from a
+Kubernetes secret, if the configured (`--k8s-secret-name`) secret has
+no `identity` key/value pair, it will generate new private key.
+
+With this knowledge, providing your own SSH key is as simple as
+creating the configured secret in the expected format.
+
+1. create a Kubernetes secret from your own private key:
+
+   ```sh
+   kubectl create secret generic flux-git-deploy --from-file=identity=/full/path/to/private_key
+   ```
+
+   this will result in a secret that has the structure:
+
+   ```yaml
+   apiVersion: v1
+   data:
+     identity: <base64 encoded RSA PRIVATE KEY>
+   kind: Secret
+   type: Opaque
+   metadata:
+     ...
+   ```
+   
+2. _(optional)_ if you created the secret with a non-default name
+   (default: `flux-git-deploy`), set the `--k8s-secret-name` flag to
+   the name of your secret (i.e. `--k8s-secret-name=foo`).
+
+> **Note:** the SSH key must be configured to have R/W access to the
+> repository. More specifically, the SSH key must be able to create
+> and update tags. E.g. in Gitlab, that means it requires `Maintainer`
+> permissions. The `Developer` permission can create tags, but not
+> update them.
diff --git a/docs/using/upgrading-to-1.0.md b/docs/guides/upgrading-to-1.0.md
similarity index 89%
rename from docs/using/upgrading-to-1.0.md
rename to docs/guides/upgrading-to-1.0.md
index 163e993be..86706e293 100644
--- a/docs/using/upgrading-to-1.0.md
+++ b/docs/guides/upgrading-to-1.0.md
@@ -8,7 +8,7 @@ service. This meant that to get a useful system, you had to run both
 the daemon and the service in your cluster. In version 1, the daemon
 does all of the mechanical work by itself.
 
-## Differences between Old Flux and Flux v1
+## Differences between old Flux and Flux v1
 
 In version 1 the daemon is more self-sufficient and easier to set
 up. It is also more capable, and in particular, it now synchronises
@@ -81,9 +81,9 @@ First, it will help in a few places to have an old fluxctl
 around. Download it from GitHub:
 
 ```sh
-curl -o fluxctl_030 https://github.com/weaveworks/flux/releases/download/0.3.0/fluxctl_linux_amd64
+curl -o fluxctl_030 https://github.com/fluxcd/flux/releases/download/0.3.0/fluxctl_linux_amd64
 # or if using macOS,
-# curl -o fluxctl_030 https://github.com/weaveworks/flux/releases/download/0.3.0/fluxctl_darwin_amd64
+# curl -o fluxctl_030 https://github.com/fluxcd/flux/releases/download/0.3.0/fluxctl_darwin_amd64
 chmod a+x ./fluxctl_030
 ```
 
@@ -91,7 +91,7 @@ chmod a+x ./fluxctl_030
 
 Set the environment variable FLUX_URL to point to the Flux service you
 are running, as described in
-[the old deployment docs](https://github.com/weaveworks/flux/blob/0.3.0/site/using.md#fluxctl-setup). The
+[the old deployment docs](https://github.com/fluxcd/flux/blob/0.3.0/site/using.md#fluxctl-setup). The
 particular URL will differ, depending on how you have told Kubernetes
 to expose the Flux service.
 
@@ -115,7 +115,7 @@ used to create them. If you don’t have the files on hand, you can try
 using the example deployment as a stand-in:
 
 ```sh
-git clone --branch 0.3.0 git@github.com:weaveworks/flux flux-0.3.0
+git clone --branch 0.3.0 git@github.com:fluxcd/flux flux-0.3.0
 kubectl delete --ignore-not-found -R -f ./flux-0.3.0/deploy
 ```
 
@@ -139,7 +139,7 @@ by Flux in the file `old-config.yaml` that was created earlier.
 
 To run Flux without connecting to Weave Cloud, adapt the manifests
 provided in the
-[Flux repo](https://github.com/weaveworks/flux/tree/master/deploy)
+[Flux repo](https://github.com/fluxcd/flux/tree/master/deploy)
 with the git parameters (URL, path, and branch) from
 `old-config.yaml`, and then apply them with `kubectl`. Consider adding
 these adapted manifests to your own config repo.
@@ -150,11 +150,11 @@ just that).
 
 You may find that you need to set FLUX_URL again, to take account of
 the new deployment. See the
-[setup instructions](https://github.com/weaveworks/flux/blob/1.0.1/site/standalone/setup.md#connecting-fluxctl-to-the-daemon)
+[setup instructions](https://github.com/fluxcd/flux/blob/1.0.1/site/standalone/setup.md#connecting-fluxctl-to-the-daemon)
 for guidance.
 
 To see the SSH key created by Flux, download the latest fluxctl from
-[the release page](https://github.com/weaveworks/flux/releases/tag/1.0.1)
+[the release page](https://github.com/fluxcd/flux/releases/tag/1.0.1)
 and run:
 
 ```sh
diff --git a/docs/guides/use-private-git-host.md b/docs/guides/use-private-git-host.md
new file mode 100644
index 000000000..5f1524fc5
--- /dev/null
+++ b/docs/guides/use-private-git-host.md
@@ -0,0 +1,87 @@
+# Using a private Git host
+
+If you're using your own git host -- e.g., your own installation of
+gitlab, or bitbucket server -- you will need to add its host key to
+`~/.ssh/known_hosts` in the Flux daemon container.
+
+First, run a check that you can clone the repo. The following assumes
+that your git server's hostname (e.g., `githost`) is in `$GITHOST` and
+the URL you'll use to access the repository (e.g.,
+`user@githost:path/to/repo`) is in `$GITREPO`.
+
+```sh
+$ # Find the fluxd daemon pod:
+$ kubectl get pods --all-namespaces -l name=flux
+NAMESPACE   NAME                    READY     STATUS    RESTARTS   AGE
+weave       flux-85cdc6cdfc-n2tgf   1/1       Running   0          1h
+
+$ kubectl exec -n weave flux-85cdc6cdfc-n2tgf -ti -- \
+    env GITHOST="$GITHOST" GITREPO="$GITREPO" PS1="container$ " /bin/sh
+
+container$ git clone $GITREPO
+Cloning into <repository name>...
+No ECDSA host key is known for  <GITHOST> and you have requested strict checking.
+Host key verification failed.
+fatal: Could not read from remote repository
+
+container$ # ^ that was expected. Now we'll try with a modified known_hosts
+container$ ssh-keyscan $GITHOST >> ~/.ssh/known_hosts
+container$ git clone $GITREPO
+Cloning into '...'
+...
+```
+
+If `git clone` doesn't succeed, you'll need to check that the SSH key
+has been installed properly first, then come back. `ssh -vv $GITHOST`
+from within the container may help debug it.
+
+If it _did_ work, you will need to make it a more permanent
+arrangement. Back in that shell, create a ConfigMap for the cluster. To
+make sure the ConfigMap is created in the namespace of the Flux
+deployment, the namespace is set explicitly:
+
+```sh
+container$ kubectl create configmap flux-ssh-config --from-file=$HOME/.ssh/known_hosts -n $(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+configmap "flux-ssh-config" created
+```
+
+To use the ConfigMap every time the Flux daemon restarts, you'll need
+to mount it into the container. The example deployment manifest
+includes an example of doing this, commented out. Uncomment those two blocks:
+
+```yaml
+      - name: ssh-config
+        configMap:
+          name: flux-ssh-config
+```
+
+```yaml
+        - name: ssh-config
+          mountPath: /root/.ssh
+```
+
+It assumes you used `flux-ssh-config` as name of the ConfigMap and then reapply the
+manifest.
+
+Another alternative is to create the ConfigMap from a template. This could be
+something like:
+
+```yaml
+apiVersion: v1
+data:
+  known_hosts: |
+    # github
+    192.30.253.112 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+    # github
+    192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+    # private gitlab
+    gitlab.________ ssh-rsa AAAAB3N...
+kind: ConfigMap
+metadata:
+  name: flux-ssh-config
+  namespace: <OPTIONAL NAMESPACE (if not default)>
+```
+
+You will need to explicitly tell `fluxd` to use that service account by
+uncommenting and possible adapting the line `# serviceAccountName:
+flux` in the file `flux-deployment.yaml` before applying it.
diff --git a/docs/helm-operator/faq.md b/docs/helm-operator/faq.md
new file mode 100644
index 000000000..741372df4
--- /dev/null
+++ b/docs/helm-operator/faq.md
@@ -0,0 +1,42 @@
+# Frequently asked questions
+
+### I'm using SSL between Helm and Tiller. How can I configure Flux to use the certificate?
+
+When installing Flux, you can supply the CA and client-side certificate using the `helmOperator.tls` options,
+more details [here](https://github.com/fluxcd/flux/blob/master/chart/flux/README.md#installing-weave-flux-helm-operator-and-helm-with-tls-enabled).
+
+### I've deleted a HelmRelease file from Git. Why is the Helm release still running on my cluster?
+
+Flux doesn't delete resources, there is an [issue](https://github.com/fluxcd/flux/issues/738) opened about this topic on GitHub.
+In order to delete a Helm release first remove the file from Git and afterwards run:
+
+```yaml
+kubectl delete helmrelease/my-release
+```
+
+The Helm operator will receive the delete event and will purge the Helm release.
+
+### I've manually deleted a Helm release. Why is Flux not able to restore it?
+
+If you delete a Helm release with `helm delete my-release`, the release name can't be reused.
+You need to use the `helm delete --purge` option only then Flux will be able reinstall a release.
+
+### I have a dedicated Kubernetes cluster per environment and I want to use the same Git repo for all. How can I do that?
+
+*Option 1*
+For each cluster create a directory in your config repo.
+When installing Flux Helm chart set the Git path using `--set git.path=k8s/cluster-name`
+and set a unique label for each cluster `--set git.label=cluster-name`.
+
+You can have one or more shared dirs between clusters. Assuming your shared dir is located
+at `k8s/common` set the Git path as `--set git.path="k8s/common\,k8s/cluster-name"`.
+
+*Option 2*
+For each cluster create a Git branch in your config repo.
+When installing Flux Helm chart set the Git branch using `--set git.branch=cluster-name`
+and set a unique label for each cluster `--set git.label=cluster-name`.
+
+### Are there prerelease builds I can run?
+
+There are builds from CI for each merge to master branch. See
+[fluxcd/helm-operator-prerelease](https://hub.docker.com/r/fluxcd/helm-operator-prerelease/tags).
diff --git a/docs/helm-operator/guides/index.rst b/docs/helm-operator/guides/index.rst
new file mode 100644
index 000000000..1dd0c6674
--- /dev/null
+++ b/docs/helm-operator/guides/index.rst
@@ -0,0 +1,10 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Guides
+======
+
+.. toctree::
+   :maxdepth: 1
+
+   upgrading-to-beta
diff --git a/docs/helm/helm-upgrading-to-beta.md b/docs/helm-operator/guides/upgrading-to-beta.md
similarity index 96%
rename from docs/helm/helm-upgrading-to-beta.md
rename to docs/helm-operator/guides/upgrading-to-beta.md
index 87a7c04a3..7270adb2f 100644
--- a/docs/helm/helm-upgrading-to-beta.md
+++ b/docs/helm-operator/guides/upgrading-to-beta.md
@@ -43,7 +43,7 @@ helm upgrade flux --reuse-values \
 --set image.tag=1.8.1 \
 --set helmOperator.tag=0.5.1 \
 --namespace=flux \
-weaveworks/flux --version 0.5.1
+fluxcd/flux --version 0.5.1
 ```
 
 The chart will leave the old custom resource definition and custom
@@ -72,8 +72,8 @@ since it expects the SSH key for the git repo to be in the same place.
 Once you want to use the new capabilities of the operator -- e.g.,
 releasing charts from Helm repos -- you will probably need to adapt
 the manifest further. The [Helm operator set-up
-guide](./helm-integration.md) and [example
-deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml)
+guide](../../references/helm-operator-integration.md) and [example
+deployment](https://github.com/fluxcd/flux/blob/master/deploy-helm/helm-operator-deployment.yaml)
 explain all the details.
 
 ## Updating custom resources
diff --git a/docs/helm-operator/index.rst b/docs/helm-operator/index.rst
new file mode 100644
index 000000000..9eac5cdd7
--- /dev/null
+++ b/docs/helm-operator/index.rst
@@ -0,0 +1,15 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Helm operator
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+   references/index
+   guides/index
+   tutorials/index
+
+   faq
+   troubleshooting
diff --git a/docs/helm/helm-integration.md b/docs/helm-operator/references/helmrelease-custom-resource.md
similarity index 72%
rename from docs/helm/helm-integration.md
rename to docs/helm-operator/references/helmrelease-custom-resource.md
index 930dfa5e6..eb8a4de1e 100644
--- a/docs/helm/helm-integration.md
+++ b/docs/helm-operator/references/helmrelease-custom-resource.md
@@ -1,25 +1,11 @@
-# Using Flux with Helm
-
-You can release charts to your cluster via "GitOps", by combining Flux
-and the Flux Helm Operator (also in
-[weaveworks/flux](https://github.com/weaveworks/flux)).
-
-The essential mechanism is this: the declaration of a Helm release is
-represented by a custom resource, specifying the chart and its
-values. If you put such a resource in your git repo as a file, Flux
-will apply it to the cluster, and once it's in the cluster, the Helm
-Operator will make sure the release exists by installing or upgrading
-it.
-
-## The `HelmRelease` custom resource
+# `HelmRelease` Custom Resource
 
 Each release of a chart is declared by a `HelmRelease`
 resource. The schema for these resources is given in [the custom
-resource definition](https://github.com/weaveworks/flux/blob/master/deploy-helm/flux-helm-release-crd.yaml). They
+resource definition](https://github.com/fluxcd/flux/blob/master/deploy-helm/flux-helm-release-crd.yaml). They
 look like this:
 
 ```yaml
----
 apiVersion: flux.weave.works/v1beta1
 kind: HelmRelease
 metadata:
@@ -52,7 +38,17 @@ The `values` section is where you provide the value overrides for the
 chart. This is as you would put in a `values.yaml` file, but inlined
 into the structure of the resource. See below for examples.
 
-### Using a chart from a Git repo instead of a Helm repo
+<a name="why-repo-urls">**Why use URLs to refer to repositories, rather than names?**</a> [^](#cite-why-repo-urls)
+
+A `HelmRelease` must be able to stand on its own. If we used names
+in the spec, which were resolved to URLs elsewhere (e.g., in a
+`repositories.yaml` supplied to the operator), it would be possible to
+change the meaning of a `HelmRelease` without altering it. This is
+undesirable because it makes it hard to specify exactly what you want,
+in the one place; or to read exactly what is being specified, in the
+one place. In other words, it's better to be explicit.
+
+## Using a chart from a Git repo instead of a Helm repo
 
 You can refer to a chart from a _git_ repo, rather than a chart repo,
 with a `chart:` section like this:
@@ -60,7 +56,7 @@ with a `chart:` section like this:
 ```yaml
 spec:
   chart:
-    git: git@github.com:weaveworks/flux-get-started
+    git: git@github.com:fluxcd/flux-get-started
     ref: master
     path: charts/ghost
 ```
@@ -76,7 +72,7 @@ secret at the expected location of the key (`/etc/fluxd/ssh/`). If you
 need more than one SSH key, you'll need to also mount an adapted
 ssh_config; this is also demonstrated in the example deployment.
 
-#### Notifying Helm Operator about Git changes
+### Notifying Helm Operator about Git changes
 
 The Helm Operator fetches the upstream of mirrored Git repositories
 with a 5 minute interval. In some scenarios (think CI/CD), you may not
@@ -95,29 +91,6 @@ OK
 > either need to port forward before making the request or put something
 > in front of it to serve as a gatekeeper.
 
-### Reinstalling a Helm release
-
-If a Helm release upgrade fails due to incompatible changes like modifying
-an immutable field (e.g. headless svc to ClusterIP)  
-you can reinstall it using the following command:
-
-```sh
-$ kubectl delete hr/my-release
-```
-
-When the Helm Operator receives a delete event from Kubernetes API it will
-call Tiller and purge the Helm release. On the next Flux sync, the Helm Release
-object will be created and the Helm Operator will install it.
-
-### What the Helm Operator does
-
-When the Helm Operator sees a `HelmRelease` resource in the
-cluster, it either installs or upgrades the named Helm release so that
-the chart is released as specified.
-
-It will also notice when a `HelmRelease` resource is updated, and
-take action accordingly.
-
 ## Supplying values to the chart
 
 You can supply values to be used with the chart when installing it, in
@@ -219,130 +192,6 @@ spec:
       optional: true                                       # optional; defaults to false
 ```
 
-## Upgrading images in a `HelmRelease` using Flux
-
-If the chart you're using in a `HelmRelease` lets you specify the
-particular images to run, you will usually be able to update them with
-Flux, the same way you can with Deployments and so on.
-
-> **Note:** for automation to work, the repository _and_ tag should be
-> defined, as Flux determines image updates based on what it reads in
-> the `.spec.values` of the `HelmRelease`.
-
-Flux interprets certain commonly used structures in the `values`
-section of a `HelmRelease` as referring to images. The following
-are understood (showing just the `values` section):
-
-```yaml
-values:
-  image: repo/image:version
-```
-
-```yaml
-values:
-  image: repo/image
-  tag: version
-```
-
-```yaml
-values:
-  registry: docker.io
-  image: repo/image
-  tag: version
-```
-
-```yaml
-values:
-  image:
-    repository: repo/image
-    tag: version
-```
-
-```yaml
-values:
-  image:
-    registry: docker.io
-    repository: repo/image
-    tag: version
-```
-
-These can appear at the top level (immediately under `values:`), or in
-a subsection (under a key, itself under `values:`). Other values
-may be mixed in arbitrarily. Here's an example of a values section
-that specifies two images, along with some other configuration:
-
-```yaml
-values:
-  persistent: true
-
-  # image that will be labeled "chart-image"
-  image: repo/image1:version
-
-  subsystem:
-    # image that will be labeled "subsystem"
-    image:
-      repository: repo/image2
-      tag: version
-      imagePullPolicy: IfNotPresent
-    port: 4040
-```
-
-You can use the [same annotations](../using/fluxctl.md) in
-the `HelmRelease` as you would for a Deployment or other workload,
-to control updates and automation. For the purpose of specifying
-filters, the container name is either `chart-image` (if at the top
-level), or the key under which the image is given (e.g., `"subsystem"`
-from the example above).
-
-Top level image example:
-
-```yaml
-kind: HelmRelease
-metadata:
-  annotations:
-    flux.weave.works/automated: "true"
-    flux.weave.works/tag.chart-image: semver:~4.0
-spec:
-  values:
-    image:
-      repository: bitnami/mongodb
-      tag: 4.0.3
-```
-
-Sub-section images example:
-
-```yaml
-kind: HelmRelease
-metadata:
-  annotations:
-    flux.weave.works/automated: "true"
-    flux.weave.works/tag.prometheus: semver:~2.3
-    flux.weave.works/tag.alertmanager: glob:v0.15.*
-    flux.weave.works/tag.nats: regex:^0.6.*
-spec:
-  values:
-    prometheus:
-      image: prom/prometheus:v2.3.1
-    alertmanager:
-      image: prom/alertmanager:v0.15.0
-    nats:
-      image:
-        repository: nats-streaming
-        tag: 0.6.0
-```
-
--------------
-
-<a name="why-repo-urls">**Why use URLs to refer to repositories, rather than names?**</a> [^](#cite-why-repo-urls)
-
-A `HelmRelease` must be able to stand on its own. If we used names
-in the spec, which were resolved to URLs elsewhere (e.g., in a
-`repositories.yaml` supplied to the operator), it would be possible to
-change the meaning of a `HelmRelease` without altering it. This is
-undesirable because it makes it hard to specify exactly what you want,
-in the one place; or to read exactly what is being specified, in the
-one place. In other words, it's better to be explicit.
-
 ## Rollbacks
 
 From time to time a release made by the Helm operator may fail, it is
@@ -384,6 +233,20 @@ spec:
     wait: false
 ```
 
+## Reinstalling a Helm release
+
+If a Helm release upgrade fails due to incompatible changes like modifying
+an immutable field (e.g. headless svc to ClusterIP)  
+you can reinstall it using the following command:
+
+```sh
+$ kubectl delete hr/my-release
+```
+
+When the Helm Operator receives a delete event from Kubernetes API it will
+call Tiller and purge the Helm release. On the next Flux sync, the Helm Release
+object will be created and the Helm Operator will install it.
+
 ## Authentication
 
 At present, per-resource authentication is not implemented. The
@@ -400,7 +263,7 @@ As a workaround, you can mount a `repositories.yaml` file with
 authentication already configured, into the operator container.
 
 > **Note:** When using a custom `repositories.yaml` the
-[default](https://github.com/weaveworks/flux/blob/master/docker/helm-repositories.yaml)
+[default](https://github.com/fluxcd/flux/blob/master/docker/helm-repositories.yaml)
 that ships with the operator is overwritten. This means that for any
 repository you want to make use of you should manually add an entry to
 your `repositories.yaml` file.
@@ -431,7 +294,7 @@ kubectl create secret generic flux-helm-repositories --from-file=./repositories.
 Lastly, mount that secret into the container. This can be done by
 setting `helmOperator.configureRepositories.enable` to `true` for the
 flux Helm release, or as shown in the commented-out sections of the
-[example deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
+[example deployment](https://github.com/fluxcd/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
 
 #### Azure ACR repositories
 
@@ -460,7 +323,7 @@ access.
 
 To provide an SSH key, put the key in a secret under the entry
 `identity`, and mount it into the operator container as shown in the
-[example deployment](https://github.com/weaveworks/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
+[example deployment](https://github.com/fluxcd/flux/blob/master/deploy-helm/helm-operator-deployment.yaml).
 The default ssh_config expects an identity file at
 `/etc/fluxd/ssh/identity`, which is where it'll be if you just
 uncomment the blocks from the example.
diff --git a/docs/helm-operator/references/index.rst b/docs/helm-operator/references/index.rst
new file mode 100644
index 000000000..092ec1169
--- /dev/null
+++ b/docs/helm-operator/references/index.rst
@@ -0,0 +1,11 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+References
+==========
+
+.. toctree::
+   :maxdepth: 1
+
+   operator
+   helmrelease-custom-resource
diff --git a/docs/helm-operator/references/operator.md b/docs/helm-operator/references/operator.md
new file mode 100644
index 000000000..02a73d8d0
--- /dev/null
+++ b/docs/helm-operator/references/operator.md
@@ -0,0 +1,40 @@
+# Helm operator (`helm-operator`)
+
+The Helm operator deals with Helm chart releases. The operator watches for
+changes of Custom Resources of kind `HelmRelease`. It receives Kubernetes
+Events and acts accordingly.
+
+## Responsibilities
+
+When the Helm Operator sees a `HelmRelease` resource in the
+cluster, it either installs or upgrades the named Helm release so that
+the chart is released as specified.
+
+It will also notice when a `HelmRelease` resource is updated, and
+take action accordingly.
+
+## Setup and configuration
+
+`helm-operator` requires setup and offers customization though a multitude of flags.
+
+| flag                      | default                       | purpose
+| ------------------------  | ----------------------------- | ---
+| --kubeconfig              |                               | Path to a kubeconfig. Only required if out-of-cluster.
+| --master                  |                               | The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
+| --allow-namespace         |                               | If set, this limits the scope to a single namespace. if not specified, all namespaces will be watched.
+| **Tiller options**
+| --tiller-ip               |                               | Tiller IP address. Only required if out-of-cluster.
+| --tiller-port             |                               | Tiller port.
+| --tiller-namespace        |                               | Tiller namespace. If not provided, the default is kube-system.
+| --tiller-tls-enable       | `false`                       | Enable TLS communication with Tiller. If provided, requires TLSKey and TLSCert to be provided as well.
+| --tiller-tls-verify       | `false`                       | Verify TLS certificate from Tiller. Will enable TLS communication when provided.
+| --tiller-tls-key-path     | `/etc/fluxd/helm/tls.key`     | Path to private key file used to communicate with the Tiller server.
+| --tiller-tls-cert-path    | `/etc/fluxd/helm/tls.crt`     | Path to certificate file used to communicate with the Tiller server.
+| --tiller-tls-ca-cert-path |                               | Path to CA certificate file used to validate the Tiller server. Required if tiller-tls-verify is enabled.
+| --tiller-tls-hostname     |                               | The server name used to verify the hostname on the returned certificates from the Tiller server.
+| **repo chart changes** (none of these need overriding, usually)
+| --charts-sync-interval    | `3m`                          | Interval at which to check for changed charts.
+| --git-timeout             | `20s`                         | Duration after which git operations time out.
+| --git-poll-interval       | `5m`                          | Period on which to poll git chart sources for changes.
+| --log-release-diffs       | `false`                       | Log the diff when a chart release diverges. **Potentially insecure.**
+| --update-chart-deps       | `true`                        | Update chart dependencies before installing or upgrading a release.
diff --git a/docs/helm-operator/troubleshooting.md b/docs/helm-operator/troubleshooting.md
new file mode 100644
index 000000000..9a9d2f78b
--- /dev/null
+++ b/docs/helm-operator/troubleshooting.md
@@ -0,0 +1,27 @@
+# Troubleshooting
+
+Also see the [issues labeled with
+`FAQ`](https://github.com/fluxcd/flux/labels/FAQ), which often
+explain workarounds.
+
+## Error creating helm client: failed to append certificates from file: /etc/fluxd/helm-ca/ca.crt
+
+Your CA certificate content is not set correctly, check if your ConfigMap contains the correct values. Example:
+
+```bash
+$ kubectl get configmaps flux-helm-tls-ca-config -o yaml
+apiVersion: v1
+data:
+  ca.crt: |
+    -----BEGIN CERTIFICATE-----
+    ....
+    -----END CERTIFICATE-----
+kind: ConfigMap
+metadata:
+  creationTimestamp: 2018-07-04T15:27:25Z
+  name: flux-helm-tls-ca-config
+  namespace: helm-system
+  resourceVersion: "1267257"
+  selfLink: /api/v1/namespaces/helm-system/configmaps/flux-helm-tls-ca-config
+  uid: c106f866-7f9e-11e8-904a-025000000001
+```
diff --git a/docs/helm/helm-operator.md b/docs/helm-operator/tutorials/get-started.md
similarity index 55%
rename from docs/helm/helm-operator.md
rename to docs/helm-operator/tutorials/get-started.md
index 678357e6f..250a53e4e 100644
--- a/docs/helm/helm-operator.md
+++ b/docs/helm-operator/tutorials/get-started.md
@@ -1,38 +1,6 @@
-# Flux Helm Operator
-
-The Helm operator deals with Helm Chart releases. The operator watches for
-changes of Custom Resources of kind HelmRelease. It receives Kubernetes
-Events and acts accordingly, installing, upgrading or deleting a Chart release.
-
-## Setup and configuration
-
-helm-operator requires setup and offers customization though a multitude of flags.
-
-| flag                      | default                       | purpose
-| ------------------------  | ----------------------------- | ---
-| --kubeconfig              |                               | Path to a kubeconfig. Only required if out-of-cluster.
-| --master                  |                               | The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
-| --allow-namespace         |                               | If set, this limits the scope to a single namespace. if not specified, all namespaces will be watched.
-| **Tiller options**
-| --tiller-ip               |                               | Tiller IP address. Only required if out-of-cluster.
-| --tiller-port             |                               | Tiller port.
-| --tiller-namespace        |                               | Tiller namespace. If not provided, the default is kube-system.
-| --tiller-tls-enable       | `false`                       | Enable TLS communication with Tiller. If provided, requires TLSKey and TLSCert to be provided as well.
-| --tiller-tls-verify       | `false`                       | Verify TLS certificate from Tiller. Will enable TLS communication when provided.
-| --tiller-tls-key-path     | `/etc/fluxd/helm/tls.key`     | Path to private key file used to communicate with the Tiller server.
-| --tiller-tls-cert-path    | `/etc/fluxd/helm/tls.crt`     | Path to certificate file used to communicate with the Tiller server.
-| --tiller-tls-ca-cert-path |                               | Path to CA certificate file used to validate the Tiller server. Required if tiller-tls-verify is enabled.
-| --tiller-tls-hostname     |                               | The server name used to verify the hostname on the returned certificates from the Tiller server.
-| **repo chart changes** (none of these need overriding, usually)
-| --charts-sync-interval    | `3m`                          | Interval at which to check for changed charts.
-| --git-timeout             | `20s`                         | Duration after which git operations time out.
-| --git-poll-interval       | `5m`                          | Period on which to poll git chart sources for changes.
-| --log-release-diffs       | `false`                       | Log the diff when a chart release diverges. **Potentially insecure.**
-| --update-chart-deps       | `true`                        | Update chart dependencies before installing or upgrading a release.
-
-## Installing Flux Helm Operator and Helm with TLS enabled
-
-### Installing Helm / Tiller
+# Get started with the Helm operator
+
+## Installing Helm / Tiller
 
 Generate certificates for Tiller and Flux. This will provide a CA, servercerts for Tiller and client certs for Helm / Flux.
 
@@ -171,7 +139,7 @@ helm --tls --tls-verify \
   ls
 ```
 
-### Deploy Flux Helm Operator
+## Deploy the Helm Operator
 
 First create a new Kubernetes TLS secret for the client certs;
 
@@ -202,30 +170,6 @@ helm upgrade --install \
 > - include --tls flags for `helm` as in the `helm ls` example, if talking to a tiller with TLS
 > - optionally specify target --namespace
 
-#### Check if it worked
+## Check if it worked
 
 Use `kubectl logs` on the Helm Operator and observe the helm client being created.
-
-#### Debugging
-
-##### Error creating helm client: failed to append certificates from file: /etc/fluxd/helm-ca/ca.crt
-
-Your CA certificate content is not set correctly, check if your configMap contains the correct values. Example:
-
-```bash
-$ kubectl get configmaps flux-helm-tls-ca-config -o yaml
-apiVersion: v1
-data:
-  ca.crt: |
-    -----BEGIN CERTIFICATE-----
-    ....
-    -----END CERTIFICATE-----
-kind: ConfigMap
-metadata:
-  creationTimestamp: 2018-07-04T15:27:25Z
-  name: flux-helm-tls-ca-config
-  namespace: helm-system
-  resourceVersion: "1267257"
-  selfLink: /api/v1/namespaces/helm-system/configmaps/flux-helm-tls-ca-config
-  uid: c106f866-7f9e-11e8-904a-025000000001
-```
diff --git a/docs/helm-operator/tutorials/index.rst b/docs/helm-operator/tutorials/index.rst
new file mode 100644
index 000000000..a37796c8e
--- /dev/null
+++ b/docs/helm-operator/tutorials/index.rst
@@ -0,0 +1,10 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Tutorials
+=========
+
+.. toctree::
+   :maxdepth: 1
+
+   get-started
diff --git a/docs/helm/index.rst b/docs/helm/index.rst
deleted file mode 100644
index ae257ba69..000000000
--- a/docs/helm/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Using Flux with Helm
-==============================================
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Contents:
-
-   helm-integration
-   helm-operator
diff --git a/docs/index.rst b/docs/index.rst
index 59eb74b45..f4811696b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,27 +1,32 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
+.. You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
 Welcome to Flux's documentation!
-==============================================
+================================
 
 .. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
+   :maxdepth: 2
+   :caption: Flux
 
    introduction
    requirements
+   get-started/index
 
-   install/index
-   using/index
-   helm/index
-   
-   how-it-works
-   
-   features/index
-   development/index
+   references/index
+   guides/index
+   tutorials/index
 
    faq
    troubleshooting
+
+.. toctree::
+   :maxdepth: 3
+   :caption: Helm operator
+
+   helm-operator/index
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contributing
+
+   contributing/index
diff --git a/docs/install/index.md b/docs/install/index.md
deleted file mode 100644
index df006e80f..000000000
--- a/docs/install/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Installing Flux
-
-All you need is a Kubernetes cluster and a git repo. The git repo
-contains [manifests][k8s-manifests] (as YAML files) describing what
-should run in the cluster. Flux imposes
-[some requirements](../requirements.md) on these files.
-
-Here are the instructions to [install Flux on your own
-cluster](./get-started.md).
-
-If you are using Helm, we have a [separate section about
-this](./helm-get-started.md).
-
-You can also configure a more advanced, [standalone
-setup](./standalone-setup.md).
-
-[k8s-manifests]: https://kubernetes.io/docs/concepts/configuration/overview/
diff --git a/docs/install/standalone-setup.md b/docs/install/standalone-setup.md
deleted file mode 100644
index cb323d028..000000000
--- a/docs/install/standalone-setup.md
+++ /dev/null
@@ -1,187 +0,0 @@
-# Customising the deployment
-
-## Customising the daemon configuration
-
-The deployment installs Flux and its dependencies. First, change to
-the directory with the examples configuration.
-
-### Connect Flux to a repository
-
-First, you need to connect Flux to the repository with Kubernetes
-manifests. This is achieved by setting the `--git-url` and
-`--git-branch` arguments in the
-[`flux-deployment.yaml`](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) manifest.
-
-### Flux deployment
-
-You will need to create a secret in which Flux will store its SSH
-key. The daemon won't start without this present.
-
-The `flux` logs should show that it has now connected to the
-repository and synchronised the cluster.
-
-When using Kubernetes, this key is stored as a Kubernetes secret. You
-can restart `flux` and it will continue to use the same key.
-
-### Add an SSH deploy key to the repository
-
-Flux connects to the repository using an SSH key.
-
-***The SSH key must be configured to have R/W access to the repository***.
-
-More specifically, in the case of standalone Flux, the ssh key must be able to
-create and update tags. E.g. in Gitlab, that means it requires `Maintainer`
-permissions. The `Developer` permission can create tags, but not update them.
-
-You have two options:
-
-#### 1. Allow Flux to generate a key for you.
-
-If you don't specify a key to use, Flux will create one for you. Obtain
-the public key through [fluxctl](../using/fluxctl.md):
-
-```sh
-fluxctl identity
-```
-
-#### 2. Specify a key to use
-
-Create a Kubernetes Secret from a private key:
-
-```sh
-kubectl create secret generic flux-git-deploy --from-file=identity=/full/path/to/private_key
-```
-
-this will result in a secret that has the structure:
-
-```yaml
-  apiVersion: v1
-  data:
-    identity: <base64 encoded RSA PRIVATE KEY>
-  kind: Secret
-  type: Opaque
-  metadata:
-    ...
-```
-
-The Kubernetes deployment configuration file
-[flux-deployment.yaml](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml) runs the
-Flux daemon, but you'll need to edit it first, at least to supply your
-own configuration repo (the `--git-repo` argument).
-
-```sh
-$EDITOR flux-deployment.yaml
-kubectl create -f flux-deployment.yaml
-```
-
-#### Note for Kubernetes >=1.6 with role-based access control (RBAC)
-
-You will need to provide fluxd with a service account which can access
-the namespaces you want to use Flux with. To do this, consult the
-example service account given in
-[flux-account.yaml](https://github.com/weaveworks/flux/blob/master/deploy/flux-account.yaml) (which
-puts essentially no constraints on the account) and the
-[RBAC documentation](https://kubernetes.io/docs/admin/authorization/rbac/),
-and create a service account in whichever namespace you put fluxd
-in. You may need to alter the `namespace: default` lines, if you adapt
-the example.
-
-Using an SSH key allows you to maintain control of the repository. You
-can revoke permission for `flux` to access the repository at any time
-by removing the deploy key.
-
-### Using a private git host
-
-If you're using your own git host -- e.g., your own installation of
-gitlab, or bitbucket server -- you will need to add its host key to
-`~/.ssh/known_hosts` in the Flux daemon container.
-
-First, run a check that you can clone the repo. The following assumes
-that your git server's hostname (e.g., `githost`) is in `$GITHOST` and
-the URL you'll use to access the repository (e.g.,
-`user@githost:path/to/repo`) is in `$GITREPO`.
-
-```sh
-$ # Find the fluxd daemon pod:
-$ kubectl get pods --all-namespaces -l name=flux
-NAMESPACE   NAME                    READY     STATUS    RESTARTS   AGE
-weave       flux-85cdc6cdfc-n2tgf   1/1       Running   0          1h
-
-$ kubectl exec -n weave flux-85cdc6cdfc-n2tgf -ti -- \
-    env GITHOST="$GITHOST" GITREPO="$GITREPO" PS1="container$ " /bin/sh
-
-container$ git clone $GITREPO
-Cloning into <repository name>...
-No ECDSA host key is known for  <GITHOST> and you have requested strict checking.
-Host key verification failed.
-fatal: Could not read from remote repository
-
-container$ # ^ that was expected. Now we'll try with a modified known_hosts
-container$ ssh-keyscan $GITHOST >> ~/.ssh/known_hosts
-container$ git clone $GITREPO
-Cloning into '...'
-...
-```
-
-If `git clone` doesn't succeed, you'll need to check that the SSH key
-has been installed properly first, then come back. `ssh -vv $GITHOST`
-from within the container may help debug it.
-
-If it _did_ work, you will need to make it a more permanent
-arrangement. Back in that shell, create a configmap for the cluster. To make
-sure the configmap is created in the namespace of the Flux or weave deployment,
-the namespace is set explicitly:
-
-```sh
-container$ kubectl create configmap flux-ssh-config --from-file=$HOME/.ssh/known_hosts -n $(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-configmap "flux-ssh-config" created
-```
-
-To use the ConfigMap every time the Flux daemon restarts, you'll need
-to mount it into the container. The example deployment manifest
-includes an example of doing this, commented out. Uncomment those two blocks:
-
-```yaml
-      - name: ssh-config
-        configMap:
-          name: flux-ssh-config
-```
-
-```yaml
-        - name: ssh-config
-          mountPath: /root/.ssh
-```
-
-It assumes you used `flux-ssh-config` as name of the ConfigMap and then reapply the
-manifest.
-
-Another alternative is to create the configmap from a template. This could be
-something like:
-
-```yaml
-apiVersion: v1
-data:
-  known_hosts: |
-    # github
-    192.30.253.112 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-    # github
-    192.30.253.113 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-    # private gitlab
-    gitlab.________ ssh-rsa AAAAB3N...
-kind: ConfigMap
-metadata:
-  name: flux-ssh-config
-  namespace: <OPTIONAL NAMESPACE (if not default)>
-```
-
-You will need to explicitly tell fluxd to use that service account by
-uncommenting and possible adapting the line `# serviceAccountName:
-flux` in the file `fluxd-deployment.yaml` before applying it.
-
-### Memcache
-
-Flux uses memcache to cache docker registry requests.
-
-```sh
-kubectl create -f memcache-dep.yaml -f memcache-svc.yaml
-```
diff --git a/docs/how-it-works.md b/docs/references/blueprint.md
similarity index 87%
rename from docs/how-it-works.md
rename to docs/references/blueprint.md
index b3a768b64..8c83a73fe 100644
--- a/docs/how-it-works.md
+++ b/docs/references/blueprint.md
@@ -1,10 +1,10 @@
-# How Flux Works
+# Blueprint
 
-This page describes the goals of flux, how it achieves them and
+This page describes the goals of Flux, how it achieves them and
 significant architectural decisions. It is intentionally high level
 to prevent it from being out of date too quickly.
 
-## Goals
+## Flux's goals
 
 The overall goal of Flux is to automate the deployment of services.
 A typical use case would be:
@@ -20,11 +20,10 @@ with an orchestrator (which is a common source of accidental failure) or
 with the systems that ensure that the orchestrator is in a working
 state.
 
-Flux provides a CLI ([`fluxctl`](./using/fluxctl.md)) and a UI (as a component of Weave Cloud)
-to perform these operations manually. Flux is flexible enough to fit
-into any development process.
+Flux provides a CLI ([`fluxctl`](fluxctl.md)) to perform these operations
+manually. Flux is flexible enough to fit into any development process.
 
-## Implementation Overview
+## Implementation overview
 
 The following describes how Flux achieves the goals.
 
@@ -48,7 +47,7 @@ cluster to match the code representing the cluster in the repository.
 This simple idea then allows for a whole range of tools that can react
 to changes and simply write to a repository.
 
-### Monitoring For New Images
+### Monitoring for new images
 
 Flux reads a list of running containers from the user git repository.
 For each image, it will query the container registry to obtain the most
@@ -65,7 +64,7 @@ When automation is disabled, images are not checked.
 
 In order to access private registries, credentials may be required.
 
-### Deployment of Images
+### Deployment of images
 
 Flux will only deploy different images. It will not re-deploy images
 with the same tag.
diff --git a/docs/features/daemon.md b/docs/references/daemon.md
similarity index 83%
rename from docs/features/daemon.md
rename to docs/references/daemon.md
index 1da66c8cd..6759eae00 100644
--- a/docs/features/daemon.md
+++ b/docs/references/daemon.md
@@ -1,45 +1,39 @@
-# Flux Daemon
+# Daemon (`fluxd`)
 
 ## Summary
 
-Flux daemon (fluxd, aka Flux agent) allows automation of application deployments and version control of cluster configuration.
+Flux daemon (`fluxd`, aka Flux agent) allows automation of application deployments and version control of cluster configuration.
 Version controlling of cluster manifests provides reproducibility and a historical trail of events.
 
-### Flux daemon responsibilities
+### Responsibilities
 
-    A) Continuous Deployment
-        1.
-        Flux daemon monitors user git repo Kubernetes manifests for changes, which it
-        then deploys to the cluster.
+#### Continuous Deployment
 
-        2.
-        Flux daemon monitors container registry for running container image updates.
-        Detection of an image change (running container image tag vs container
-        registry image tag) triggers k8s manifest update, which is committed to the
-        user git repository, then deployed to the Kubernetes cluster.
+1. Flux daemon monitors user git repo Kubernetes manifests for
+   changes, which it then deploys to the cluster.
 
-    B) Deployment approaches
-        1.
-        Automate vs Deautomate
-            Deployment happens automatically when a new image tag is detected.
-            Deautomated deployment will not proceed until manually released (through
-            the UI or the CLI tool fluxctl).
+2. Flux daemon monitors container registry for running container image
+   updates. Detection of an image change (running container image tag
+   vs container registry image tag) triggers k8s manifest update, which
+   is committed to the user git repository, then deployed to the
+   Kubernetes cluster.
 
-        2.
-        Lock vs Unlock
-            Deployment is pinned to a particular image tag. New deployment will not
-            proceed upon triggered release.
+#### Deployment approaches
+        
+1. Automate vs Deautomate
 
-## More information
+   Deployment happens automatically when a new image tag is
+   detected. Deautomated deployment will not proceed until
+   manually released (through the CLI tool `fluxctl`).
 
-Setting up and configuring fluxd is discussed in our [standalone setup](../install/standalone-setup.md)
-document.
+2. Lock vs Unlock
 
-There is also more information on [garbage collection](./garbagecollection.md) and [Git commit signing](../using/git-gpg.md).
+   Deployment is pinned to a particular image tag.
+   New deployment will not proceed upon triggered release.
 
-## Flags
+## Setup and configuration
 
-fluxd requires setup and offers customization though a multitude of flags.
+`fluxd` requires setup and offers customization though a multitude of flags.
 
 | Flag                                             | Default                            | Purpose
 | ------------------------------------------------ | ---------------------------------- | ---
@@ -48,7 +42,7 @@ fluxd requires setup and offers customization though a multitude of flags.
 | --kubernetes-kubectl                             |                                    | optional, explicit path to kubectl tool
 | --version                                        | false                              | output the version number and exit
 | **Git repo & key etc.**
-| --git-url                                        |                          | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`
+| --git-url                                        |                          | URL of git repo with Kubernetes manifests; e.g., `git@github.com:fluxcd/flux-get-started`
 | --git-branch                                     | `master`                 | branch of git repo to use for Kubernetes manifests
 | --git-ci-skip                                    | false                    | when set, fluxd will append `\n\n[ci skip]` to its commit messages
 | --git-ci-skip-message                            | `""`                     | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`)
@@ -95,3 +89,11 @@ fluxd requires setup and offers customization though a multitude of flags.
 | --ssh-keygen-type                                |                                    | -t argument to ssh-keygen (default unspecified)
 | **manifest generation**
 | --manifest-generation                            | false                              | experimental; search for .flux.yaml files to generate manifests
+
+## More information
+
+Setting up and configuring `fluxd` is discussed in
+["Get started with Flux"](../tutorials/get-started.md).
+
+There is also more information on [garbage collection](garbagecollection.md),
+[Git commit signing](git-gpg.md), and other elements in [references](./).
diff --git a/docs/using/fluxctl.md b/docs/references/fluxctl.md
similarity index 99%
rename from docs/using/fluxctl.md
rename to docs/references/fluxctl.md
index a85fc9dd7..fd79aa2c6 100644
--- a/docs/using/fluxctl.md
+++ b/docs/references/fluxctl.md
@@ -1,10 +1,10 @@
-# Using Flux
+# `fluxctl`
 
 `fluxctl` provides an API that can be used from the command line.
 
 The `--help` for `fluxctl` is described below.
 
-## Installing fluxctl
+## Installing `fluxctl`
 
 ### Mac OS
 
@@ -51,9 +51,9 @@ makepkg -si
 
 With every release of Flux, we release binaries of `fluxctl` for Mac, Linux
 and Windows. Download them from the [Flux release
-page](https://github.com/weaveworks/flux/releases).
+page](https://github.com/fluxcd/flux/releases).
 
-## Connecting fluxctl to the daemon
+## Connecting `fluxctl` to the daemon
 
 By default, `fluxctl` will attempt to port-forward to your Flux
 instance, assuming it runs in the `"default"` namespace. You can
@@ -418,7 +418,7 @@ started with several flags that impact the commit information:
 
 Actions triggered by a user through the CLI `fluxctl`
 tool, can have the commit author information customized. This is handy for providing extra context in the
-notifications and history. Whether the customization is possible, depends on the Flux daemon (fluxd)
+notifications and history. Whether the customization is possible, depends on the Flux daemon (`fluxd`)
 `git-set-author` flag. If set, the commit author will be customized in the following way:
 
 ## Image Tag Filtering
@@ -598,14 +598,14 @@ no existing author
 ## Using Annotations
 
 Automation and image tag filtering can also be managed using annotations
-(fluxctl is using the same mechanism).
+(`fluxctl` is using the same mechanism).
 
 Automation can be enabled with `flux.weave.works/automated: "true"`. Image
 filtering annotations take the form
 `flux.weave.works/tag.container-name: filter-type:filter-value`. Values of
 `filter-type` can be [`glob`](#glob), [`semver`](#semver), and
 [`regexp`](#regexp). Filter values use the same syntax as when the filter is
-configured using fluxctl.
+configured using `fluxctl`.
 
 Here's a simple but complete deployment file with annotations:
 
diff --git a/docs/features/fluxyaml-config-files.md b/docs/references/fluxyaml-config-files.md
similarity index 97%
rename from docs/features/fluxyaml-config-files.md
rename to docs/references/fluxyaml-config-files.md
index 492f9cfad..775511876 100644
--- a/docs/features/fluxyaml-config-files.md
+++ b/docs/references/fluxyaml-config-files.md
@@ -26,7 +26,7 @@ Flux performs two types of actions on raw manifest files from the Git repository
 
 1. Read manifest files when performing a sync operation (i.e making sure that the status of the cluster reflects what's
    in the manifest files, adjusting it if necessary)
-2. Update the manifest files of [workload](https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md#what-is-a-workload).
+2. Update the manifest files of [workload](https://github.com/fluxcd/flux/blob/master/docs/using/fluxctl.md#what-is-a-workload).
    Specifically, flux can update:
     * container images, when releasing a new image version. A release can happen manually or automatically, when a new
       container image is pushed to a repository.
@@ -82,7 +82,7 @@ command and a `policy` command, covering the corresponding two types of workload
 > * Some configurations (even those for Kubernetes clusters) may encode policies symbolically.
 
 Here is a specific `.flux.yaml` example, declaring a generator and an updater using [Kustomize](https://github.com/kubernetes-sigs/kustomize)
-(see [https://github.com/weaveworks/flux-kustomize-example](https://github.com/weaveworks/flux-kustomize-example)
+(see [https://github.com/fluxcd/flux-kustomize-example](https://github.com/fluxcd/flux-kustomize-example)
 for a complete example).
 
 ```yaml
@@ -130,7 +130,7 @@ a separate configuration file variant (`patchedUpdated`) is provided, which will
 ### Execution context of commands
 
 `generators` and `updaters` are run in a POSIX shell inside the Flux container. This means that the `command`s supplied
-should be available in the [Flux container image](https://github.com/weaveworks/flux/blob/master/docker/Dockerfile.flux).
+should be available in the [Flux container image](https://github.com/fluxcd/flux/blob/master/docker/Dockerfile.flux).
 Flux currently includes `Kustomize` and basic Unix shell tools. If the tools in the Flux image are not sufficient for
 your use case, you can include new tools in your own Flux-based image or, if the tools are popular enough, Flux
 maintainers can add them to the Flux image (please create an issue). In the future (once [Ephemeral
diff --git a/docs/features/garbagecollection.md b/docs/references/garbagecollection.md
similarity index 84%
rename from docs/features/garbagecollection.md
rename to docs/references/garbagecollection.md
index eecd83c68..525e4549d 100644
--- a/docs/features/garbagecollection.md
+++ b/docs/references/garbagecollection.md
@@ -2,7 +2,7 @@
 
 Part of syncing a cluster with a git repository is getting rid of
 resources in the cluster that have been removed in the repository. You
-can tell fluxd to do this "garbage collection" using the command-line
+can tell `fluxd` to do this "garbage collection" using the command-line
 flag `--sync-garbage-collection`. It's important to know how it
 operates, and appreciate its limitations, before enabling it.
 
@@ -18,18 +18,18 @@ When garbage collection is enabled, syncing is done in two phases:
     source, and delete those that were not applied in step 1.
 
 In the above, "source" refers to the particular combination of git
-repo URL, branch, and paths that this fluxd has been configured to
-use, which is taken as identifying the resources under _this_ fluxd's
-control.
+repo URL, branch, and paths that this `fluxd` has been configured to
+use, which is taken as identifying the resources under _this_
+`fluxd`'s control.
 
 We need to be careful about identifying these accurately, since
 getting it wrong could mean _not_ deleting resources that should be
 deleted; or (much worse), deleting resources that are under another
-fluxd's control.
+`fluxd`'s control.
 
 The definition of "source" affects how garbage collection behaves when
-you reconfigure fluxd. It is intended to be conservative: it ensures
-that fluxd will not delete resources that it did not create.
+you reconfigure `fluxd`. It is intended to be conservative: it ensures
+that `fluxd` will not delete resources that it did not create.
 
 ## Limitations of this approach
 
diff --git a/docs/using/git-gpg.md b/docs/references/git-gpg.md
similarity index 100%
rename from docs/using/git-gpg.md
rename to docs/references/git-gpg.md
diff --git a/docs/references/helm-operator-integration.md b/docs/references/helm-operator-integration.md
new file mode 100644
index 000000000..3fec6df1f
--- /dev/null
+++ b/docs/references/helm-operator-integration.md
@@ -0,0 +1,123 @@
+# Integration with the Helm operator
+
+You can release charts to your cluster via "GitOps", by combining Flux
+and the Helm operator (also in [fluxcd/flux](https://github.com/fluxcd/flux)).
+
+The essential mechanism is this: the declaration of a Helm release is
+represented by a custom resource, specifying the chart and its
+values. If you put such a resource in your git repo as a file, Flux
+will apply it to the cluster, and once it's in the cluster, the Helm
+Operator will make sure the release exists by installing or upgrading
+it.
+
+## Upgrading images in a `HelmRelease` using Flux
+
+If the chart you're using in a `HelmRelease` lets you specify the
+particular images to run, you will usually be able to update them with
+Flux, the same way you can with Deployments and so on.
+
+> **Note:** for automation to work, the repository _and_ tag should be
+> defined, as Flux determines image updates based on what it reads in
+> the `.spec.values` of the `HelmRelease`.
+
+Flux interprets certain commonly used structures in the `values`
+section of a `HelmRelease` as referring to images. The following
+are understood (showing just the `values` section):
+
+```yaml
+values:
+  image: repo/image:version
+```
+
+```yaml
+values:
+  image: repo/image
+  tag: version
+```
+
+```yaml
+values:
+  registry: docker.io
+  image: repo/image
+  tag: version
+```
+
+```yaml
+values:
+  image:
+    repository: repo/image
+    tag: version
+```
+
+```yaml
+values:
+  image:
+    registry: docker.io
+    repository: repo/image
+    tag: version
+```
+
+These can appear at the top level (immediately under `values:`), or in
+a subsection (under a key, itself under `values:`). Other values
+may be mixed in arbitrarily. Here's an example of a values section
+that specifies two images, along with some other configuration:
+
+```yaml
+values:
+  persistent: true
+
+  # image that will be labeled "chart-image"
+  image: repo/image1:version
+
+  subsystem:
+    # image that will be labeled "subsystem"
+    image:
+      repository: repo/image2
+      tag: version
+      imagePullPolicy: IfNotPresent
+    port: 4040
+```
+
+You can use the [same annotations](fluxctl.md) in
+the `HelmRelease` as you would for a Deployment or other workload,
+to control updates and automation. For the purpose of specifying
+filters, the container name is either `chart-image` (if at the top
+level), or the key under which the image is given (e.g., `"subsystem"`
+from the example above).
+
+Top level image example:
+
+```yaml
+kind: HelmRelease
+metadata:
+  annotations:
+    flux.weave.works/automated: "true"
+    flux.weave.works/tag.chart-image: semver:~4.0
+spec:
+  values:
+    image:
+      repository: bitnami/mongodb
+      tag: 4.0.3
+```
+
+Sub-section images example:
+
+```yaml
+kind: HelmRelease
+metadata:
+  annotations:
+    flux.weave.works/automated: "true"
+    flux.weave.works/tag.prometheus: semver:~2.3
+    flux.weave.works/tag.alertmanager: glob:v0.15.*
+    flux.weave.works/tag.nats: regex:^0.6.*
+spec:
+  values:
+    prometheus:
+      image: prom/prometheus:v2.3.1
+    alertmanager:
+      image: prom/alertmanager:v0.15.0
+    nats:
+      image:
+        repository: nats-streaming
+        tag: 0.6.0
+```
diff --git a/docs/references/index.rst b/docs/references/index.rst
new file mode 100644
index 000000000..e68a1dcfb
--- /dev/null
+++ b/docs/references/index.rst
@@ -0,0 +1,17 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+References
+==========
+
+.. toctree::
+   :maxdepth: 1
+
+   blueprint
+   daemon
+   fluxctl
+   fluxyaml-config-files
+   garbagecollection
+   git-gpg
+   helm-operator-integration
+   monitoring
diff --git a/docs/using/monitoring.md b/docs/references/monitoring.md
similarity index 100%
rename from docs/using/monitoring.md
rename to docs/references/monitoring.md
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 4e05a7870..d3c70cc7d 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -1,22 +1,22 @@
-# Troubleshooting Weave Flux
+# Troubleshooting
 
 Also see the [issues labeled with
-`FAQ`](https://github.com/weaveworks/flux/labels/FAQ), which often
+`FAQ`](https://github.com/fluxcd/flux/labels/FAQ), which often
 explain workarounds.
 
-### Flux is taking a long time to apply manifests when it syncs
+## Flux is taking a long time to apply manifests when it syncs
 
 If you notice that Flux takes tens of seconds or minutes to get
 through each sync, while you can apply the same manifests very quickly
 by hand, you may be running into this issue:
-https://github.com/weaveworks/flux/issues/1422
+https://github.com/fluxcd/flux/issues/1422
 
 Briefly, the problem is that mounting a volume into `$HOME/.kube`
 effectively disables `kubectl`'s caching, which makes it much much
 slower. You may have used such a volume mount to override
 `$HOME/.kube/config`, possibly unknowingly -- the Helm chart did this
 for you, prior to
-[weaveworks/flux#1435](https://github.com/weaveworks/flux/pull/1435).
+[fluxcd/flux#1435](https://github.com/fluxcd/flux/pull/1435).
 
 The remedy is to mount the override to some other place in the
 filesystem, and use the environment entry `KUBECONFIG` to point
@@ -26,11 +26,11 @@ may be as easy as reapplying the chart if that's what you're using.
 This is also documented in the
 [FAQ](./faq.md).
 
-### `fluxctl` returns a 500 Internal Server Error
+## `fluxctl` returns a 500 Internal Server Error
 
-This usually indicates there's a bug in the Flux daemon somewhere -- in which case please [tell us about it](https://github.com/weaveworks/flux/issues/new)!
+This usually indicates there's a bug in the Flux daemon somewhere -- in which case please [tell us about it](https://github.com/fluxcd/flux/issues/new)!
 
-### Flux answers everything with `git repo is not configured`
+## Flux answers everything with `git repo is not configured`
 
 This means Flux can't read from and write to the git repo. Check that
 
@@ -46,19 +46,19 @@ This means Flux can't read from and write to the git repo. Check that
  - ... that the host where your git repo lives is in
    `~/.ssh/known_hosts` in the fluxd container. We prime the container
    _image_ with host keys for `github.com`, `gitlab.com`, `bitbucket.org`, `dev.azure.com`, and `vs-ssh.visualstudio.com`, but if you're using your own git server, you'll
-   need to add its host key. See [./standalone-setup.md](./install/standalone-setup.md).
+   need to add its host key. See ["Using a private Git host"](./guides/use-private-git-host.md).
 
-### I'm using GCR/GKE and I keep seeing "Quota exceeded" in logs
+## I'm using GCR/GKE and I keep seeing "Quota exceeded" in logs
 
 GCP (in general) has quite conservative API rate limiting, and Flux's
 default settings can bump API usage over the limits. See
-[weaveworks/flux#1016](https://github.com/weaveworks/flux/issues/1016)
+[fluxcd/flux#1016](https://github.com/fluxcd/flux/issues/1016)
 for advice.
 
-### Flux doesn't seem to be able to use my imagePullSecrets
+## Flux doesn't seem to be able to use my imagePullSecrets
 
 If you're using `kubectl` v1.13.x to create them, then it may be due
-to [this problem](https://github.com/weaveworks/flux/issues/1596). In
+to [this problem](https://github.com/fluxcd/flux/issues/1596). In
 short, there was a breaking change to how `kubectl` creates secrets,
 that found its way into the Kubernetes 1.13.0 release. It has been
 corrected in [kubectl
@@ -66,7 +66,7 @@ v1.13.2](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md#
 so using that version or newer to create secrets should fix the
 problem.
 
-### Why are my images not showing up in the list of images?
+## Why are my images not showing up in the list of images?
 
 Sometimes, instead of seeing the various images and their tags, the
 output of `fluxctl list-images` shows nothing. There's a number of
@@ -77,10 +77,10 @@ reasons this can happen:
  - Flux can't get suitable credentials for the image repository. At
    present, it looks at `imagePullSecret`s attached to workloads,
    service accounts, platform-provided credentials on GCP, AWS or Azure, and
-   a Docker config file if you mount one into the fluxd container (see
-   the [command-line usage](./features/daemon.md)).
+   a Docker config file if you mount one into the `fluxd` container (see
+   the [command-line usage](references/daemon.md)).
  - When using images in ECR, from EC2, the `NodeInstanceRole` for the
-   worker node running fluxd must have permissions to query the ECR
+   worker node running `fluxd` must have permissions to query the ECR
    registry (or registries) in
    question. [`eksctl`](https://github.com/weaveworks/eksctl) and
    [`kops`](https://github.com/kubernetes/kops) (with
@@ -88,8 +88,8 @@ reasons this can happen:
    both make sure this is the case.
  - When using images from ACR in AKS, the HostPath `/etc/kubernetes/azure.json`
    should be [mounted](https://kubernetes.io/docs/concepts/storage/volumes/) into the Flux Pod.
-   Set `registry.acr.enabled=True` in the [helm chart](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md)
-   or alter the [Deployment](https://github.com/weaveworks/flux/blob/master/deploy/flux-deployment.yaml):
+   Set `registry.acr.enabled=True` in the [helm chart](https://github.com/fluxcd/flux/blob/master/chart/flux/README.md)
+   or alter the [Deployment](https://github.com/fluxcd/flux/blob/master/deploy/flux-deployment.yaml):
    ```yaml
     spec:
       containers:
@@ -108,12 +108,12 @@ reasons this can happen:
  - Flux excludes images with no suitable manifest (linux amd64) in manifestlist
  - Flux doesn't yet understand image refs that use digests instead of
    tags; see
-   [weaveworks/flux#885](https://github.com/weaveworks/flux/issues/885).
+   [fluxcd/flux#885](https://github.com/fluxcd/flux/issues/885).
 
 If none of these explanations seem to apply, please
-[file an issue](https://github.com/weaveworks/flux/issues/new).
+[file an issue](https://github.com/fluxcd/flux/issues/new).
 
-### Why do my image tags appear out of order?
+## Why do my image tags appear out of order?
 
 You may notice that the ordering given to image tags does not always
 correspond with the order in which you pushed the images. That's
@@ -133,7 +133,7 @@ build has its own creation time is to label it with a build time;
 e.g., using
 [OpenContainers pre-defined annotations](https://github.com/opencontainers/image-spec/blob/master/annotations.md).
 
-### What is the "sync tag"; or, why do I see a `flux-sync` tag in my git repo?
+## What is the "sync tag"; or, why do I see a `flux-sync` tag in my git repo?
 
 Flux keeps track of the last commit that it's applied to the cluster,
 by pushing a tag (controlled by the command-line flags
diff --git a/docs/using/annotations-tutorial.md b/docs/tutorials/driving-flux.md
similarity index 95%
rename from docs/using/annotations-tutorial.md
rename to docs/tutorials/driving-flux.md
index a86da9d18..a9a4c0d91 100644
--- a/docs/using/annotations-tutorial.md
+++ b/docs/tutorials/driving-flux.md
@@ -1,4 +1,4 @@
-# Driving Flux - automations, locks and annotations
+# Automations, locks and annotations
 
 In this tutorial we want to get a better feel for what we can do with
 Flux. We won't spend too much time with getting it up and running, so let's
@@ -6,7 +6,7 @@ get that out of the way first.
 
 In our example we are going to use the `flux-get-started` example deployment.
 So as your first step, please head to [our example
-deployment](https://github.com/weaveworks/flux-get-started) and click on the
+deployment](https://github.com/fluxcd/flux-get-started) and click on the
 "Fork" button.
 
 ## Setup
@@ -14,7 +14,7 @@ deployment](https://github.com/weaveworks/flux-get-started) and click on the
 Get the source code of Flux:
 
 ```sh
-git clone https://github.com/weaveworks/flux
+git clone https://github.com/fluxcd/flux
 cd flux
 ```
 
@@ -27,7 +27,7 @@ EDITOR deploy/flux-deployment.yaml
 And update the following line
 
 ```yaml
-    --git-url=git@github.com:weaveworks/flux-get-started
+    --git-url=git@github.com:fluxcd/flux-get-started
 ```
 
 to point to your fork, e.g. if your GitHub Login is `baloothebear`, the line
@@ -98,7 +98,7 @@ fluxcd/flux
 
 > **Note:** In this tutorial we keep things simple, so we deploy Flux into
 the `default` namespace. Normally you would pick a separate namespace for
-it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](./fluxctl.md) for specifying the right
+it. `fluxctl` has the [`--k8s-fwd-ns <NAMESPACE>` option](../references/fluxctl.md) for specifying the right
 namespace.
 
 ### Connecting to your git config
@@ -107,7 +107,7 @@ The first step is done. Flux is now and up running (you can confirm by
 running `kubectl get pods --all-namespaces`).
 
 In the second step we will use fluxctl to talk to Flux in the cluster and
-interact with the deployments. First, please [install fluxctl](./fluxctl.md).
+interact with the deployments. First, please [install fluxctl](../references/fluxctl.md).
 (It enables you to drive all of Weave Flux, so have a look at the output of
 `fluxctl -h` to get a better idea.)
 
diff --git a/docs/install/helm-get-started.md b/docs/tutorials/get-started-helm.md
similarity index 87%
rename from docs/install/helm-get-started.md
rename to docs/tutorials/get-started-helm.md
index 95c028b0a..2e67a944f 100644
--- a/docs/install/helm-get-started.md
+++ b/docs/tutorials/get-started-helm.md
@@ -1,6 +1,4 @@
-# Installing Flux using Helm
-
-## Get started with Flux using Helm
+# Get started with Flux using Helm
 
 If you are using Helm already, this guide is for you. By the end
 you will have Helm installing Flux in the cluster and deploying
@@ -8,9 +6,9 @@ any code changes for you.
 
 If you are looking for more generic notes for how to install Flux
 using Helm, we collected them [in the chart's
-README](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md).
+README](https://github.com/fluxcd/flux/blob/master/chart/flux/README.md).
 
-### Prerequisites
+## Prerequisites
 
 You will need to have Kubernetes set up. To get up and running fast,
 you might want to use `minikube` or `kubeadm`. Any other Kubernetes
@@ -49,7 +47,7 @@ helm init --skip-refresh --upgrade --service-account tiller --history-max 10
 > and be aware of the `--history-max` flag before promoting to
 > production.
 
-### Install Flux
+## Install Flux
 
 Add the Flux repository:
 
@@ -65,10 +63,10 @@ kubectl apply -f https://raw.githubusercontent.com/fluxcd/flux/master/deploy-hel
 
 In this next step you install Flux using `helm`. Simply
 
- 1. Fork [flux-get-started](https://github.com/weaveworks/flux-get-started)
-    on GitHub and replace the `weaveworks` with your GitHub username in
-    [here](https://github.com/weaveworks/flux-get-started/blob/master/releases/ghost.yaml#L13)
- 1. Install Flux and its Helm Operator by specifying your fork URL:
+ 1. Fork [`fluxcd/flux-get-started`](https://github.com/fluxcd/flux-get-started)
+    on GitHub and replace the `fluxcd` with your GitHub username in
+    [here](https://github.com/fluxcd/flux-get-started/blob/master/releases/ghost.yaml#L13)
+ 1. Install Flux and the Helm operator by specifying your fork URL:
 
       *Just make sure you replace `YOURUSER` with your GitHub username
       in the command below:*
@@ -88,7 +86,7 @@ In this next step you install Flux using `helm`. Simply
 
       When deploying from a private repo, the known_hosts of the git server needs
       to be configured into a kubernetes configmap so that `StrictHostKeyChecking` is respected.
-      See [chart/flux/README.md](https://github.com/weaveworks/flux/blob/master/chart/flux/README.md#to-install-flux-with-the-helm-operator-and-a-private-git-repository)
+      See the [README of the chart](https://fluxcd/flux/blob/master/chart/flux/README.md#to-install-flux-with-the-helm-operator-and-a-private-git-repository)
       for further installation instructions in this case.
 
 Allow some time for all containers to get up and running. If you're
@@ -102,7 +100,7 @@ watch kubectl -n flux get pods
 You will notice that `flux` and `flux-helm-operator` will start
 turning up in the `flux` namespace.
 
-### Giving write access
+## Giving write access
 
 For the real benefits of GitOps, Flux will need access to your
 git repository to update configuration if necessary. To facilitate
@@ -111,7 +109,7 @@ repository.
 
 This is pretty straight-forward as Flux generates a SSH key and
 logs the public key at startup. Find the SSH public key by
-installing [fluxctl](../using/fluxctl.md) and running:
+installing [`fluxctl`](../references/fluxctl.md) and running:
 
 ```sh
 fluxctl identity --k8s-fwd-ns flux
@@ -138,7 +136,7 @@ deployed into the `demo` namespace) listed like so:
 helm list --namespace demo
 ```
 
-### Committing a small change
+## Committing a small change
 
 `flux-get-started` is a simple example in which three services
 (mongodb, redis and ghost) are deployed. Here we will simply update the
@@ -179,7 +177,7 @@ Flux is deploying to:
 kubectl describe -n demo deployment/mongodb | grep Image
 ```
 
-### Conclusion
+## Conclusion
 
 As you can see, the actual steps to set up Flux, get our app
 deployed, give Flux access to it and see modifications land are
diff --git a/docs/install/get-started.md b/docs/tutorials/get-started.md
similarity index 62%
rename from docs/install/get-started.md
rename to docs/tutorials/get-started.md
index 4de5f9a26..60a448258 100644
--- a/docs/install/get-started.md
+++ b/docs/tutorials/get-started.md
@@ -1,6 +1,4 @@
-# Installing Flux Manually
-
-## Get started with Flux
+# Get started with Flux
 
 This short guide shows a self-contained example of Flux and just
 takes a couple of minutes to get set up. By the end you will
@@ -8,36 +6,36 @@ have Flux running in your cluster and it will be deploying any
 code changes for you.
 
 > **Note:** If you would like to install Flux using Helm, refer to the
-> [Helm section](./helm-get-started.md).
+> [Helm section](get-started-helm.md).
 
-### Prerequisites
+## Prerequisites
 
 You will need to have Kubernetes set up. For a quick local test,
 you can use `minikube` or `kubeadm`. Any other Kubernetes setup
 will work as well though.
 
-> ### A Note on GKE with RBAC enabled
->
-> If working on e.g. GKE with RBAC enabled, you will need to add a clusterrolebinding:
->
-> ```sh
-> kubectl create clusterrolebinding "cluster-admin-$(whoami)" --clusterrole=cluster-admin --user="$(gcloud config get-value core/account)"
-> ```
->
-> to avoid an error along the lines of
->
-> ```sh
-> Error from server (Forbidden): error when creating "deploy/flux-account.yaml":
-> clusterroles.rbac.authorization.k8s.io "flux" is forbidden: attempt to grant
-> extra privileges:
-> ```
-
-### Set up Flux
+### A note on GKE with RBAC enabled
+
+If working on e.g. GKE with RBAC enabled, you will need to add a clusterrolebinding:
+
+```sh
+kubectl create clusterrolebinding "cluster-admin-$(whoami)" --clusterrole=cluster-admin --user="$(gcloud config get-value core/account)"
+```
+
+to avoid an error along the lines of:
+
+```sh
+Error from server (Forbidden): error when creating "deploy/flux-account.yaml":
+clusterroles.rbac.authorization.k8s.io "flux" is forbidden: attempt to grant
+extra privileges:
+```
+
+## Set up Flux
 
 Get Flux:
 
 ```sh
-git clone https://github.com/weaveworks/flux
+git clone https://github.com/fluxcd/flux
 cd flux
 ```
 
@@ -50,15 +48,15 @@ you. You are going to need access to this repository.
 $EDITOR deploy/flux-deployment.yaml
 ```
 
-In our example we are going to use
-[flux-get-started](https://github.com/weaveworks/flux-get-started). If you
-want to use that too, be sure to create a fork of it on GitHub and
-add the git URL to the config file above. After that, set the `--git-path`
-flag to `--git-path=namespaces,workloads`, this is meant to exclude Helm
-manifests. Again, if you want to get started with Helm, please refer to the
-[Helm section](./helm-get-started.md).
+In our example we are going to use [`fluxcd/flux-get-started`](https://github.com/fluxcd/flux-get-started).
+If you want to use that too, be sure to create a fork of it on GitHub
+and add the git URL to the config file above. After that, set the
+`--git-path` flag to `--git-path=namespaces,workloads`, this is meant
+to exclude Helm manifests. Again, if you want to get started with Helm,
+please refer to the ["Get started with Flux using Helm"](get-started-helm.md)
+tutorial.
 
-### Deploying Flux to the cluster
+## Deploying Flux to the cluster
 
 In the next step, deploy Flux to the cluster:
 
@@ -74,11 +72,11 @@ process.
 watch kubectl get pods --all-namespaces
 ```
 
-### Giving write access
+## Giving write access
 
 At startup Flux generates a SSH key and logs the public key. Find
-the SSH public key by installing [fluxctl](../using/fluxctl.md) and
-runnning:
+the SSH public key by installing [fluxctl](../references/fluxctl.md) and
+running:
 
 ```sh
 fluxctl identity
@@ -98,7 +96,13 @@ for more info on how to manage deploy keys.
 `https://github.com/YOURUSER/flux-get-started/settings/keys/new` and
 paste the key there.)
 
-### Committing a small change
+> **Note:** the SSH key must be configured to have R/W access to the
+> repository. More specifically, the SSH key must be able to create
+> and update tags. E.g. in Gitlab, that means it requires `Maintainer`
+> permissions. The `Developer` permission can create tags, but not
+> update them.
+
+## Committing a small change
 
 In this example we are using a simple example of a webservice and
 change its configuration to use a different message. The easiest
@@ -119,7 +123,7 @@ The default sync frequency is 5 minutes. This can be tweaked easily.
 By observing the logs you can see when the change landed in in the
 cluster.
 
-### Confirm the change landed
+## Confirm the change landed
 
 To access our webservice and check out its welcome message, simply
 run:
@@ -131,14 +135,13 @@ curl localhost:9898
 
 Notice the updated `color` value in the JSON reply.
 
-### Conclusion
+## Conclusion
 
 As you can see, the actual steps to set up Flux, get our app
 deployed, give Flux access to it and see modifications land are
 very straight-forward and are a quite natural work-flow.
 
 As a next step, you might want to dive deeper into [how to
-control Flux](../using/fluxctl.md), check out [more sophisticated
-setups](./standalone-setup.md) or go through our hands-on
-tutorial about driving Flux, e.g.
-[automations, annotations and locks](../using/annotations-tutorial.md).
+control Flux](../references/fluxctl.md), or go through our
+hands-on tutorial about driving Flux, e.g.
+[automations, annotations and locks](driving-flux.md).
diff --git a/docs/tutorials/index.rst b/docs/tutorials/index.rst
new file mode 100644
index 000000000..eab53b2a5
--- /dev/null
+++ b/docs/tutorials/index.rst
@@ -0,0 +1,12 @@
+.. You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Tutorials
+=========
+
+.. toctree::
+   :maxdepth: 1
+
+   get-started
+   get-started-helm
+   driving-flux
diff --git a/docs/using/index.rst b/docs/using/index.rst
deleted file mode 100644
index 3cff57133..000000000
--- a/docs/using/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. Flux documentation documentation master file, created by
-   sphinx-quickstart on Wed Jun 12 16:13:18 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-Using Flux
-==============================================
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Contents:
-
-   annotations-tutorial
-   fluxctl
-   git-gpg
-   monitoring
diff --git a/internal_docs/releasing.md b/internal_docs/releasing.md
index 866508d53..08dbecb8b 100644
--- a/internal_docs/releasing.md
+++ b/internal_docs/releasing.md
@@ -4,7 +4,7 @@ The release process needs to do these things:
 
  - create a new release on GitHub, with a tag
  - push Docker image(s) to Docker Hub
- - possibly upload the [`fluxctl` binaries](/docs/using/fluxctl.md#binary-releases) to the GitHub release
+ - possibly upload the [`fluxctl` binaries](/docs/references/fluxctl.md#binary-releases) to the GitHub release
  - make sure the version is entered into the checkpoint database so that up-to-date checks report back accurate information
  - close out the GitHub milestone that was used to track the release
 

From ad5368646b97c3743fd93c2358b48d4e3638c372 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 30 Jul 2019 18:52:03 +0200
Subject: [PATCH 137/158] Fixed broken links

---
 chart/flux/Chart.yaml                       | 2 +-
 chart/flux/templates/NOTES.txt              | 2 +-
 deploy/flux-deployment.yaml                 | 2 +-
 git/errors.go                               | 2 +-
 install/generated_templates.gogen.go        | 8 ++++----
 install/templates/flux-deployment.yaml.tmpl | 2 +-
 remote/errors.go                            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
index 9fb256b33..6316484fe 100644
--- a/chart/flux/Chart.yaml
+++ b/chart/flux/Chart.yaml
@@ -11,6 +11,6 @@ maintainers:
   - name: stefanprodan
     email: stefan@weave.works
 engine: gotpl
-icon: https://raw.githubusercontent.com/fluxcd/flux/master/docs/images/weave-flux.png
+icon: https://raw.githubusercontent.com/fluxcd/flux/master/docs/_files/weave-flux.png
 keywords:
   - gitops
diff --git a/chart/flux/templates/NOTES.txt b/chart/flux/templates/NOTES.txt
index c38c17d5a..1626bf019 100644
--- a/chart/flux/templates/NOTES.txt
+++ b/chart/flux/templates/NOTES.txt
@@ -3,7 +3,7 @@ Get the Git deploy key by either (a) running
   kubectl -n {{ .Release.Namespace }} logs deployment/{{ .Release.Name }} | grep identity.pub | cut -d '"' -f2
 
 or by (b) installing fluxctl through
-https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md#installing-fluxctl
+https://github.com/weaveworks/flux/blob/master/docs/references/fluxctl.md#installing-fluxctl
 and running:
 
   fluxctl identity
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 96e22e79e..570bfea93 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -35,7 +35,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/docs/install/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs//guides/use-private-git-host.md
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config
diff --git a/git/errors.go b/git/errors.go
index a11087613..b55fc4bcd 100644
--- a/git/errors.go
+++ b/git/errors.go
@@ -16,7 +16,7 @@ We need to clone a git repo to proceed, and you haven't supplied
 one. Please upload a config file, including a git repository URL, as
 described in
 
-    https://github.com/weaveworks/flux/blob/master/docs/using/fluxctl.md
+    https://github.com/weaveworks/flux/blob/master/docs/references/fluxctl.md
 
 `,
 }
diff --git a/install/generated_templates.gogen.go b/install/generated_templates.gogen.go
index 20afc50d1..2ebf80356 100644
--- a/install/generated_templates.gogen.go
+++ b/install/generated_templates.gogen.go
@@ -19,7 +19,7 @@ var templates = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2019, 7, 30, 9, 7, 53, 602764277, time.UTC),
+			modTime: time.Date(2019, 7, 30, 16, 51, 31, 100963419, time.UTC),
 		},
 		"/flux-account.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-account.yaml.tmpl",
@@ -30,10 +30,10 @@ var templates = func() http.FileSystem {
 		},
 		"/flux-deployment.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-deployment.yaml.tmpl",
-			modTime:          time.Date(2019, 7, 30, 9, 7, 53, 602764277, time.UTC),
-			uncompressedSize: 5909,
+			modTime:          time.Date(2019, 7, 30, 16, 51, 31, 100963419, time.UTC),
+			uncompressedSize: 5888,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x8f\x1b\xb7\x11\x7f\xbf\x4f\x31\x90\x1f\x6c\x03\xd2\xea\x94\x4b\x8b\x62\xd3\x0b\xe0\xd8\xb1\xeb\x3a\x3e\x1f\x7c\x75\x8b\x3e\x35\x14\x77\xa4\x25\xc4\x25\xb7\x1c\xee\x2a\x82\x90\xef\x1e\x0c\xb9\x7f\xb8\x92\xce\x17\xd8\x0f\xbe\x3b\xee\xfc\x9f\xe1\x6f\x66\xb8\x58\x2c\xae\x44\xad\xfe\x8d\x8e\x94\x35\x39\x88\xba\xa6\x65\xbb\xba\xda\x29\x53\xe4\xf0\x06\x6b\x6d\x0f\x15\x1a\x7f\x55\xa1\x17\x85\xf0\x22\xbf\x02\x30\xa2\xc2\x1c\x36\xba\xf9\xed\x78\x04\xb5\x81\xec\x4e\x54\x48\xb5\x90\x08\xbf\xff\xde\x7d\x0f\x7f\xe6\x70\x3c\x4e\xbf\x1e\x8f\x80\xa6\x60\x32\xaa\x51\xb2\x30\x87\xb5\x56\x52\x50\x0e\xab\x2b\x00\x42\x8d\xd2\x5b\xc7\x5f\x00\x2a\xe1\x65\xf9\x8b\x58\xa3\xa6\x78\x90\xea\x66\x6a\xef\x84\xc7\xed\x21\x7e\xf4\x87\x1a\x73\xf8\x8c\xd2\xa1\xf0\x78\x05\xe0\xb1\xaa\xb5\xf0\xd8\x09\x4b\x3c\xe0\x7f\xc2\x18\xeb\x85\x57\xd6\x0c\xc2\x01\x6a\x67\x2b\xf4\x25\x36\x94\x29\xbb\xac\xad\xf3\x39\xcc\x6e\xae\x6f\x56\x33\x78\x06\x1e\xb5\x4e\x28\xc0\x5b\x20\xe9\x44\x8d\xb0\xac\xd0\x3b\x25\x89\x9d\xab\xad\x32\xfe\x39\x01\x33\x67\x9d\x60\x3d\xf1\xe1\xc4\x0b\x80\x3e\x16\xe1\x77\x74\xad\x92\xf8\x4a\x4a\xdb\x18\x7f\x37\x25\x04\x68\xad\x6e\x2a\x1c\x44\x2d\x3a\x51\x5b\xe5\x17\x3b\x3c\x0c\x0a\x88\xa3\xe0\x47\x85\xfd\xc9\x28\x6f\xc1\x2c\x45\x48\x70\x42\x55\xe0\x46\x34\xda\x7f\xb4\x05\xe6\x70\xfd\xfd\xf5\x35\x3c\x83\x7d\x89\x06\x2a\xb6\x06\x0b\x70\x28\x8a\x85\x35\xfa\x30\x87\x3d\xc2\xde\x9a\xe7\x1e\xd6\x08\x62\xad\x91\xe3\x21\xcb\xca\x16\x57\x9d\xc0\x67\xf0\xaf\x52\x11\x28\x02\x01\xbe\xaa\x37\x04\x0d\x61\x01\x1b\xeb\x60\x8b\x06\x9d\xf0\xca\x6c\xe1\xe1\xe1\x1f\xb0\xc3\x03\x65\xf0\xde\xc0\x87\xbf\x11\xfc\x78\x0b\xab\x6c\x75\x3d\x1f\xa4\xf4\xba\xa3\x0b\x04\xc2\x61\x6a\x07\x59\x36\xc5\x20\x16\x20\x80\xb0\x16\x5c\x14\x5d\xa0\x60\x8f\x83\x18\x29\x0c\xec\x9d\xf2\x6c\x68\x76\x39\x7e\x5b\x34\x43\x30\xb0\xaa\xfd\xe1\x8d\x72\x69\x10\x2b\x2c\x54\x53\xe5\xf0\x11\x2b\xeb\x0e\xa9\x9f\x08\x1b\xab\xb5\xdd\xb3\x47\x9d\x6a\x45\xc1\xd5\x86\xf8\x4c\x80\x6c\xc8\xdb\x4a\x71\x04\x76\xc6\xee\xcd\xff\x4a\x4b\x9e\x06\x11\x1b\xa5\x71\x0e\xfb\x52\xc9\x12\x0e\xb6\x81\xbd\xd2\x3a\x3a\xe5\x2d\x14\x96\xef\x19\x1f\x33\x13\xff\xe2\xc0\xee\x0d\x9b\x3d\x08\x70\x58\x5b\x70\xc2\x97\xe8\xc0\x97\xc2\x74\x8a\xb7\xca\x97\xcd\x1a\x2c\x1f\x22\x68\xb5\xc3\x0c\xfe\x6b\x9b\xe7\x5a\x83\xd0\x64\x7b\x15\xd3\x60\x83\xf2\xa0\x8c\xb7\x81\x47\x5a\xe3\x85\x32\xe8\xe6\xb0\x46\x6d\xf7\x19\x3c\xe0\x18\xd5\xd2\xfb\x9a\xf2\xe5\x32\xea\xc9\xa4\xad\x96\x7b\x14\x2d\xee\xad\xdb\xd1\x92\x2b\x6d\xb9\xd6\x76\xbd\xac\x04\x79\x74\xcb\xc2\x4a\x5a\x2a\x43\x5e\x68\xbd\x24\x2f\x4c\x21\xb4\x35\xb8\x20\xf4\x4d\x9d\x55\xc5\xb3\x60\xf5\x42\x2c\x6a\xa7\x5a\xe1\x31\x94\x29\x3b\x3d\x28\xec\x53\x46\x54\x2e\xa4\x35\x1b\xb5\x1d\x3e\x01\xc4\x83\x8f\xa2\xce\x93\xc3\xf4\xbe\x2d\x12\xb6\x6f\x4d\x5f\xb6\x6b\xd6\xb8\x8c\x42\xc6\x2a\x7d\x32\x75\x7b\x45\x25\x9f\x94\xa2\x45\x10\x50\xa8\xcd\x06\x1d\x63\x6b\x2f\xa1\xbb\x7c\x23\x7e\x86\x4c\x45\x71\x69\xae\x18\x83\x5a\x55\x60\x9f\x9d\x8d\xda\x56\xa2\x1e\x0d\x51\xbe\x04\x61\x00\x8d\x77\x87\xe0\xc3\xaf\x91\xe8\xd7\x39\x08\x53\x40\x63\xa4\xad\x18\xd4\x03\x7f\xf4\xf6\x63\xc8\xba\x30\xc5\x20\x05\x4d\x1b\x24\x28\xa4\x2e\xed\x67\x19\xe0\x30\x7c\x43\x06\x12\xb6\x27\x33\x10\x00\xc3\x5b\x50\x15\xc3\x29\xbc\xbb\x7f\x17\xb0\x02\x5e\xb0\x5b\xa4\xb6\x46\x99\x51\x39\x3b\xd7\xa2\x53\x1b\x25\x03\xae\x43\xdd\xb8\xda\x12\xd2\xcb\x3f\x11\xc8\x41\x4a\x44\x99\x18\x45\x0e\x10\xeb\xfb\x13\x81\x03\xe1\xb6\xe3\x6d\x7e\x24\x62\xdb\x7a\xcb\x30\x43\x49\x68\xa6\x48\xfd\xec\x11\xac\x3e\xe7\xbb\x80\xd5\x7d\x38\x87\x0b\x7b\xd6\x26\x92\x46\xd2\x45\xdd\x61\x80\x53\x63\x61\x96\x73\xaf\x24\x3f\x03\x55\x89\x2d\xc6\xea\x67\x86\x0c\xde\x2a\x53\x04\x9f\x2b\x46\x1f\x87\x72\xac\xda\x88\x3c\x1a\x05\x21\x63\x4c\x60\xe5\x24\xf0\x38\x01\xc2\x0f\xf0\xc0\xd8\x50\x58\xb9\x43\x17\x20\xc2\x9d\x81\x84\x17\x43\xf8\xfa\x5c\xf2\x68\xc0\x63\x03\x6b\xf6\x62\x0b\x6c\x6d\x36\xd0\x04\x55\x39\x74\x42\x95\x0d\x62\x64\x11\x7e\xe4\xab\x6c\x75\x93\xdd\x4c\x69\xef\x1b\xad\xef\xad\x56\xf2\x90\xc3\xfb\xcd\x9d\xf5\xf7\x0e\x29\xf5\xc4\x21\xd9\xc6\x49\xa4\x14\xf2\x1d\xfe\xbf\x41\xf2\x93\x33\x00\x59\x37\x39\xfc\xe5\xba\x9a\x1c\x56\xa1\x2b\xe4\xf0\xd7\xef\x3f\xaa\x71\xa2\xb0\x2e\x65\x5e\x8c\xd9\xb9\x0f\xd3\xc5\xcd\xf5\x0d\x37\x59\x65\x36\xd6\x55\xa1\x6c\x85\x1e\xa8\x93\x1a\x9b\xc8\xb8\xdc\xf4\x21\x82\xf7\xbd\xf0\x65\x0e\x4b\xf4\x32\xc4\xa2\x58\x12\x95\x3c\xbd\xd8\x38\x4f\x81\xb6\xdd\xf5\xd8\xaa\x16\x0d\x28\x13\xc3\xf3\x9c\x22\x0f\x51\xb9\x9c\xdc\xea\x18\x05\x51\x7c\x32\xfa\x90\x83\x77\x0d\xb2\x34\xee\xec\xe1\x42\xad\x3b\x1c\xe2\x0a\xa8\xd1\x6d\xac\x93\xc8\x42\x63\x2b\xe7\x4e\xfe\x98\xe1\x69\xb7\x9d\xda\xde\x0a\xd7\xd9\x1e\xc9\xbe\xcd\xfc\xa4\x9c\xde\x1b\xa9\x9b\x70\xd1\x79\x20\x89\x78\xdc\x83\x40\xec\x78\x4f\x34\xe8\xbe\x45\xff\xc0\xac\x27\xcd\x73\x00\x03\x28\x50\x6a\xe1\x78\x10\x59\xdb\x36\xa9\xd5\xaf\x74\xad\x78\x9b\x53\xe7\x9d\xb5\x7e\x99\x11\x95\x8f\x3a\x20\xcc\x44\xeb\x6c\x44\xd4\x59\xd4\x3c\xef\x49\x12\x09\x68\x5a\xe5\xac\x09\xf8\x15\x5b\xc3\xec\xc3\x97\x9f\x7e\x7e\xfd\xe9\xee\xed\xfb\x77\xb3\x88\x58\x73\x8e\x87\x6d\xd1\xb9\x69\x7b\x49\xc4\x04\x44\x5e\x1f\x22\xf8\x7b\x7d\xc9\xc7\xb3\xbe\x70\xee\xe3\x58\x9c\x4c\xfc\xa8\xa3\x0c\xd1\x3c\x4e\xf7\xda\x18\x51\x92\xce\xd9\x59\x17\x72\x92\x88\x38\xed\xbf\x69\xd2\x43\xf3\xed\x07\x4a\x61\x40\x68\x8f\xce\xf0\xc0\x78\x66\xf1\xc6\xd9\x8a\xcb\xa2\x6f\xb0\x73\x10\xc4\xe5\xd6\x35\x01\x0e\x83\xb6\x72\x47\xe7\xc9\x46\xd3\xe6\x17\xe2\x32\x86\x7b\x12\x97\x56\xe8\x06\xcf\x62\xf2\x54\x11\x9f\xd6\x40\xdf\x22\xbe\x52\x01\xdc\xa1\xa6\x9d\xe9\x2b\xbd\xe9\x91\xba\x64\xaa\xd8\x8c\x27\x74\x53\x7c\x18\x8d\x66\x95\xf9\xc4\x87\x98\x86\xb8\x78\x60\xc1\x98\x29\x85\x2c\xb1\xe0\xc8\xa6\xa9\x1d\x86\x20\x4e\x22\x87\x65\x9e\x48\xb1\xae\x9b\x72\x12\x86\x6e\x71\x0a\x8c\xf3\xa0\x84\x07\x7e\x6a\xea\x5a\x1f\x38\x10\x94\x86\x62\x9c\x35\xfc\xde\xb2\x95\x0d\xa7\x34\x14\x5c\xd8\xf2\x42\x1e\xa0\xb4\xfb\xb0\xd4\x58\x63\x50\xfa\x30\x87\xf8\x69\xe8\x16\x8b\xc1\x81\x30\xa5\xb2\xf2\xdb\xe1\x28\xeb\x5a\x74\x46\xad\xcc\xa4\x6e\x78\x02\xce\x18\xbf\x74\x1a\x92\x2f\x14\xaf\xda\x18\x8a\xd7\x91\xf4\xfd\xfd\xc4\x29\xbe\x75\x84\x3e\x2c\x4d\xd3\xc4\x8e\x36\xf4\xf4\xbc\x9a\x7a\xc7\x94\x61\x8d\x49\x10\x38\xb5\xb8\xa3\xbe\xbd\x9a\xcc\x04\x8a\xa0\x6a\x28\xac\x75\x21\x7a\x0a\x8b\x58\x4d\xeb\x80\xeb\xa1\x1b\x87\x6d\xee\x45\xbf\x22\xbd\x4c\x6d\xe9\xef\x56\xac\x42\x1e\x22\x92\xa5\x6e\x62\x08\x63\x61\xc4\xf7\x45\xa1\xdc\xed\x19\xea\xa7\x66\x7d\x4e\x66\x81\x31\x79\x5f\x3e\xff\x12\xb7\x4e\x61\xb6\xf1\xdb\x3b\xe5\xc3\x26\x44\xca\x5b\x77\x18\xd0\xea\x2d\xcf\x31\x13\xe5\xdc\x83\x1a\xa7\x6f\x8f\x47\xc8\xde\x29\xcf\x92\xc2\xe3\xc5\x94\x62\xed\x84\x91\x65\x4f\xf4\x53\xf8\x2b\x3e\x63\xa8\x4d\x38\xe2\xbb\x41\x97\x38\x6b\xe1\x03\xdf\x43\x48\x03\xfd\xd3\x2a\x93\x30\xcc\xe6\xb3\xee\x35\x44\x13\xa6\xec\x3c\x09\x9c\xb7\xaa\xbd\x30\xa1\xfc\x1c\x72\x56\x65\x1c\x40\x2b\x61\xd4\x86\x47\x13\x2e\x50\x52\x05\xba\xe8\xeb\xc9\x90\x17\xb6\x38\x4b\x08\x8d\x29\xd0\x9d\x04\xd0\xa1\x16\x5e\xb5\x08\x75\x30\xab\x4b\xef\x76\x12\xc4\x93\x82\x1f\x9c\xa3\x66\x5d\x28\xb7\x9a\xc7\x9f\xdf\x0d\x4f\x3b\x63\x70\xc2\xd3\xcd\xa5\xe0\x84\xf7\x90\x3e\xaa\x3d\xd5\x05\x01\x5f\x08\xdd\x25\xfe\x86\xd0\x0d\x99\x63\x1a\xb8\xcc\xff\x73\x25\xd4\x45\x03\x90\x3f\xf4\x12\x7a\xaa\xf1\x71\xea\x22\xe8\x22\xdf\xd3\xbd\xe5\x80\xa2\x09\x0f\x1e\x1c\x27\xee\x06\xca\x9f\xec\x22\x69\xac\x3a\x5c\xed\x50\xf3\xf6\x2b\x30\xda\x73\x74\xb2\x98\xeb\xf6\xef\x3b\x3c\x80\x2a\x7e\x1c\xc8\xbe\xd2\x2a\x13\xab\x58\x84\xf0\x8d\xc3\xc9\x42\x74\x41\x57\xf8\x7c\x58\x0c\xf4\xf4\xb8\xef\x06\x7f\xf3\x7d\x00\x12\x48\x14\x06\x66\x4d\x4d\xde\xa1\xa8\x66\x3d\x60\x25\x42\x5e\x60\xb6\xcd\xe6\xf0\x1f\x9e\xf7\xe1\xb5\xb6\x4d\xf1\x32\x0b\xfb\x9e\xb7\x3b\x9e\xdf\x08\x6a\xe1\xbc\x92\x8d\x16\x0e\xba\x27\x87\x4e\xca\x29\xd6\x76\x5a\x6f\xf7\xc4\x2b\x85\x64\x59\x59\xd8\x23\xb2\xb8\x48\x88\x5a\x2d\x4f\xaa\x9f\xd9\x82\xa2\x5b\xb1\x96\xab\xef\x6e\xce\xff\x4f\x1d\x7e\x40\xd7\x5e\x78\xcd\xe3\xb1\x63\x6c\x34\x9c\xb5\x1f\x52\xc4\x13\x3b\x46\x4a\x17\x51\x17\x7d\xf2\x44\xf8\x3c\x79\x65\x4c\x9e\x0b\xd9\xc5\xb0\xcf\x86\xd6\x3f\xc5\x25\xad\xc8\xa3\x59\x74\x26\xdc\xe6\x37\xd7\x37\xab\xab\xae\xa2\x5f\x15\x85\x8a\x1b\x02\xe3\xd9\x2b\x6e\xe7\x13\xe8\x18\xbf\x8f\x2d\xed\x78\x04\x17\xd0\xf1\x09\xee\x45\x78\xab\x9d\xdc\x82\xf1\xb7\x5e\xc1\xa7\xba\x13\xff\xe6\xee\xa1\xef\x45\x34\xef\x46\xa4\xc6\x75\x9d\x09\x4c\x61\x3d\x81\x0d\xc4\x50\x89\x43\xd8\xac\x74\x3b\xee\xd8\x86\xb4\xb5\xbb\xa6\x06\x45\xd4\x20\x81\x35\x40\xb6\x42\xf8\xd0\xac\xd1\x19\xf4\x48\x10\x1e\x84\x68\x5c\xa1\x0b\x43\xfd\xf2\x36\xbb\xb3\x06\x67\xe9\x97\xd7\xc1\x80\x74\x89\x8e\xca\x69\xba\x57\xf7\xa3\x4e\xb0\x6f\xf2\x65\x98\xc2\x66\xab\xd9\xd5\x1f\x01\x00\x00\xff\xff\xa8\x51\xbb\xed\x15\x17\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x58\x5f\x6f\x1b\xb9\x11\x7f\xf7\xa7\x18\x28\x0f\x49\x00\x69\x65\x9d\xaf\x45\xb1\x57\x1f\x90\x4b\x2e\x69\x9a\x8b\x63\xc4\x4d\x8b\x3e\xf5\x28\xee\x48\x4b\x88\x4b\x6e\x39\xa4\x74\x82\x71\xdf\xfd\x30\xe4\xfe\xe1\x5a\x72\x7c\x48\x1e\x62\x9b\x3b\xff\x67\xf8\x9b\x19\x2e\x16\x8b\x0b\xd1\xaa\x7f\xa3\x23\x65\x4d\x09\xa2\x6d\x69\xb9\x5f\x5d\xec\x94\xa9\x4a\x78\x83\xad\xb6\xc7\x06\x8d\xbf\x68\xd0\x8b\x4a\x78\x51\x5e\x00\x18\xd1\x60\x09\x1b\x1d\x7e\xbb\xbf\x07\xb5\x81\xe2\x46\x34\x48\xad\x90\x08\xbf\xff\xde\x7d\x8f\x7f\x96\x70\x7f\x3f\xfd\x7a\x7f\x0f\x68\x2a\x26\xa3\x16\x25\x0b\x73\xd8\x6a\x25\x05\x95\xb0\xba\x00\x20\xd4\x28\xbd\x75\xfc\x05\xa0\x11\x5e\xd6\xbf\x88\x35\x6a\x4a\x07\xb9\x6e\xa6\xf6\x4e\x78\xdc\x1e\xd3\x47\x7f\x6c\xb1\x84\xcf\x28\x1d\x0a\x8f\x17\x00\x1e\x9b\x56\x0b\x8f\x9d\xb0\xcc\x03\xfe\x27\x8c\xb1\x5e\x78\x65\xcd\x20\x1c\xa0\x75\xb6\x41\x5f\x63\xa0\x42\xd9\x65\x6b\x9d\x2f\x61\x76\x75\x79\xb5\x9a\xc1\x33\xf0\xa8\x75\x46\x01\xde\x02\x49\x27\x5a\x84\x65\x83\xde\x29\x49\xec\x5c\x6b\x95\xf1\xcf\x09\x98\xb9\xe8\x04\xeb\x89\x0f\x0f\xbc\x00\xe8\x63\x11\x7f\x47\xb7\x57\x12\x5f\x49\x69\x83\xf1\x37\x53\x42\x80\xbd\xd5\xa1\xc1\x41\xd4\xa2\x13\xb5\x55\x7e\xb1\xc3\xe3\xa0\x80\x38\x0a\x7e\x54\xd8\x9f\x8c\xf2\x16\xcc\x52\xc5\x04\x67\x54\x15\x6e\x44\xd0\xfe\xa3\xad\xb0\x84\xcb\xef\x2f\x2f\xe1\x19\x1c\x6a\x34\xd0\xb0\x35\x58\x81\x43\x51\x2d\xac\xd1\xc7\x39\x1c\x10\x0e\xd6\x3c\xf7\xb0\x46\x10\x6b\x8d\x1c\x0f\x59\x37\xb6\xba\xe8\x04\x3e\x83\x7f\xd5\x8a\x40\x11\x08\xf0\x4d\xbb\x21\x08\x84\x15\x6c\xac\x83\x2d\x1a\x74\xc2\x2b\xb3\x85\xbb\xbb\x7f\xc0\x0e\x8f\x54\xc0\x7b\x03\x1f\xfe\x46\xf0\xe3\x35\xac\x8a\xd5\xe5\x7c\x90\xd2\xeb\x4e\x2e\x10\x08\x87\xb9\x1d\x64\xd9\x14\x83\x58\x81\x00\xc2\x56\x70\x51\x74\x81\x82\x03\x0e\x62\xa4\x30\x70\x70\xca\xb3\xa1\xc5\xf9\xf8\x6d\xd1\x0c\xc1\xc0\xa6\xf5\xc7\x37\xca\xe5\x41\x6c\xb0\x52\xa1\x29\xe1\x23\x36\xd6\x1d\x73\x3f\x11\x36\x56\x6b\x7b\x60\x8f\x3a\xd5\x8a\xa2\xab\x81\xf8\x4c\x80\x0c\xe4\x6d\xa3\x38\x02\x3b\x63\x0f\xe6\x7f\xb5\x25\x4f\x83\x88\x8d\xd2\x38\x87\x43\xad\x64\x0d\x47\x1b\xe0\xa0\xb4\x4e\x4e\x79\x0b\x95\xe5\x7b\xc6\xc7\xcc\xc4\xbf\x38\xb0\x07\xc3\x66\x0f\x02\x1c\xb6\x16\x9c\xf0\x35\x3a\xf0\xb5\x30\x9d\xe2\xad\xf2\x75\x58\x83\xe5\x43\x04\xad\x76\x58\xc0\x7f\x6d\x78\xae\x35\x08\x4d\xb6\x57\x31\x0d\x36\x28\x0f\xca\x78\x1b\x79\xa4\x35\x5e\x28\x83\x6e\x0e\x6b\xd4\xf6\x50\xc0\x1d\x8e\x51\xad\xbd\x6f\xa9\x5c\x2e\x93\x9e\x42\xda\x66\x79\x40\xb1\xc7\x83\x75\x3b\x5a\x72\xa5\x2d\xd7\xda\xae\x97\x8d\x20\x8f\x6e\x59\x59\x49\xcb\xe5\x36\xa8\x0a\x69\x19\x08\x17\xad\x53\x7b\xe1\x31\x96\x23\x3b\x57\x34\xd5\x20\xbb\xcf\x0e\x51\xbd\x90\xd6\x6c\xd4\x76\xf8\x04\x90\x0e\x3e\x8a\xb6\xcc\x0e\xf3\xab\xb5\xc8\xd8\xbe\x35\x53\xc5\x2e\xac\x71\x99\x84\x8c\x05\xf9\x64\x96\x0e\x8a\x6a\x3e\xa9\xc5\x1e\x41\x40\xa5\x36\x1b\x74\x0c\xa3\xbd\x84\xee\x9e\x8d\x50\x19\x93\x92\xc4\xe5\x69\x61\xb8\xd9\xab\x0a\xfb\x44\x6c\xd4\xb6\x11\xed\x68\x88\xf2\x35\x08\x03\x68\xbc\x3b\x46\x1f\x7e\x4d\x44\xbf\xce\x41\x98\x0a\x82\x91\xb6\x61\xfc\x8e\xfc\xc9\xdb\x8f\x31\xc1\xc2\x8c\x61\x46\xb3\x8f\x12\x14\x52\x97\xe1\x93\x0c\x70\x18\xbe\x21\x03\x19\xdb\x93\x19\x88\xd8\xe0\x2d\xa8\x86\x91\x13\xde\xdd\xbe\x8b\xb0\x00\x2f\xd8\x2d\x52\x5b\xa3\xcc\xa8\x9c\x9d\xdb\xa3\x53\x1b\x25\x23\x84\x43\x1b\x5c\x6b\x09\xe9\xe5\x9f\x08\xe4\x20\x25\x01\x4a\x8a\x22\x07\x88\xf5\xfd\x89\xc0\x81\x70\xdb\xf1\xe2\x3e\x12\xb1\x6d\xbb\x65\x44\xa1\x2c\x34\x53\x50\x7e\xf6\x08\x2c\x9f\xf2\x9d\x81\xe5\x3e\x9c\xc3\xdd\x3c\xe9\x08\x59\xcf\xe8\xa2\xee\x30\x22\xa7\xb1\x30\x2b\xb9\x2d\x92\x9f\x81\x6a\xc4\x16\x53\xf5\x33\x43\x01\x6f\x95\xa9\xa2\xcf\x0d\x03\x8d\x43\x39\x56\x6d\x02\x19\x8d\x82\x90\xe1\x24\xb2\x72\x12\x78\x72\x00\xe1\x07\x24\x60\x18\xa8\xac\xdc\xa1\x8b\x68\xe0\x4e\xf0\xc0\x8b\x21\x7c\x7d\x2e\x79\x0a\xe0\x09\x81\x35\x7b\xb1\x05\xb6\xb6\x18\x68\xa2\xaa\x12\x3a\xa1\xca\x46\x31\xb2\x8a\x3f\xca\x55\xb1\xba\x2a\xae\xa6\xb4\xb7\x41\xeb\x5b\xab\x95\x3c\x96\xf0\x7e\x73\x63\xfd\xad\x43\xca\x3d\x71\x48\x36\x38\x89\x94\xa3\xbb\xc3\xff\x07\x24\x3f\x39\x03\x90\x6d\x28\xe1\x2f\x97\xcd\xe4\xb0\x89\x0d\xa0\x84\xbf\x7e\xff\x51\x8d\xc3\x83\x75\x39\xf3\x62\xcc\xce\x6d\x1c\x24\xae\x2e\xaf\xb8\x9f\x2a\xb3\xb1\xae\x89\x65\x2b\xf4\x40\x9d\xd5\xd8\x44\xc6\xf9\xfe\x0e\x09\xa7\x6f\x85\xaf\x4b\x58\xa2\x97\x31\x16\xd5\x92\xa8\xe6\x41\xc5\xa6\xd1\x09\xb4\xed\xae\xc7\x56\xed\xd1\x80\x32\x29\x3c\xcf\x29\xf1\x10\xd5\xcb\xc9\xad\x4e\x51\x10\xd5\x27\xa3\x8f\x25\x78\x17\x90\xa5\x71\x13\x8f\x17\x6a\xdd\xe1\x10\x57\x40\x8b\x6e\x63\x9d\x44\x16\x9a\xba\x36\x37\xed\xc7\x0c\xcf\x1b\xeb\xd4\xf6\xbd\x70\x9d\xed\x89\xec\xdb\xcc\xcf\xca\xe9\xbd\x91\x3a\xc4\x8b\xce\xb3\x47\xc2\xe3\x1e\x04\x52\x73\x7b\xa2\x17\xf7\xdd\xf8\x07\x66\x7d\xd0\x27\x07\x30\x80\x0a\xa5\x16\x8e\x67\x8e\xb5\xdd\x67\xb5\xfa\x95\xae\x95\x6e\x73\xee\xbc\xb3\xd6\x2f\x0b\xa2\xfa\x51\x07\x84\x99\x68\x9d\x8d\x88\x3a\x4b\x9a\xe7\x3d\x49\x26\x01\xcd\x5e\x39\x6b\x22\x7e\xa5\xd6\x30\xfb\xf0\xe5\xa7\x9f\x5f\x7f\xba\x79\xfb\xfe\xdd\x2c\x21\xd6\x9c\xe3\x61\xf7\xe8\xdc\xb4\xbd\x64\x62\x22\x22\xaf\x8f\x09\xfc\xbd\x3e\xe7\xe3\x49\x5f\x38\xf5\x71\x2c\x4e\x26\x7e\xd4\x51\x86\x68\x9e\x9c\x7b\x6d\x8c\x28\x59\xe7\xec\xac\x8b\x39\xc9\x44\x3c\xec\xbf\x79\xd2\x63\xf3\xed\x67\x47\x61\x40\x68\x8f\xce\xf0\x6c\x78\x62\xf1\xc6\xd9\x86\xcb\xa2\x6f\xb0\x73\x10\xc4\xe5\xd6\x35\x01\x0e\x83\xb6\x72\x47\xa7\xc9\x46\xb3\x2f\xcf\xc4\x65\x0c\xf7\x24\x2e\x7b\xa1\x03\x9e\xc4\xe4\xa9\x22\x7e\x58\x03\x7d\x8b\xf8\x4a\x05\x70\x87\x9a\x76\xa6\xaf\xf4\xa6\x47\xea\x92\xa9\x52\x33\x9e\xd0\x4d\xf1\x61\x34\x9a\x55\x96\x13\x1f\x52\x1a\xd2\x8e\x81\x15\x63\xa6\x14\xb2\xc6\x8a\x23\x9b\xa7\x76\x18\x82\x38\x89\x1c\x96\x79\x26\xc5\xba\x6e\xca\xc9\x18\xba\x1d\x29\x32\xce\xa3\x12\x9e\xed\x29\xb4\xad\x3e\x72\x20\x28\x0f\xc5\x38\x6b\xf8\x83\x65\x2b\x03\xa7\x34\x16\x5c\x5c\xe8\x62\x1e\xa0\xb6\x87\xb8\xbf\x58\x63\x50\xfa\x38\x87\xf8\x69\xe8\x16\x8b\xc1\x81\x38\xa8\xb2\xf2\xeb\xe1\xa8\xe8\x5a\x74\x41\x7b\x59\x48\x1d\x78\xd8\x2d\x18\xbf\x74\x1e\x92\x2f\x94\xae\xda\x18\x8a\xd7\x89\xf4\xfd\xed\xc4\x29\xbe\x75\x84\x3e\xee\x47\xd3\xc4\x8e\x36\xf4\xf4\xbc\x85\x7a\xc7\x94\x71\x63\xc9\x10\x38\xb7\xb8\xa3\xbe\xbe\x98\xcc\x04\x8a\xa0\x09\x14\x37\xb8\x18\x3d\x85\x55\xaa\xa6\x75\xc4\xf5\xd8\x8d\xe3\xe2\xf6\xa2\xdf\x86\x5e\xe6\xb6\xf4\x77\x2b\x55\x21\x0f\x11\xd9\xfe\x36\x31\x84\xb1\x30\xe1\xfb\xa2\x52\xee\xfa\x04\xf5\x73\xb3\x3e\x67\xb3\xc0\x98\xbc\x2f\x9f\x7f\x49\x0b\xa6\x30\xdb\xf4\xed\x9d\xf2\x71\xe9\x21\xe5\xad\x3b\x0e\x68\xf5\x96\xe7\x98\x89\x72\xee\x41\xc1\xe9\xeb\xfb\x7b\x28\xde\x29\xcf\x92\xe2\x3b\xc5\x94\x62\xed\x84\x91\x75\x4f\xf4\x53\xfc\x2b\xbd\x58\xa8\x4d\x3c\xe2\xbb\x41\xe7\x38\x5b\xe1\x23\xdf\x5d\x4c\x03\xfd\xd3\x2a\x93\x31\xcc\xe6\xb3\xee\xe1\x43\x13\xe6\xec\x3c\x09\x9c\xb6\xaa\x83\x30\xb1\xfc\x1c\x72\x56\x65\x1a\x40\x1b\x61\xd4\x86\x47\x13\x2e\x50\x52\x15\xba\xe4\xeb\x83\x21\x2f\x2e\x6c\x96\x10\x82\xa9\xd0\x3d\x08\xa0\x43\x2d\xbc\xda\x23\xb4\xd1\xac\x2e\xbd\xdb\x49\x10\x1f\x14\xfc\xe0\x1c\x85\x75\xa5\xdc\x6a\x9e\x7e\x7e\x37\xbc\xe2\x8c\xc1\x89\xaf\x34\xe7\x82\x13\x9f\x3e\xfa\xa8\xf6\x54\x67\x04\x7c\x21\x74\xe7\xf8\x03\xa1\x1b\x32\xc7\x34\x70\x9e\xff\xe7\x46\xa8\xb3\x06\x20\x7f\xe8\x25\xf4\x54\xe3\x3b\xd4\x59\xd0\x45\xbe\xa7\x07\xcb\x01\x45\x13\xdf\x36\x38\x4e\xdc\x0d\x94\x7f\xb0\x8b\xe4\xb1\xea\x70\xb5\x43\xcd\xeb\xaf\xc0\x68\xcf\xd1\xc9\x62\xae\xeb\xbf\xef\xf0\x08\xaa\xfa\x71\x20\xfb\x4a\xab\xcc\xac\x62\x11\xc2\x07\x87\x93\x85\xe8\x8c\xae\xf8\xf9\xb8\x18\xe8\xe9\x71\xdf\x0d\xfe\xe6\xfb\x00\x64\x90\x28\x0c\xcc\x42\x4b\xde\xa1\x68\x66\x3d\x60\x65\x42\x5e\x60\xb1\x2d\xe6\xf0\x1f\x9e\xf7\xe1\xb5\xb6\xa1\x7a\x59\xc4\x7d\xcf\xdb\x1d\xcf\x6f\x04\xad\x70\x5e\xc9\xa0\x85\x83\xee\x75\xa1\x93\xf2\x10\x6b\x3b\xad\xd7\x07\xe2\x95\x42\xb2\xac\x22\xee\x11\x45\x5a\x24\x44\xab\x96\x0f\xaa\x9f\xd9\xa2\xa2\x6b\xb1\x96\xab\xef\xae\x4e\xff\xcf\x1d\xbe\x43\xb7\x3f\xf3\x70\xc7\x63\xc7\xd8\x68\x38\x6b\x3f\xe4\x88\x27\x76\x8c\x94\x2e\xa1\x2e\xfa\xec\x35\xf0\x79\xf6\xa0\x98\xbd\x0c\xb2\x8b\x71\x9f\x8d\xad\x7f\x8a\x4b\x5a\x91\x47\xb3\xe8\x4c\xb8\x2e\xaf\x2e\xaf\x56\x17\x5d\x45\xbf\xaa\x2a\x95\x36\x04\xc6\xb3\x57\xdc\xce\x27\xd0\x31\x7e\x1f\x5b\xda\xfd\x3d\xb8\x88\x8e\x4f\x70\x2f\xe2\xb3\xec\xe4\x16\x8c\xbf\xf5\x0a\x3e\xb5\x9d\xf8\x37\x37\x77\x7d\x2f\xa2\x79\x37\x22\x05\xd7\x75\x26\x30\x95\xf5\x04\x36\x12\x43\x23\x8e\x71\xb3\xd2\xfb\x71\xc7\x36\xa4\xad\xdd\x85\x16\x14\x51\x40\x02\x6b\x80\x6c\x83\xf0\x21\xac\xd1\x19\xf4\x48\x2c\x3d\xb4\x34\xae\xd0\x95\xa1\x7e\x79\x9b\xdd\x58\x83\xb3\xfc\xcb\xeb\x68\x40\xbe\x44\x27\xe5\x34\xdd\xab\xfb\x51\x27\xda\x37\xf9\x32\x4c\x61\xb3\xd5\xec\xe2\x8f\x00\x00\x00\xff\xff\xf1\x12\x73\x2a\x00\x17\x00\x00"),
 		},
 		"/flux-secret.yaml.tmpl": &vfsgen۰CompressedFileInfo{
 			name:             "flux-secret.yaml.tmpl",
diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl
index 2b08fd64c..ed28285dc 100644
--- a/install/templates/flux-deployment.yaml.tmpl
+++ b/install/templates/flux-deployment.yaml.tmpl
@@ -36,7 +36,7 @@ spec:
       # file, which you will need to do if you host your own git
       # repo rather than using github or the like. You'll also need to
       # mount it into the container, below. See
-      # https://github.com/weaveworks/flux/blob/master/docs/install/standalone-setup.md#using-a-private-git-host
+      # https://github.com/weaveworks/flux/blob/master/docs//guides/use-private-git-host.md
       # - name: ssh-config
       #   configMap:
       #     name: flux-ssh-config
diff --git a/remote/errors.go b/remote/errors.go
index 0383db007..58cc54bdc 100644
--- a/remote/errors.go
+++ b/remote/errors.go
@@ -22,7 +22,7 @@ and try the operation again.
 Otherwise, please consult the installation instructions in our
 documentation:
 
-    https://github.com/weaveworks/flux/blob/master/docs/install/index.md
+    https://github.com/weaveworks/flux/blob/master/docs/get-started/index.rst
 
 If you are still stuck, please log an issue:
 

From 51108e21ca0d61d432fe8bec89b05cde2939978d Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 10:48:49 +0200
Subject: [PATCH 138/158] Update link to 'advanced' get-started repository

---
 docs/tutorials/get-started-helm.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tutorials/get-started-helm.md b/docs/tutorials/get-started-helm.md
index 2e67a944f..a57e76c12 100644
--- a/docs/tutorials/get-started-helm.md
+++ b/docs/tutorials/get-started-helm.md
@@ -185,5 +185,5 @@ very straight-forward and are a quite natural workflow.
 
 ## A more advanced setup
 
-For a more advanced Helm setup, take a look at the [gitops-helm
-repository](https://github.com/stefanprodan/gitops-helm).
+For a more advanced Helm setup, take a look at the
+[`fluxcd/helm-operator-get-started` repository](https://github.com/fluxcd/helm-operator-get-started).

From 4d33a71a05a2672011fa93cd4b8f751238c1d68d Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 11:33:59 +0200
Subject: [PATCH 139/158] Fix broken link in `README.md`

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6ba306cfe..85cdf2e54 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Get started by browsing through the documentation below:
   - [Introduction to Flux](/docs/introduction.md)
   - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
   - [How it works](/docs/references/blueprint.md)
-  - [Considerations regarding installing Flux](/docs/install/index.md)
+  - [Considerations regarding installing Flux](/docs/get-started/index.rst)
   - [Flux <-> Helm integration](/docs/references/helm-operator-integration.md)
 - Get Started with Flux
   - [Standalone Flux](/docs/tutorials/get-started.md)

From ada7a36dce9660dd9565a56fdd9bf25ded3fedd9 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 12:23:26 +0200
Subject: [PATCH 140/158] Link to docs website instead of Markdown files

---
 README.md | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 85cdf2e54..c97cfee26 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ new infrastructure.
 
 [![CircleCI](https://circleci.com/gh/fluxcd/flux.svg?style=svg)](https://circleci.com/gh/fluxcd/flux)
 [![GoDoc](https://godoc.org/github.com/fluxcd/flux?status.svg)](https://godoc.org/github.com/fluxcd/flux)
+[![Documentation](https://img.shields.io/badge/latest-documentation-informational)](https://docs.fluxcd.io/en/latest/)
 
 ## What Flux does
 
@@ -42,21 +43,6 @@ Flux is most useful when used as a deployment tool at the end of a
 Continuous Delivery pipeline. Flux will make sure that your new
 container images and config changes are propagated to the cluster.
 
-### Features
-
-Its major features are:
-
-- [Automated git → cluster synchronisation](/docs/introduction.md#automated-git-cluster-synchronisation)
-- [Automated deployment of new container images](/docs/introduction.md#automated-deployment-of-new-container-images)
-- [Integrations with other devops tools](/docs/introduction.md#integrations-with-other-devops-tools) ([Helm](/docs/references/helm-operator-integration.md) and more)
-- No additional service or infrastructure needed - Flux lives inside your
-  cluster
-- Straight-forward control over the state of deployments in the
-  cluster (rollbacks, lock a specific version of a workload, manual
-  deployments)
-- Observability: git commits are an audit trail, and you can record events that
-  occured, for example: why a given deployment was locked.
-
 ### Who is using Flux in production
 
 - [ABA English](https://www.abaenglish.com)
@@ -96,24 +82,8 @@ could easily integrate.
 
 ## Get started with Flux
 
-Get started by browsing through the documentation below:
-
-- Background about Flux
-  - [Introduction to Flux](/docs/introduction.md)
-  - [FAQ](/docs/faq.md) and [frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [How it works](/docs/references/blueprint.md)
-  - [Considerations regarding installing Flux](/docs/get-started/index.rst)
-  - [Flux <-> Helm integration](/docs/references/helm-operator-integration.md)
-- Get Started with Flux
-  - [Standalone Flux](/docs/tutorials/get-started.md)
-  - [Flux using Helm](/docs/tutorials/get-started-helm.md)
-  - [Automation: annotations and locks](/docs/tutorials/driving-flux.md)
-- Operating Flux
-  - [Using fluxctl to control Flux](/docs/references/fluxctl.md)
-  - [Helm Operator](/docs/helm-operator/)
-  - [Troubleshooting](/docs/troubleshooting.md)
-  - [Frequently encountered issues](https://github.com/fluxcd/flux/labels/FAQ)
-  - [Upgrading to Flux v1](/docs/guides/upgrading-to-1.0.md)
+Get started [installing Flux](https://docs.fluxcd.io/en/latest/get-started/)
+or just [browse through the documentation](https://docs.fluxcd.io).
 
 ### Integrations
 
@@ -142,7 +112,7 @@ To familiarise yourself with the project and how things work, you might
 be interested in the following:
 
 - [Our contributions guidelines](CONTRIBUTING.md)
-- [Build documentation](/docs/contributing/building.md)
+- [Build documentation](https://docs.fluxcd.io/en/latest/contributing/building.html)
 - [Release documentation](/internal_docs/releasing.md)
 
 ## <a name="help"></a>Getting Help

From 53057678273db0fd7d5b4fba3c08b54eff3d849d Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 12:41:07 +0200
Subject: [PATCH 141/158] Specifically mention Helm operator docs

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index c97cfee26..a394cf02a 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,11 @@ a few popular ones you might want to check out:
 - [GitOps for Istio Canary deployments](https://github.com/stefanprodan/gitops-istio)
 - [Fluxcloud to receive events from Flux](https://github.com/justinbarrick/fluxcloud)
 
+## Get started with the Helm operator
+
+Get started [installing the Helm operator](https://docs.fluxcd.io/en/latest/helm-operator/tutorials/get-started.html)
+or just [browse through the documentation](https://docs.fluxcd.io/en/latest/helm-operator/).
+
 ## Community & Developer information
 
 We welcome all kinds of contributions to Flux, be it code, issues you found,

From f4c3597e442cfaf54b1e6a2aeebe456543cb554a Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Tue, 30 Jul 2019 15:42:59 +0100
Subject: [PATCH 142/158] Correct (my own) spelling of integrations

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e8e812a17..7585c58da 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ install/generated_templates.gogen.go: install/templates/*
 
 check-generated: generate-deploy install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client install/generated_templates.gogen.go
+	git diff --exit-code -- integrations/apis integrations/client install/generated_templates.gogen.go
 
 build-docs:
 	@cd docs && docker build -t flux-docs .

From 04f85497a2725f5891ef80e9bcd5c8a04132cc6d Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Tue, 30 Jul 2019 16:37:32 +0100
Subject: [PATCH 143/158] Align GOPATH and checkout in CI

In general we use go mod(ules), so it doesn't matter where the code is
checked out. But: the script bin/helm/update_codegen.sh puts its
generated files in the location indicated by their package and
GOPATH. So the checkout and that location should be the same.
---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 79507fa32..3aa176b3c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,13 +1,14 @@
 version: 2
 jobs:
   build:
-    working_directory: ~/flux
+    working_directory: /home/circleci/go/src/github.com/weaveworks/flux
     machine:
       image: ubuntu-1604:201903-01
     environment:
       GO_VERSION: 1.12.5
       # We don't need a GOPATH but CircleCI defines it, so we override it
       GOPATH: /home/circleci/go
+      GO111MODULE: 'on'
       PATH: /bin:/usr/bin:/usr/local/go/bin:/home/circleci/go/bin
     steps:
       - checkout

From fad5ff098ae699c8a7c3adb6d8e91417e922c4fa Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 31 Jul 2019 11:22:34 +0100
Subject: [PATCH 144/158] Pin k8s.io dependencies to kubernetes-1.14.4

The way to do this (I eventually figured out) is to use `replace`
lines in go.mod.  Just using `go get <whatever kubernetes-1.14.4`, or
putting the equivalent `require` line in go.mod, will usually result
in the head revision.
---
 go.mod | 23 ++++++++++++++++------
 go.sum | 61 ++++++++++++++++++++++------------------------------------
 2 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/go.mod b/go.mod
index 35be0bf6e..b002e23e7 100644
--- a/go.mod
+++ b/go.mod
@@ -63,10 +63,8 @@ require (
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/weaveworks/promrus v1.2.0 // indirect
 	github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa
-	golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a // indirect
-	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 // indirect
 	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
-	golang.org/x/sys v0.0.0-20190411185658-b44545bcd369
+	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	google.golang.org/api v0.3.2 // indirect
 	google.golang.org/appengine v1.5.0 // indirect
@@ -76,10 +74,23 @@ require (
 	k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
 	k8s.io/helm v2.13.1+incompatible
-	k8s.io/klog v0.3.0
-	k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c // indirect
+	k8s.io/klog v0.3.1
 )
 
 replace github.com/docker/distribution => github.com/2opremio/distribution v0.0.0-20190419185413-6c9727e5e5de
+
+// The following pin these libs to `kubernetes-1.14.4` (by initially
+// giving the version as that tag, and letting go mod fill in its idea of
+// the version).
+// The libs are thereby kept compatible with client-go v11, which is
+// itself compatible with Kubernetes 1.14.
+
+replace (
+	k8s.io/api => k8s.io/api v0.0.0-20190708174958-539a33f6e817
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190708180123-608cd7da68f7
+	k8s.io/client-go => k8s.io/client-go v11.0.0+incompatible
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190708175518-244289f83105
+)
diff --git a/go.sum b/go.sum
index 1e00e682d..20fc9bcc1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -10,7 +11,6 @@ github.com/Azure/go-autorest v11.7.1+incompatible h1:M2YZIajBBVekV86x0rr1443Lc1F
 github.com/Azure/go-autorest v11.7.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
@@ -46,6 +46,7 @@ github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zF
 github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4=
 github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
+github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 h1:llBx5m8Gk0lrAaiLud2wktkX/e8haX7Ru0oVfQqtZQ4=
 github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
 github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
@@ -67,6 +68,7 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -78,8 +80,9 @@ github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q8
 github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
 github.com/gogo/googleapis v1.2.0 h1:Z0v3OJDotX9ZBpdz2V+AI7F4fITSZhVE5mg6GQppwMM=
 github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
-github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -100,6 +103,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
 github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
 github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -127,6 +131,7 @@ github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVo
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0 h1:j30noezaCfvNLcdMYSvHLv81DxYRSt1grlpseG67vhU=
 github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
+github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -149,11 +154,13 @@ github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPU
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/justinbarrick/go-k8s-portforward v1.0.2 h1:unfs10u6NeEfPoQL7J5nyuOyAsZqGqlRV7I7qpr0+AU=
 github.com/justinbarrick/go-k8s-portforward v1.0.2/go.mod h1:klMOboLnC1/UlkyJnYFjcMcbOtwAcKop+LkIZ4r428o=
 github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d h1:xQ/ZtcWCKzWg5QbOhq6RFPvevl+IE580Vm0Vgxuw3xs=
 github.com/justinbarrick/go-k8s-portforward v1.0.4-0.20190722134107-d79fe1b9d79d/go.mod h1:GkvGI25j2iHpJVINl/hZC+sbf9IJ1XkY1MtjSh3Usuk=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -221,7 +228,6 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142 h1:JO6VBMEDSBX/LT4GKwSdvuFigZNwVD4lkPyUE4BDCKE=
 github.com/prometheus/procfs v0.0.0-20190412120340-e22ddced7142/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
@@ -276,19 +282,13 @@ go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a h1:Igim7XhdOpBnWPuYJ70XcNpq8q3BCACtVgNfoJxOV7g=
-golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495 h1:I6A9Ag9FpEKOjcKrRNjQkPHawoXIhKyTGfvvjFAiiAk=
-golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -297,9 +297,8 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
@@ -318,10 +317,8 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 h1:aBlRBZoCuZNRDClvfkDoklQqdLzBaA3uViASg2z2p24=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20180810153555-6e3c4e7365dd/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
@@ -333,19 +330,11 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK81+LvmbvWWEnJhzk1Pi9E=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw=
-gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts=
-gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.3.2 h1:iTp+3yyl/KOtxa/d1/JUE0GGSoR6FuW5udver22iwpw=
 google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
@@ -353,14 +342,17 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180518175338-11a468237815 h1:p3qKkjcSW6m32Lr1CInA3jW53vG29/JB6QOvQWie5WI=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 h1:xtNn7qFlagY2mQNFHMSRPjT2RkOV4OXM7P5TVy9xATo=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM=
 google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0 h1:DlsSIrgEBuZAUFJcta2B5i/lzeHHbnfkNFAfFXLVFYQ=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
@@ -382,31 +374,24 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.0.0-20190313235455-40a48860b5ab h1:DG9A67baNpoeweOy2spF1OWHhnVY5KR7/Ek/+U1lVZc=
-k8s.io/api v0.0.0-20190313235455-40a48860b5ab/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
+k8s.io/api v0.0.0-20190708174958-539a33f6e817 h1:V6YPTc5fSnwv7EBjx6es9VyAki/6bqK4M3ECA6WwfBk=
+k8s.io/api v0.0.0-20190708174958-539a33f6e817/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed h1:rCteec//ELIjZMfjIGQbVtZooyaofqDJwsmWwWKItNs=
 k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
 k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d h1:Jmdtdt1ZnoGfWWIIik61Z7nKYgO3J+swQJtPYsP9wHA=
 k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
 k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
-k8s.io/code-generator v0.0.0-20190511023357-639c964206c2 h1:wfF2JZb8Bl68FNMg/BAkIkkE29Z/bXWBYTtoQh/Cbo0=
-k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
-k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
-k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/code-generator v0.0.0-20190311093542-50b561225d70 h1:lgPp615xLHxN84RBd+viA/oHzJfI0miFYFH4T9wpPQ4=
 k8s.io/helm v2.13.1+incompatible h1:qt0LBsHQ7uxCtS3F2r3XI0DNm8ml0xQeSJixUorDyn0=
 k8s.io/helm v2.13.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
+k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s=
 k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
-k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c h1:kJCzg2vGCzah5icgkKR7O1Dzn0NA2iGlym27sb0ZfGE=
-k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 h1:8r+l4bNWjRlsFYlQJnKJ2p7s1YQPj4XyXiJVqDHRx7c=
 k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
-modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
-modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
-modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
-modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
-modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

From 3e935e8b0866ea8740e18c1cd742aa162181de4b Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 31 Jul 2019 11:38:42 +0100
Subject: [PATCH 145/158] Copy codegen package locally so it can be compiled

The k8s.io/code-generator package version needed to produce code
compatible with client-go@v11 is old enough that it won't work with
`go mod`. To be able to use it, we have to copy it locally and let it
be compiled there.
---
 bin/helm/update_codegen.sh | 22 ++++++++++++++++++----
 go.mod                     |  2 ++
 go.sum                     |  3 +++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bin/helm/update_codegen.sh b/bin/helm/update_codegen.sh
index 5b123e366..db8e75b6d 100755
--- a/bin/helm/update_codegen.sh
+++ b/bin/helm/update_codegen.sh
@@ -4,12 +4,26 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# This corresponds to the tag kubernetes-1.14.4, and to the pinned version in go.mod
+CODEGEN_VERSION="code-generator@v0.0.0-20190311093542-50b561225d70"
 SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/../..
-CODEGEN_PKG=${CODEGEN_PKG:-$(echo `go env GOPATH`'/pkg/mod/k8s.io/code-generator@v0.0.0-20190511023357-639c964206c2')}
 
-go mod download # make sure the code-generator is downloaded
-env GOPATH=`go env GOPATH` bash ${CODEGEN_PKG}/generate-groups.sh all github.com/weaveworks/flux/integrations/client \
+# Chosen to line up with the ./build directory used in the Makefile
+CODEGEN_ROOT=./build/codegen
+# make sure this exists ...
+mkdir -p ./build
+# ... but not this
+rm -rf ${CODEGEN_ROOT}
+
+echo Using codegen in ${CODEGEN_ROOT}
+
+export GO111MODULE=on
+# make sure the codegen module has been fetched
+go mod download
+cp -R $(echo `go env GOPATH`)'/pkg/mod/k8s.io/'${CODEGEN_VERSION} ${CODEGEN_ROOT}
+chmod -R u+w ${CODEGEN_ROOT}
+
+bash "${CODEGEN_ROOT}/generate-groups.sh" all github.com/weaveworks/flux/integrations/client \
               github.com/weaveworks/flux/integrations/apis \
               "flux.weave.works:v1beta1 helm.integrations.flux.weave.works:v1alpha2" \
   --go-header-file "${SCRIPT_ROOT}/bin/helm/custom-boilerplate.go.txt"
-
diff --git a/go.mod b/go.mod
index b002e23e7..e76fb198c 100644
--- a/go.mod
+++ b/go.mod
@@ -74,6 +74,8 @@ require (
 	k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/code-generator v0.0.0-00010101000000-000000000000
+	k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a
 	k8s.io/helm v2.13.1+incompatible
 	k8s.io/klog v0.3.1
 )
diff --git a/go.sum b/go.sum
index 20fc9bcc1..9adf93ce5 100644
--- a/go.sum
+++ b/go.sum
@@ -383,6 +383,9 @@ k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9
 k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
 k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/code-generator v0.0.0-20190311093542-50b561225d70 h1:lgPp615xLHxN84RBd+viA/oHzJfI0miFYFH4T9wpPQ4=
+k8s.io/code-generator v0.0.0-20190311093542-50b561225d70/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
+k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a h1:QoHVuRquf80YZ+/bovwxoMO3Q/A3nt3yTgS0/0nejuk=
+k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/helm v2.13.1+incompatible h1:qt0LBsHQ7uxCtS3F2r3XI0DNm8ml0xQeSJixUorDyn0=
 k8s.io/helm v2.13.1+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=

From 06062d430161d2d2571be24eb6d6b890205776de Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 18:11:59 +0200
Subject: [PATCH 146/158] Typo: 'HelmUpradeFailed' -> 'HelmUpgradeFailed'

---
 integrations/helm/chartsync/chartsync.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integrations/helm/chartsync/chartsync.go b/integrations/helm/chartsync/chartsync.go
index 7aba21236..7845f0179 100644
--- a/integrations/helm/chartsync/chartsync.go
+++ b/integrations/helm/chartsync/chartsync.go
@@ -72,7 +72,7 @@ const (
 	ReasonDownloaded       = "RepoChartInCache"
 	ReasonInstallFailed    = "HelmInstallFailed"
 	ReasonDependencyFailed = "UpdateDependencyFailed"
-	ReasonUpgradeFailed    = "HelmUgradeFailed"
+	ReasonUpgradeFailed    = "HelmUpgradeFailed"
 	ReasonRollbackFailed   = "HelmRollbackFailed"
 	ReasonCloned           = "GitRepoCloned"
 	ReasonSuccess          = "HelmSuccess"

From 9025aa7a0a732550537b14cbd82ba382d55c3147 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 31 Jul 2019 17:34:21 +0200
Subject: [PATCH 147/158] Move successful chart fetch signal to reconcile

As the chart source getter methods are used in other places, e.g.
to compare the values checksums, and the condition update causes
the `LastUpdateTime` to renew.

Given this `LastUpdateTime` timestamp is used to determine if an
upgrade should be hold back for rolled back releases, it would
corrupt the 'state machine' and give a false positive, causing a
infinite loop of rollback-release.
---
 integrations/helm/chartsync/chartsync.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrations/helm/chartsync/chartsync.go b/integrations/helm/chartsync/chartsync.go
index 7845f0179..9553627dc 100644
--- a/integrations/helm/chartsync/chartsync.go
+++ b/integrations/helm/chartsync/chartsync.go
@@ -342,11 +342,13 @@ func (chs *ChartChangeSync) ReconcileReleaseDef(fhr fluxv1beta1.HelmRelease) {
 		if !ok {
 			return
 		}
+		chs.setCondition(fhr, fluxv1beta1.HelmReleaseChartFetched, v1.ConditionTrue, ReasonCloned, "successfully cloned git repo")
 	} else if fhr.Spec.ChartSource.RepoChartSource != nil {
 		chartPath, chartRevision, ok = chs.getRepoChartSource(fhr)
 		if !ok {
 			return
 		}
+		chs.setCondition(fhr, fluxv1beta1.HelmReleaseChartFetched, v1.ConditionTrue, ReasonDownloaded, "chart fetched: "+filepath.Base(chartPath))
 	}
 
 	if rel == nil {
@@ -535,7 +537,6 @@ func (chs *ChartChangeSync) getGitChartSource(fhr v1beta1.HelmRelease) (string,
 		}
 		return chartPath, chartRevision, false
 	}
-	chs.setCondition(fhr, fluxv1beta1.HelmReleaseChartFetched, v1.ConditionTrue, ReasonCloned, "successfully cloned git repo")
 	chartPath = filepath.Join(chartClone.export.Dir(), chartSource.Path)
 	chartRevision = chartClone.head
 
@@ -564,7 +565,6 @@ func (chs *ChartChangeSync) getRepoChartSource(fhr v1beta1.HelmRelease) (string,
 		return chartPath, chartRevision, false
 	}
 
-	chs.setCondition(fhr, fluxv1beta1.HelmReleaseChartFetched, v1.ConditionTrue, ReasonDownloaded, "chart fetched: "+filepath.Base(path))
 	chartPath = path
 	chartRevision = chartSource.Version
 

From cc7c63f8e9faedd5152d34f27fde1258f86a9115 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <mikeb@squaremobius.net>
Date: Wed, 3 Jul 2019 18:04:53 +0100
Subject: [PATCH 148/158] Support both new fluxcd and original annotations

The new prefix for annotations is `fluxcd.io`; but, many files will
use `flux.weave.works`, and we don't want to suddenly not understand
the policies in those.

This commit adds support for interpreting and updating policies as
annotations with either prefix. When updating, if an annotation uses
the old prefix, that will be retained; otherwise, the new prefix is
used.
---
 cluster/kubernetes/policies.go          | 17 +++++++---
 cluster/kubernetes/policies_test.go     | 32 +++++++++---------
 cluster/kubernetes/resource/resource.go | 45 ++++++++++++++++++++-----
 manifests/configaware_test.go           |  2 +-
 4 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/cluster/kubernetes/policies.go b/cluster/kubernetes/policies.go
index 5418035d2..54bee6a14 100644
--- a/cluster/kubernetes/policies.go
+++ b/cluster/kubernetes/policies.go
@@ -3,8 +3,6 @@ package kubernetes
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	kresource "github.com/weaveworks/flux/cluster/kubernetes/resource"
 	"github.com/weaveworks/flux/resource"
 )
@@ -16,11 +14,16 @@ func (m *manifests) UpdateWorkloadPolicies(def []byte, id resource.ID, update re
 	}
 	res, ok := resources[id.String()]
 	if !ok {
-		return nil, errors.New("resource " + id.String() + " not found")
+		return nil, fmt.Errorf("resource %s not found", id.String())
 	}
+
+	// This is the Kubernetes manifests implementation; panic if it's
+	// not returning `KubeManifest`s.
+	kres := res.(kresource.KubeManifest)
+
 	workload, ok := res.(resource.Workload)
 	if !ok {
-		return nil, errors.New("resource " + id.String() + " does not have containers")
+		return nil, fmt.Errorf("resource %s does not have containers", id.String())
 	}
 	if err != nil {
 		return nil, err
@@ -33,7 +36,11 @@ func (m *manifests) UpdateWorkloadPolicies(def []byte, id resource.ID, update re
 
 	var args []string
 	for k, v := range changes {
-		args = append(args, fmt.Sprintf("%s%s=%s", kresource.PolicyPrefix, k, v))
+		annotation, ok := kres.PolicyAnnotationKey(k)
+		if !ok {
+			annotation = fmt.Sprintf("%s%s", kresource.PolicyPrefix, k)
+		}
+		args = append(args, fmt.Sprintf("%s=%s", annotation, v))
 	}
 
 	ns, kind, name := id.Components()
diff --git a/cluster/kubernetes/policies_test.go b/cluster/kubernetes/policies_test.go
index 8d6f509ae..d71db1903 100644
--- a/cluster/kubernetes/policies_test.go
+++ b/cluster/kubernetes/policies_test.go
@@ -23,13 +23,13 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "adding annotation with others existing",
 			in:   []string{"prometheus.io/scrape", "'false'"},
-			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/automated", "'true'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "fluxcd.io/automated", "'true'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
 		},
 		{
-			name: "adding annotation when already has annotation",
+			name: "adding annotation when already has annotation does not change prefix",
 			in:   []string{"flux.weave.works/automated", "'true'"},
 			out:  []string{"flux.weave.works/automated", "'true'"},
 			update: resource.PolicyUpdate{
@@ -45,9 +45,9 @@ func TestUpdatePolicies(t *testing.T) {
 			},
 		},
 		{
-			name: "adding first annotation",
+			name: "adding first annotation (uses new prefix)",
 			in:   nil,
-			out:  []string{"flux.weave.works/automated", "'true'"},
+			out:  []string{"fluxcd.io/automated", "'true'"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.Automated: "true"},
 			},
@@ -55,7 +55,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add and remove different annotations at the same time",
 			in:   []string{"flux.weave.works/automated", "'true'", "prometheus.io/scrape", "'false'"},
-			out:  []string{"prometheus.io/scrape", "'false'", "flux.weave.works/locked", "'true'"},
+			out:  []string{"prometheus.io/scrape", "'false'", "fluxcd.io/locked", "'true'"},
 			update: resource.PolicyUpdate{
 				Add:    policy.Set{policy.Locked: "true"},
 				Remove: policy.Set{policy.Automated: "true"},
@@ -72,7 +72,7 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove annotation with others existing",
-			in:   []string{"flux.weave.works/automated", "true", "prometheus.io/scrape", "false"},
+			in:   []string{"fluxcd.io/automated", "true", "prometheus.io/scrape", "false"},
 			out:  []string{"prometheus.io/scrape", "false"},
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
@@ -80,7 +80,7 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "remove last annotation",
-			in:   []string{"flux.weave.works/automated", "true"},
+			in:   []string{"fluxcd.io/automated", "true"},
 			out:  nil,
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.Automated: "true"},
@@ -104,7 +104,7 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "multiline",
-			in:   []string{"flux.weave.works/locked_msg", "|-\n      first\n      second"},
+			in:   []string{"fluxcd.io/locked_msg", "|-\n      first\n      second"},
 			out:  nil,
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.LockedMsg: "foo"},
@@ -112,7 +112,7 @@ func TestUpdatePolicies(t *testing.T) {
 		},
 		{
 			name: "multiline with empty line",
-			in:   []string{"flux.weave.works/locked_msg", "|-\n      first\n\n      third"},
+			in:   []string{"fluxcd.io/locked_msg", "|-\n      first\n\n      third"},
 			out:  nil,
 			update: resource.PolicyUpdate{
 				Remove: policy.Set{policy.LockedMsg: "foo"},
@@ -121,7 +121,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "glob:*"},
+			out:  []string{"fluxcd.io/tag.nginx", "glob:*"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "glob:*"},
 			},
@@ -129,7 +129,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add non-glob tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "foo"},
+			out:  []string{"fluxcd.io/tag.nginx", "foo"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "foo"},
 			},
@@ -137,7 +137,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add semver tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
+			out:  []string{"fluxcd.io/tag.nginx", "semver:*"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "semver:*"},
 			},
@@ -145,7 +145,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add invalid semver tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
+			out:  []string{"fluxcd.io/tag.nginx", "semver:*"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "semver:invalid"},
 			},
@@ -154,7 +154,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add regexp tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "regexp:(.*?)"},
+			out:  []string{"fluxcd.io/tag.nginx", "regexp:(.*?)"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "regexp:(.*?)"},
 			},
@@ -162,7 +162,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "add invalid regexp tag policy",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "regexp:(.*?)"},
+			out:  []string{"fluxcd.io/tag.nginx", "regexp:(.*?)"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagPrefix("nginx"): "regexp:*"},
 			},
@@ -171,7 +171,7 @@ func TestUpdatePolicies(t *testing.T) {
 		{
 			name: "set tag to all containers",
 			in:   nil,
-			out:  []string{"flux.weave.works/tag.nginx", "semver:*"},
+			out:  []string{"fluxcd.io/tag.nginx", "semver:*"},
 			update: resource.PolicyUpdate{
 				Add: policy.Set{policy.TagAll: "semver:*"},
 			},
diff --git a/cluster/kubernetes/resource/resource.go b/cluster/kubernetes/resource/resource.go
index 2a010dec7..803104274 100644
--- a/cluster/kubernetes/resource/resource.go
+++ b/cluster/kubernetes/resource/resource.go
@@ -11,8 +11,12 @@ import (
 )
 
 const (
-	PolicyPrefix = "flux.weave.works/"
-	ClusterScope = "<cluster>"
+	PolicyPrefix = "fluxcd.io/"
+	// This is the previously-used prefix for annotations; many
+	// manifests in the wild will still be using it, so it's included
+	// here for backward-compatibility.
+	AlternatePolicyPrefix = "flux.weave.works/"
+	ClusterScope          = "<cluster>"
 )
 
 // KubeManifest represents a manifest for a Kubernetes resource. For
@@ -25,6 +29,8 @@ type KubeManifest interface {
 	GetName() string
 	GetNamespace() string
 	SetNamespace(string)
+
+	PolicyAnnotationKey(string) (string, bool)
 }
 
 // -- unmarshaling code for specific object and field types
@@ -87,13 +93,20 @@ func (o *baseObject) debyte() {
 func PoliciesFromAnnotations(annotations map[string]string) policy.Set {
 	set := policy.Set{}
 	for k, v := range annotations {
-		if strings.HasPrefix(k, PolicyPrefix) {
-			p := strings.TrimPrefix(k, PolicyPrefix)
-			if v == "true" {
-				set = set.Add(policy.Policy(p))
-			} else {
-				set = set.Set(policy.Policy(p), v)
-			}
+		var p string
+		switch {
+		case strings.HasPrefix(k, PolicyPrefix):
+			p = strings.TrimPrefix(k, PolicyPrefix)
+		case strings.HasPrefix(k, AlternatePolicyPrefix):
+			p = strings.TrimPrefix(k, AlternatePolicyPrefix)
+		default:
+			continue
+		}
+
+		if v == "true" {
+			set = set.Add(policy.Policy(p))
+		} else {
+			set = set.Set(policy.Policy(p), v)
 		}
 	}
 	return set
@@ -103,6 +116,20 @@ func (o baseObject) Policies() policy.Set {
 	return PoliciesFromAnnotations(o.Meta.Annotations)
 }
 
+// PolicyAnnotationKey returns the key used in this resource to
+// indicate a particular policy; this is to aid in supporting more
+// than one way of using annotations for policy. If the policy is not
+// present, returns `"", false`.
+func (o baseObject) PolicyAnnotationKey(p string) (string, bool) {
+	for _, prefix := range []string{PolicyPrefix, AlternatePolicyPrefix} {
+		key := prefix + p
+		if _, ok := o.Meta.Annotations[key]; ok {
+			return key, true
+		}
+	}
+	return "", false
+}
+
 func (o baseObject) Source() string {
 	return o.source
 }
diff --git a/manifests/configaware_test.go b/manifests/configaware_test.go
index 0c789b44f..585b38c5b 100644
--- a/manifests/configaware_test.go
+++ b/manifests/configaware_test.go
@@ -207,7 +207,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    flux.weave.works/tag.greeter: glob:master-*
+    fluxcd.io/tag.greeter: glob:master-*
   name: helloworld
 spec:
   template:

From 683930313989b19d8e7248a1c468fa7a30bca5bf Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 11:41:40 +0300
Subject: [PATCH 149/158] CircleCI: Add helm chart lint check

---
 .circleci/config.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3aa176b3c..655958142 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,23 @@
 version: 2
 jobs:
+  helm:
+    docker:
+      - image: circleci/golang:1.12
+    steps:
+      - checkout
+      - run:
+          name: Install kubectl
+          command: sudo curl -L https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl && sudo chmod +x /usr/local/bin/kubectl
+      - run:
+          name: Install helm
+          command: sudo curl -L https://storage.googleapis.com/kubernetes-helm/helm-v2.14.2-linux-amd64.tar.gz | tar xz && sudo mv linux-amd64/helm /bin/helm && sudo rm -rf linux-amd64
+      - run:
+          name: Initialize helm
+          command:  helm init --client-only --kubeconfig=$HOME/.kube/kubeconfig
+      - run:
+          name: Lint chart
+          command: |
+            helm lint ./chart/flux
   build:
     working_directory: /home/circleci/go/src/github.com/weaveworks/flux
     machine:
@@ -119,6 +137,7 @@ workflows:
   version: 2
   build-and-push:
     jobs:
+      - helm
       - build:
           filters:
             tags:

From 3f762e074aeeb95e619f85b083ecf59edff37f7e Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 11:45:12 +0300
Subject: [PATCH 150/158] CircleCI: Package chart

---
 .circleci/config.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 655958142..18f515e20 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,16 @@ jobs:
           name: Lint chart
           command: |
             helm lint ./chart/flux
+      - run:
+          name: Lint chart
+          command: |
+            helm lint ./chart/flux
+      - run:
+          name: Package chart
+          command: |
+            mkdir $HOME/chart
+            helm package ./chart/flux --destination $HOME/chart
+            ls $HOME/chart
   build:
     working_directory: /home/circleci/go/src/github.com/weaveworks/flux
     machine:

From 08d5856719325bfb52c5de2ff7ec9d36196d79e5 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 11:53:03 +0300
Subject: [PATCH 151/158] CircleCI: Publish chart to GitHub Pages

---
 .circleci/config.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18f515e20..e69338011 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,16 +18,24 @@ jobs:
           name: Lint chart
           command: |
             helm lint ./chart/flux
-      - run:
-          name: Lint chart
-          command: |
-            helm lint ./chart/flux
       - run:
           name: Package chart
           command: |
             mkdir $HOME/chart
             helm package ./chart/flux --destination $HOME/chart
-            ls $HOME/chart
+      - run:
+          name: Publish chart
+          command: |
+            REPOSITORY="https://fluxcdbot:${GITHUB_TOKEN}@github.com/fluxcd/flux.git"
+            git config user.email fluxcdbot@users.noreply.github.com
+            git config user.name fluxcdbot
+            git remote set-url origin ${REPOSITORY}
+            git checkout gh-pages-test
+            mv $HOME/chart/*.tgz .
+            helm repo index . --url https://fluxcd.github.io/flux
+            git add .
+            git commit -m "Publish Helm chart"
+            git push origin gh-pages-test
   build:
     working_directory: /home/circleci/go/src/github.com/weaveworks/flux
     machine:

From 85c7a32099ba65a86a0919d0693b2e6ec775e85c Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 11:58:11 +0300
Subject: [PATCH 152/158] CircleCI: Publish chart to GitHub Pages on git tag

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e69338011..536f4073c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,6 +26,10 @@ jobs:
       - run:
           name: Publish chart
           command: |
+            if [[ -z $CIRCLE_TAG ]]; then
+              echo "Not a release! Skip chart publish";
+              exit;
+            fi
             REPOSITORY="https://fluxcdbot:${GITHUB_TOKEN}@github.com/fluxcd/flux.git"
             git config user.email fluxcdbot@users.noreply.github.com
             git config user.name fluxcdbot

From 85c0d08244e4a481974882d8e2b3f2ae0ceb0874 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 12:04:15 +0300
Subject: [PATCH 153/158] CircleCI: Publish chart to gh-pages branch

---
 .circleci/config.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 536f4073c..e2ec04d49 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,19 +27,21 @@ jobs:
           name: Publish chart
           command: |
             if [[ -z $CIRCLE_TAG ]]; then
-              echo "Not a release! Skip chart publish";
-              exit;
+              echo "Not a release! Skip chart publish"
+              exit
+            fi
+            if echo "${CIRCLE_TAG}" | grep -Eq "^[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
+              REPOSITORY="https://fluxcdbot:${GITHUB_TOKEN}@github.com/fluxcd/flux.git"
+              git config user.email fluxcdbot@users.noreply.github.com
+              git config user.name fluxcdbot
+              git remote set-url origin ${REPOSITORY}
+              git checkout gh-pages
+              mv $HOME/chart/*.tgz .
+              helm repo index . --url https://fluxcd.github.io/flux
+              git add .
+              git commit -m "Publish Helm chart"
+              git push origin gh-pages
             fi
-            REPOSITORY="https://fluxcdbot:${GITHUB_TOKEN}@github.com/fluxcd/flux.git"
-            git config user.email fluxcdbot@users.noreply.github.com
-            git config user.name fluxcdbot
-            git remote set-url origin ${REPOSITORY}
-            git checkout gh-pages-test
-            mv $HOME/chart/*.tgz .
-            helm repo index . --url https://fluxcd.github.io/flux
-            git add .
-            git commit -m "Publish Helm chart"
-            git push origin gh-pages-test
   build:
     working_directory: /home/circleci/go/src/github.com/weaveworks/flux
     machine:

From 9adc9eddbddbd9fafac7a6620e8814a436b3eb11 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 2 Aug 2019 12:07:33 +0300
Subject: [PATCH 154/158] CircleCI: Publish chart on git tag chart-*

---
 .circleci/config.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2ec04d49..c72f89613 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,11 +26,7 @@ jobs:
       - run:
           name: Publish chart
           command: |
-            if [[ -z $CIRCLE_TAG ]]; then
-              echo "Not a release! Skip chart publish"
-              exit
-            fi
-            if echo "${CIRCLE_TAG}" | grep -Eq "^[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
+            if echo "${CIRCLE_TAG}" | grep -Eq "chart-[0-9]+(\.[0-9]+)*(-[a-z]+)?$"; then
               REPOSITORY="https://fluxcdbot:${GITHUB_TOKEN}@github.com/fluxcd/flux.git"
               git config user.email fluxcdbot@users.noreply.github.com
               git config user.name fluxcdbot
@@ -41,6 +37,8 @@ jobs:
               git add .
               git commit -m "Publish Helm chart"
               git push origin gh-pages
+            else
+              echo "Not a chart release! Skip chart publish"
             fi
   build:
     working_directory: /home/circleci/go/src/github.com/weaveworks/flux

From dc229a3ddb83f915f85af925b4030d25b57510a9 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Mon, 5 Aug 2019 15:13:27 +0200
Subject: [PATCH 155/158] Update Slack information in MAINTAINERS file

---
 MAINTAINERS | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e20bb9d01..3fe8c5fee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,12 +1,12 @@
 The maintainers are generally available in Slack at
-https://weave-community.slack.com/messages/flux/ (obtain an invitation
-at https://slack.weave.works/).
+https://cloud-native.slack.com in #flux (https://cloud-native.slack.com/messages/CLAJ40HV3)
+(obtain an invitation at https://slack.cncf.io/).
 
 In alphabetical order:
 
 Alfonso Acosta, Weaveworks <fons@weave.works> (github: @2opremio, slack: fons)
 Hidde Beydals, Weaveworks <hidde@weave.works> (github: @hiddeco, slack: hidde)
-Justin Barrick, independent <justin.m.barrick@gmail.com> (github: @justinbarrick, slack: Justin Barrick)
-Michael Bridgen, Weaveworks <michael@weave.works> (github: @squaremo, slack: mbridgen)
-Nick Cabatoff, independent <nick.cabatoff@gmail.com> (github: @ncabatoff, slack: Nick Cabatoff)
-Stefan Prodan, Weaveworks <stefan@weave.works> (github: @stefanprodan, slack: stefan)
+Justin Barrick, independent <justin.m.barrick@gmail.com> (github: @justinbarrick)
+Michael Bridgen, Weaveworks <michael@weave.works> (github: @squaremo, slack: Michael Bridgen)
+Nick Cabatoff, independent <nick.cabatoff@gmail.com> (github: @ncabatoff)
+Stefan Prodan, Weaveworks <stefan@weave.works> (github: @stefanprodan, slack: stefanprodan)

From b3a69bcbd1df571446a3b54f4148383a616c07d6 Mon Sep 17 00:00:00 2001
From: Olivier Gerbron <o.gerbron@gmail.com>
Date: Wed, 7 Aug 2019 09:50:59 +0200
Subject: [PATCH 156/158] Added Yusofleet to the production users

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a394cf02a..11adaa8c2 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ container images and config changes are propagated to the cluster.
 - [VSHN](https://vshn.ch)
 - [Walmart Chile](https://www.walmartchile.cl)
 - [Weave Cloud](https://cloud.weave.works)
+- [Yusofleet](https://yusofleet.com)
 
 If you too are using Flux in production; please submit a PR to add your organization to the list!
 

From 2ea14ab5acf1922354e99e5e2d64763d04f2adf0 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 1 Aug 2019 16:22:54 +0200
Subject: [PATCH 157/158] Add changelog entry for Helm operator v0.10.1

---
 CHANGELOG-helmop.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CHANGELOG-helmop.md b/CHANGELOG-helmop.md
index 8fb9fc7d4..4b813444c 100644
--- a/CHANGELOG-helmop.md
+++ b/CHANGELOG-helmop.md
@@ -1,3 +1,37 @@
+## 0.10.1 (2019-08-07)
+
+> **Notice:** this release contains a `HelmRelease`
+> [Custom Resource Definition][helm 0.10.1 crd] fix. Please make sure
+> you patch the CRD in your cluster.
+
+### Bug fixes
+
+ - Fixed `rollback.timeout` definition in the `CustomResourceDefinition`
+   [weaveworks/flux#2251][#2251]
+ - Fixed the merge of values
+   [weaveworks/flux#2292][#2292]
+ - Correct spelling of integrations, and fix `make check-generated`
+   [weaveworks/flux#2312][#2312]
+ - Moved successful chart fetch signal to reconcile action (to prevent
+   an infinite loop due to the `LastUpdateTime` on the condition getting
+   accidentally updated during rollback checks).
+   [weaveworks/flux#2316][#2316]
+ - Fixed typo in `ReasonUpgradeFailed` condition change reason
+   [weaveworks/flux#2317][#2317]
+
+### Thanks
+
+This release was made possible by contributions from @jfrndz, @adrian,
+@stefanprodan, @obiesmans, @chriscorn-takt, @sureshamk, @dholbach,
+@squaremo, and @hiddeco.
+
+[#2251]: https://github.com/fluxcd/flux/pull/2251
+[#2292]: https://github.com/fluxcd/flux/pull/2292
+[#2312]: https://github.com/fluxcd/flux/pull/2312
+[#2316]: https://github.com/fluxcd/flux/pull/2316
+[#2317]: https://github.com/fluxcd/flux/pull/2317
+[helm 0.10.1 crd]: https://github.com/weaveworks/flux/blob/release/helm-0.10.x/deploy-helm/flux-helm-release-crd.yaml
+
 ## 0.10.0 (2019-07-10)
 
 This release brings you [opt-in automated rollback support][rollback docs],

From a8ab114244134c096cfa351cab0b1346d3cef732 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 1 Aug 2019 16:24:04 +0200
Subject: [PATCH 158/158] Update Helm operator manifests to '0.10.1'

---
 chart/flux/values.yaml                                | 2 +-
 deploy-helm/helm-operator-deployment.yaml             | 2 +-
 deploy-helm/weave-cloud-helm-operator-deployment.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
index b80f2ad3a..dab18b280 100644
--- a/chart/flux/values.yaml
+++ b/chart/flux/values.yaml
@@ -22,7 +22,7 @@ helmOperator:
   create: false
   createCRD: false
   repository: docker.io/fluxcd/helm-operator
-  tag: 0.10.0
+  tag: 0.10.1
   pullPolicy: IfNotPresent
   pullSecret:
   # Limit the operator scope to a single namespace
diff --git a/deploy-helm/helm-operator-deployment.yaml b/deploy-helm/helm-operator-deployment.yaml
index 3f3afa1f9..12e53bf6d 100644
--- a/deploy-helm/helm-operator-deployment.yaml
+++ b/deploy-helm/helm-operator-deployment.yaml
@@ -62,7 +62,7 @@ spec:
         # There are no ":latest" images for helm-operator. Find the most recent
         # release or image version at https://hub.docker.com/r/weaveworks/helm-operator/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/helm-operator:0.10.0
+        image: docker.io/fluxcd/helm-operator:0.10.1
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/deploy-helm/weave-cloud-helm-operator-deployment.yaml b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
index e67c064a4..bbe2b4c37 100644
--- a/deploy-helm/weave-cloud-helm-operator-deployment.yaml
+++ b/deploy-helm/weave-cloud-helm-operator-deployment.yaml
@@ -27,7 +27,7 @@ spec:
             secretName: flux-git-deploy
       containers:
         - name: flux-helm-operator
-          image: docker.io/fluxcd/helm-operator:0.10.0
+          image: docker.io/fluxcd/helm-operator:0.10.1
           imagePullPolicy: IfNotPresent
           args:
             - --git-timeout=20s