Merge pull request #2318 from fluxcd/release/helm-0.10.1

Release Helm operator v0.10.1

.circleci/config.yml

@@ -1,13 +1,54 @@
 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
+      - run:
+          name: Package chart
+          command: |
+            mkdir $HOME/chart
+            helm package ./chart/flux --destination $HOME/chart
+      - run:
+          name: Publish chart
+          command: |
+            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
+              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
+            else
+              echo "Not a chart release! Skip chart publish"
+            fi
   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
@@ -21,8 +62,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 || true
+
             sudo apt-get update
             sudo apt-get install -y git rng-tools memcached
             git version
@@ -44,6 +92,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:
@@ -110,6 +159,7 @@ workflows:
   version: 2
   build-and-push:
     jobs:
+      - helm
       - build:
           filters:
             tags:

.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;

.gitignore

@@ -50,3 +50,6 @@ test/bin/kubectl
 test/bin/kustomize
 test/bin/helm
 test/bin/kind
+
+# Docs
+docs/_build

.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: docs/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: docs/requirements.txt

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],

CHANGELOG.md

@@ -1,6 +1,103 @@
 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
+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/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
+[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.

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/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!
@@ -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)).
+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
 
@@ -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/contributing/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/contributing/get-started-developing.md) guide for a walkthrough on developing Flux locally.
 
 ### How to run the test suite
 

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)

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")
 
@@ -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/...)
@@ -32,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:
@@ -124,7 +122,24 @@ $(GOBIN)/helm-operator: $(HELM_OPERATOR_DEPS)
 integration-test: all
 	test/bin/test-flux
 
-check-generated:
+
+
+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 embedded-templates
+
+check-generated: generate-deploy install/generated_templates.gogen.go
 	./bin/helm/update_codegen.sh
-	git diff --exit-code -- integrations/apis intergrations/client
+	git diff --exit-code -- integrations/apis integrations/client install/generated_templates.gogen.go
+
+build-docs:
+	@cd docs && 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