Merge pull request #3393 from fluxcd/release/1.21.1

Release/1.21.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,13 @@ assignees: ''
 
 ---
 
+<!--
+Please note that Flux v1 is in maintenance mode: https://github.com/fluxcd/flux/issues/3320
+
+This means that new features will only be added after very careful consideration, if at all. Refer to the issue above for more detail.
+-->
+
+
 **Describe the bug**
 
 A clear and concise description of what the bug is.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,11 @@
 <!--
+# Notice
+Flux is in maintenance mode, and it will take a bit
+longer until we get around to issues and PRs.
+
+For more information, and details about Flux's future,
+see: https://github.com/fluxcd/flux/issues/3320
+
 # General contribution criteria
 
 Please have a look at our contribution guidelines: https://github.com/fluxcd/flux/blob/master/CONTRIBUTING.md

.github/workflows/ci.yaml

@@ -22,7 +22,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.14.x
+ go-version: 1.15.x
  - name: Run tests
  run: make test TEST_FLAGS="-race -tags integration -timeout 5m"
  - name: Check codegen
@@ -46,7 +46,7 @@ jobs:
  test: ['10_* 11_* 12_*', '13_* 14_*', '15_* 16_* 17_*', '20_* 21_* 22_*']
  steps:
  - uses: actions/checkout@v2
- - uses: engineerd/setup-kind@v0.3.0
+ - uses: engineerd/setup-kind@v0.5.0
  - name: Restore Go cache
  uses: actions/cache@v1
  with:
@@ -55,9 +55,9 @@ jobs:
  restore-keys: |
  ${{ runner.os }}-go-
  - name: Setup Go
- uses: actions/setup-go@v2-beta
+ uses: actions/setup-go@v2
  with:
- go-version: 1.14.x
+ go-version: 1.15.x
  - name: Download cache
  uses: actions/download-artifact@v1
  with:

.github/workflows/fossa.yml

@@ -13,15 +13,13 @@ jobs:
  - uses: actions/setup-go@v2
  with:
  go-version: "^1.14.x"
- - run: go version
- # Runs a set of commands to initialize and analyze with FOSSA
- - name: run FOSSA analysis
- env:
+ - name: Add GOPATH to GITHUB_ENV
+ run: echo "GOPATH=$(go env GOPATH)" >>"$GITHUB_ENV"
+ - name: Add GOPATH to GITHUB_PATH
+ run: echo "$GOPATH/bin" >>"$GITHUB_PATH"
+ - name: Run FOSSA scan and upload build data
+ uses: fossa-contrib/fossa-action@v1
+ with:
  # FOSSA Push-Only API Token
- FOSSA_API_KEY: '5ee8bf422db1471e0bcf2bcb289185de'
- run: |
- export GOPATH=$HOME/go
- export PATH=$PATH:$(go env GOPATH)/bin
- curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash
- fossa init
- fossa analyze
+ fossa-api-key: 5ee8bf422db1471e0bcf2bcb289185de
+ github-token: ${{ github.token }}

CHANGELOG.md

@@ -8,6 +8,61 @@
 > requests](https://github.com/fluxcd/toolkit/discussions) for Flux v2
 > and Toolkit components.
 
+## 1.21.1 (2021-01-06)
+
+### Fixes
+
+- Fix shell completion [fluxcd/flux#3355][]
+- Optional command timeout field in .flux.yaml [fluxcd/flux#3228][]
+
+### Maintenance and documentation
+
+- Add to list of production users [fluxcd/flux#3386][],
+ [fluxcd/flux#3247][], [fluxcd/flux#3360][], [fluxcd/flux#3290][],
+ [fluxcd/flux#3315][], [fluxcd/flux#3280][]
+- Let productions users table reflow better [fluxcd/flux#3376][]
+- Upgrade json-patch to v4.9.0 [fluxcd/flux#3373][]
+- snap: move to core20 [fluxcd/flux#3371][]
+- snap: update build to use go 1.15 [fluxcd/flux#3345][]
+- Update engineerd/setup-kind to v0.5.0 [fluxcd/flux#3364][]
+- Use fossa-contrib/fossa-action instead [fluxcd/flux#3331][]
+- Fixup configmap in Git GPG documentation [fluxcd/flux#3311][]
+- Add maintenance note to GitHub templates and README
+ [fluxcd/flux#3321][], [fluxcd/flux#3333][]
+- Move Fons to maintainer emeritus [fluxcd/flux#3319][]
+- Point to Flagger website [fluxcd/flux#3391][]
+- Specific documentation for HelmRelease Automation
+ [fluxcd/flux#3144][]
+
+### Thanks
+
+Thanks to @SimonyanG, @alanjcastonguay, @alisondy, @austinbv,
+@daniswoop, @demon, @dholbach, @douglasquintanilha, @gaffneyd4,
+@joaovitor, @kingdonb, @lalyos, @marshallford, @mcanaves, @mewzherder,
+@smorimoto, @squaremo and @stefansedich for their contributions to
+this release.
+
+[fluxcd/flux#3391]: https://github.com/fluxcd/flux/pull/3391
+[fluxcd/flux#3386]: https://github.com/fluxcd/flux/pull/3386
+[fluxcd/flux#3376]: https://github.com/fluxcd/flux/pull/3376
+[fluxcd/flux#3373]: https://github.com/fluxcd/flux/pull/3373
+[fluxcd/flux#3371]: https://github.com/fluxcd/flux/pull/3371
+[fluxcd/flux#3364]: https://github.com/fluxcd/flux/pull/3364
+[fluxcd/flux#3360]: https://github.com/fluxcd/flux/pull/3360
+[fluxcd/flux#3355]: https://github.com/fluxcd/flux/pull/3355
+[fluxcd/flux#3345]: https://github.com/fluxcd/flux/pull/3345
+[fluxcd/flux#3333]: https://github.com/fluxcd/flux/pull/3333
+[fluxcd/flux#3331]: https://github.com/fluxcd/flux/pull/3331
+[fluxcd/flux#3321]: https://github.com/fluxcd/flux/pull/3321
+[fluxcd/flux#3319]: https://github.com/fluxcd/flux/pull/3319
+[fluxcd/flux#3315]: https://github.com/fluxcd/flux/pull/3315
+[fluxcd/flux#3311]: https://github.com/fluxcd/flux/pull/3311
+[fluxcd/flux#3290]: https://github.com/fluxcd/flux/pull/3290
+[fluxcd/flux#3280]: https://github.com/fluxcd/flux/pull/3280
+[fluxcd/flux#3247]: https://github.com/fluxcd/flux/pull/3247
+[fluxcd/flux#3228]: https://github.com/fluxcd/flux/pull/3228
+[fluxcd/flux#3144]: https://github.com/fluxcd/flux/pull/3144
+
 ## 1.21.0 (2020-10-01)
 
 This minor version release updates the versions of `kubectl` and

MAINTAINERS

@@ -4,13 +4,13 @@ https://cloud-native.slack.com in #flux (https://cloud-native.slack.com/messages
 
 In alphabetical order:
 
-Alfonso Acosta, Weaveworks <[email protected]> (github: @2opremio, slack: fons)
 Hidde Beydals, Weaveworks <[email protected]> (github: @hiddeco, slack: hidde)
 Michael Bridgen, Weaveworks <[email protected]> (github: @squaremo, slack: Michael Bridgen)
 Stefan Prodan, Weaveworks <[email protected]> (github: @stefanprodan, slack: stefanprodan)
 
 Retired maintainers:
 
+- Alfonso Acosta
 - Nick Cabatoff
 - Justin Barrick
 

README.md

@@ -11,6 +11,8 @@
 > of GitOps: the [GitOps Toolkit](https://toolkit.fluxcd.io/). In
 > consequence, we do not now plan to integrate GitOps Engine into
 > Flux.
+>
+> :warning: This also means that **[Flux v1 is in maintenance mode](https://github.com/fluxcd/flux/issues/3320)**.
 
 We believe in GitOps:
 
@@ -55,33 +57,96 @@ container images and config changes are propagated to the cluster.
 
 ### Who is using Flux in production
 
-| | | |
-| -- | --- | --- |
-[ABA English](https://www.abaenglish.com)|[Alea Play Solutions](http://www.alea.com)|[Apester](https://apester.com)
-[APPUiO](https://appuio.ch)|[ArangoDB Oasis](https://arangodb.com/managed-service)|[Avisi](https://avisi.nl)
-[B3i](https://b3i.tech/)|[Babylon Health](https://www.babylonhealth.com/)|[bimspot](https://bimspot.io)
-[Bink](https://bink.com)|[BlaBlaCar](https://www.blablacar.com/)|[blackmirror media](https://blackmirror.media)
-[Canva](https://www.canva.com/)|[Carrot](https://carrot.com)|[Chattigo](https://chattigo.com)
-[Cloudlets](https://cloudlets.io)|[Cloudogu GmbH](https://cloudogu.com)|[CLVR Cloud Ltd](https://clvr.cloud)
-[College of William & Mary](https://www.wm.edu)|[Consorcio Chile](https://www.consorcio.cl)|[Control Plane](https://control-plane.io)
-[CrowdRiff](https://crowdriff.com)|[Cybrary](https://cybrary.it)|[Duedil](https://www.duedil.com/)
-[Enliven Systems](https://enliven.systems)|[FELFEL](https://felfel.ch/)|[FireHydrant](https://firehydrant.io)
-[Frame.io](https://frame.io)|[gastromatic](https://www.gastromatic.de/)|[Gini](https://gini.net)
-[Greenpass](https://www.greenpass.com.br/)|[happn](https://www.happn.com)|[HMCTS](https://www.gov.uk/government/organisations/hm-courts-and-tribunals-service)
-[IBM Cloudant](https://www.ibm.com/cloud/cloudant)|[Improwised Technologies](https://www.improwised.com/)|[Infabode](https://infabode.com)
-[iQmetrix](https://www.iqmetrix.com)|[karriere tutor GmbH](https://www.karrieretutor.de)|[Limejump](https://limejump.com)
-[loveholidays](https://www.loveholidays.com/)|[LUNAR](https://www.lunarway.com/)|[MediaMarktSaturn](https://www.mediamarktsaturn.com)
-[Mettle](https://mettle.co.uk)|[Mintel](https://www.mintel.com)|[Multicaja S.A](https://www.multicaja.cl)
-[Okteto Cloud](https://okteto.com/)|[Omise](https://www.omise.co)|[Payout](https://payout.one)
-[Plex Systems](https://www.plex.com/)|[Qordoba](https://qordoba.com)|[Quivr](https://quivr.be)
-[Rakuten](https://rakuten.com)|[RentPath](https://rentpath.com)|[Replicated](https://replicated.com)
-[Resulta](https://resulta.com)|[Rungway](https://rungway.com)|[Sage AI Labs](https://www.sage.com)
-[Sngular](https://www.sngular.com)|[Starbucks](https://www.starbucks.com/)|[SupplyStack](https://www.supplystack.com/)
-[Talend](https://www.talend.com)|[Troii](https://troii.com/)|[UK Hydrographic Office](https://www.gov.uk/government/organisations/uk-hydrographic-office)
-[Under Armour](https://www.underarmour.com)|[VSHN](https://vshn.ch)|[Walmart Chile](https://www.walmartchile.cl)
-[Weave Cloud](https://cloud.weave.works)|[Workable](https://www.workable.com)|[Workarea](https://www.workarea.com)
-[Working Group Two](https://wgtwo.com)|[Yad2](https://yad2.co.il)|[Yusofleet](https://yusofleet.com)
-[Zaaksysteem](https://zaaksysteem.nl)|[Zwift](https://zwift.com)|
+<table><tr valign="top">
+<td>
+
+ - [ABA English](https://www.abaenglish.com)
+ - [Alea Play Solutions](http://www.alea.com)
+ - [Apester](https://apester.com)
+ - [APPUiO](https://appuio.ch)
+ - [ArangoDB Oasis](https://arangodb.com/managed-service)
+ - [Avisi](https://avisi.nl)
+ - [B3i](https://b3i.tech/)
+ - [Babylon Health](https://www.babylonhealth.com/)
+ - [Belvo](https://belvo.com/)
+ - [bimspot](https://bimspot.io)
+ - [Bink](https://bink.com)
+ - [BlaBlaCar](https://www.blablacar.com/)
+ - [blackmirror media](https://blackmirror.media)
+ - [Canva](https://www.canva.com/)
+ - [Carrot](https://carrot.com)
+ - [Chattigo](https://chattigo.com)
+ - [Cloudlets](https://cloudlets.io)
+ - [Cloudogu GmbH](https://cloudogu.com)
+ - [CLVR Cloud Ltd](https://clvr.cloud)
+ - [College of William & Mary](https://www.wm.edu)
+ - [Consorcio Chile](https://www.consorcio.cl)
+ - [Control Plane](https://control-plane.io)
+ - [CrowdRiff](https://crowdriff.com)
+ - [Cybrary](https://cybrary.it)
+ - [Duedil](https://www.duedil.com/)
+ - [Enliven Systems](https://enliven.systems)
+ - [FELFEL](https://felfel.ch/)
+
+</td><td>
+
+ - [FireHydrant](https://firehydrant.io)
+ - [Frame.io](https://frame.io)
+ - [gastromatic](https://www.gastromatic.de/)
+ - [Gini](https://gini.net)
+ - [Greenpass](https://www.greenpass.com.br/)
+ - [happn](https://www.happn.com)
+ - [HMCTS](https://www.gov.uk/government/organisations/hm-courts-and-tribunals-service)
+ - [IBM Cloudant](https://www.ibm.com/cloud/cloudant)
+ - [Improwised Technologies](https://www.improwised.com/)
+ - [Infabode](https://infabode.com)
+ - [iQmetrix](https://www.iqmetrix.com)
+ - [karriere tutor GmbH](https://www.karrieretutor.de)
+ - [Limejump](https://limejump.com)
+ - [loveholidays](https://www.loveholidays.com/)
+ - [Luma Health](https://lumahealth.io/)
+ - [LUNAR](https://www.lunarway.com/)
+ - [MediaMarktSaturn](https://www.mediamarktsaturn.com)
+ - [Mettle](https://mettle.co.uk)
+ - [Mintel](https://www.mintel.com)
+ - [Multicaja S.A](https://www.multicaja.cl)
+ - [MyFitnessPal](https://www.myfitnesspal.com)
+ - [Okteto Cloud](https://okteto.com/)
+ - [Omise](https://www.omise.co)
+ - [Payout](https://payout.one)
+ - [Plex Systems](https://www.plex.com/)
+ - [Qordoba](https://qordoba.com)
+ - [Quivr](https://quivr.be)
+
+</td><td>
+
+ - [Rakuten](https://rakuten.com)
+ - [RentPath](https://rentpath.com)
+ - [Replicated](https://replicated.com)
+ - [Resulta](https://resulta.com)
+ - [Rungway](https://rungway.com)
+ - [Sage AI Labs](https://www.sage.com)
+ - [Sngular](https://www.sngular.com)
+ - [Starbucks](https://www.starbucks.com/)
+ - [SupplyStack](https://www.supplystack.com/)
+ - [Swoop](https://www.swoopfunding.com)
+ - [Talend](https://www.talend.com)
+ - [Troii](https://troii.com/)
+ - [UK Hydrographic Office](https://www.gov.uk/government/organisations/uk-hydrographic-office)
+ - [Under Armour](https://www.underarmour.com)
+ - [VSHN](https://vshn.ch)
+ - [Walmart Chile](https://www.walmartchile.cl)
+ - [Weave Cloud](https://cloud.weave.works)
+ - [Wildlife Studios](https://wildlifestudios.com)
+ - [Workable](https://www.workable.com)
+ - [Workarea](https://www.workarea.com)
+ - [Working Group Two](https://wgtwo.com)
+ - [Yad2](https://yad2.co.il)
+ - [Yusofleet](https://yusofleet.com)
+ - [Zaaksysteem](https://zaaksysteem.nl)
+ - [Zwift](https://zwift.com)
+
+</td></tr></table>
 
 If you too are using Flux in production; please submit a PR to add your organization to the list!
 
@@ -138,7 +203,17 @@ be interested in the following:
 
 ## <a name="help"></a>Getting Help
 
-If you have any questions about Flux and continuous delivery:
+Reminder that Flux v1 is in maintenance mode. If you have any questions about Flux v2 and future migrations, these are the best ways to stay informed:
+- Read about the [GitOps Toolkit](https://toolkit.fluxcd.io/) (Flux v2 is built on the GitOps Toolkit).
+- Ask questions and add suggestions in our [GitOps Toolkit Discussions](https://github.com/fluxcd/toolkit/discussions)
+
+- Watch our [featured talks on updates to Flux v2 and the GitOps Toolkit](https://github.com/fluxcd/toolkit#featured-talks)
+- Join the next talk and Q&A about Flux v2 on [Dec 14, 10:00 am PT / 18:00 GMT](https://www.meetup.com/GitOps-Community/events/274924513/)
+
+- Join the [flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
+- Join the Flux v2 / GitOps Toolkit [community meetings](https://github.com/fluxcd/flux2#community)
+
+If you have further questions about Flux or continuous delivery:
 
 - Read [the Flux docs](https://docs.fluxcd.io).
 - Invite yourself to the <a href="https://slack.cncf.io" target="_blank">CNCF community</a>
@@ -149,4 +224,3 @@ If you have any questions about Flux and continuous delivery:
 - [File an issue.](https://github.com/fluxcd/flux/issues/new/choose)
 
 Your feedback is always welcome!
-

chart/flux/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.6.0 (2020-11-20)
+
+### Improvements
+
+ - Updated Flux to `1.21.0`
+ [fluxcd/flux#3314](https://github.com/fluxcd/flux/pull/3314)
+ - Allow envFrom entries in values.yaml
+ [fluxcd/flux#3109](https://github.com/fluxcd/flux/pull/3109)
+
+### Fixes
+
+ - Fix order of hostAliases vs extraContainers
+ [fluxcd/flux#3367](https://github.com/fluxcd/flux/pull/3367)
+
 ## 1.5.0 (2020-08-20)
 
 ### Improvements

chart/flux/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.20.2"
-version: 1.5.0
+appVersion: "1.21.0"
+version: 1.6.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

chart/flux/README.md

@@ -245,6 +245,7 @@ The following tables lists the configurable parameters of the Flux chart and the
 | `dnsConfig` | `` | Pod DNS config
 | `token` | `None` | Weave Cloud service token
 | `extraEnvs` | `[]` | Extra environment variables for the Flux pod(s)
+| `extraEnvsFrom` | `[]` | Extra environment variables from a list of sources for the Flux pod(s)
 | `env.secretName` | `` | Name of the secret that contains environment variables which should be defined in the Flux container (using `envFrom`)
 | `rbac.create` | `true` | If `true`, create and use RBAC resources
 | `rbac.pspEnabled` | `false` | If `true`, create and use a restricted pod security policy for Flux pod(s)