Merge pull request #3421 from fluxcd/release/1.21.2

Release 1.21.2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,9 +8,21 @@ assignees: ''
 ---
 
 <!--
-Please note that Flux v1 is in maintenance mode: https://github.com/fluxcd/flux/issues/3320
+# ---- NOTICE -----
+
+Flux v1 is in maintenance mode and Flux v2 is getting closer to GA.
+If you want to learn about migrating to Flux v2, please review
+<https://github.com/fluxcd/flux2/discussions/413>.
+
+As it will take longer until we get around to issues and PRs in
+Flux v1, we strongly recommend that you start familiarising yourself
+with Flux v2: <https://toolkit.fluxcd.io/>
+
+This means that new features will only be added after very careful
+consideration, if at all. Refer to the links above for more detail.
+
+# ---- END NOTICE -----
 
-This means that new features will only be added after very careful consideration, if at all. Refer to the issue above for more detail.
 -->
 
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,20 @@
 <!--
-# 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
+# ---- NOTICE -----
+
+Flux v1 is in maintenance mode and Flux v2 is getting closer to GA.
+If you want to learn about migrating to Flux v2, please review
+<https://github.com/fluxcd/flux2/discussions/413>.
+
+As it will take longer until we get around to issues and PRs in
+Flux v1, we strongly recommend that you start familiarising yourself
+with Flux v2: <https://toolkit.fluxcd.io/>
+
+This means that new features will only be added after very careful
+consideration, if at all. Refer to the links above for more detail.
+
+# ---- END NOTICE -----
+
 
 # General contribution criteria
 

CHANGELOG.md

@@ -8,6 +8,45 @@
 > requests](https://github.com/fluxcd/toolkit/discussions) for Flux v2
 > and Toolkit components.
 
+## 1.21.2 (2021-02-16)
+
+This patch release surfaces a notice from https://docs.fluxcd.io/en/latest/
+declaring that "Flux v1 is in maintenance mode" into the Flux v1 stable docs,
+as well as pointing users from as many places as possible to the new Flux v2.
+
+### Fixes
+
+- Update AWS SDK and SOPS [fluxcd/flux#3401][]
+- Set Rollout strategy type: Recreate (Fixes for chart 1.6.2)
+  [fluxcd/flux#3325][]
+
+### Maintenance and documentation
+
+- Point to Flux v2 from docs [fluxcd/flux#3419][], [fluxcd/flux#3423][]
+- Point to new community resources at [fluxcd.io](https://fluxcd.io)
+  [fluxcd/flux#3403][]
+- Update issue/PR templates to mention Flux v2 [fluxcd/flux#3415][],
+  [fluxcd/flux#3414][]
+- Add NetHunt to list of production users [fluxcd/flux#3399][]
+
+### Thanks
+
+Thanks to @nairb774, @ViBiOh, @SvitlanaTsupryk-jul18, @dholbach, @drewfreyling,
+@stefanprodan, @hiddeco, @kingdonb and @squaremo for their contributions to
+this release.
+
+[fluxcd/flux#3423]: https://github.com/fluxcd/flux/pull/3423
+[fluxcd/flux#3419]: https://github.com/fluxcd/flux/pull/3419
+[fluxcd/flux#3416]: https://github.com/fluxcd/flux/pull/3416
+[fluxcd/flux#3415]: https://github.com/fluxcd/flux/pull/3415
+[fluxcd/flux#3414]: https://github.com/fluxcd/flux/pull/3414
+[fluxcd/flux#3403]: https://github.com/fluxcd/flux/pull/3403
+[fluxcd/flux#3401]: https://github.com/fluxcd/flux/pull/3401
+[fluxcd/flux#3400]: https://github.com/fluxcd/flux/pull/3400
+[fluxcd/flux#3399]: https://github.com/fluxcd/flux/pull/3399
+[fluxcd/flux#3358]: https://github.com/fluxcd/flux/pull/3358
+[fluxcd/flux#3325]: https://github.com/fluxcd/flux/pull/3325
+
 ## 1.21.1 (2021-01-06)
 
 ### Fixes

README.md

@@ -94,6 +94,7 @@ container images and config changes are propagated to the cluster.
  - [Frame.io](https://frame.io)
  - [gastromatic](https://www.gastromatic.de/)
  - [Gini](https://gini.net)
+ - [GlobalX](https://globalx.com.au)
  - [Greenpass](https://www.greenpass.com.br/)
  - [happn](https://www.happn.com)
  - [HMCTS](https://www.gov.uk/government/organisations/hm-courts-and-tribunals-service)
@@ -111,15 +112,16 @@ container images and config changes are propagated to the cluster.
  - [Mintel](https://www.mintel.com)
  - [Multicaja S.A](https://www.multicaja.cl)
  - [MyFitnessPal](https://www.myfitnesspal.com)
+ - [NetHunt](https://nethunt.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>
 
+ - [Qordoba](https://qordoba.com)
+ - [Quivr](https://quivr.be)
  - [Rakuten](https://rakuten.com)
  - [RentPath](https://rentpath.com)
  - [Replicated](https://replicated.com)
@@ -204,14 +206,11 @@ be interested in the following:
 ## <a name="help"></a>Getting Help
 
 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)
+- Watch our [featured talks on updates to Flux v2 and the GitOps Toolkit](https://fluxcd.io/community#featured-talks)
+- Join the Flux v2 / GitOps Toolkit [community meetings](https://fluxcd.io/community/#meetings)
 
 If you have further questions about Flux or continuous delivery:
 
@@ -223,4 +222,4 @@ If you have further questions about Flux or continuous delivery:
   [flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
 - [File an issue.](https://github.com/fluxcd/flux/issues/new/choose)
 
-Your feedback is always welcome!
+Your feedback is always welcome!

chart/flux/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.6.1 (2021-02-04)
+
+### Improvements
+
+ - Updated Flux to `1.21.1`
+   [fluxcd/flux#3393](https://github.com/fluxcd/flux/pull/3393)
+
+### Fixes
+
+ - Sets namespace on memcached service
+   [fluxcd/flux#3346](https://github.com/fluxcd/flux/pull/3346)
+
 ## 1.6.0 (2020-11-20)
 
 ### Improvements

chart/flux/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.21.0"
-version: 1.6.0
+appVersion: "1.21.1"
+version: 1.6.1
 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/templates/deployment.yaml

@@ -14,6 +14,8 @@ spec:
     matchLabels:
       app: {{ template "flux.name" . }}
       release: {{ .Release.Name }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       annotations:

deploy/flux-deployment.yaml

@@ -66,7 +66,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://hub.docker.com/r/fluxcd/flux/tags
         # and replace the tag here.
-        image: docker.io/fluxcd/flux:1.21.1
+        image: docker.io/fluxcd/flux:1.21.2
         imagePullPolicy: IfNotPresent
         resources:
           requests:

docs/requirements.txt

@@ -1,4 +1,4 @@
 mkdocs                  == 1.1.2
-mkdocs-material         == 5.2.2
+mkdocs-material         == 6.2.8
 mkdocs-redirects
-pymdown-extensions      == 7.1
+pymdown-extensions      == 8.1.1

docs_theme_override/main.html

@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+{% block announce %}
+
+<p>
+    You are looking at the documentation of Flux v1, which is
+    <a href="https://github.com/fluxcd/flux/issues/3320">in maintenance mode</a>.
+</p>
+
+<p>
+    The Flux community is working with most of its energy on
+    <a href="https://toolkit.fluxcd.io">Flux v2</a> these days which is a more modern
+    approach to GitOps, implements some long-requested features of v1 and is generally
+    more flexible. It will be GA soon.
+</p>
+
+<p>
+    We strongly recommend you familiarise yourself with Flux v2 and start looking at
+    <a href="https://github.com/fluxcd/flux2/discussions/413">your migration path</a>.
+</p>
+
+{% endblock %}

go.mod

@@ -31,7 +31,7 @@ replace github.com/fluxcd/flux/pkg/install => ./pkg/install
 require (
 	github.com/Jeffail/gabs v1.4.0
 	github.com/Masterminds/semver/v3 v3.0.3
-	github.com/aws/aws-sdk-go v1.27.1
+	github.com/aws/aws-sdk-go v1.33.18
 	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
 	github.com/cheggaaa/pb/v3 v3.0.2
 	github.com/docker/distribution v2.7.1+incompatible
@@ -46,23 +46,25 @@ require (
 	github.com/gorilla/mux v1.7.3
 	github.com/gorilla/websocket v1.4.0
 	github.com/imdario/mergo v0.3.8
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 // indirect
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
 	github.com/prometheus/client_golang v1.2.1
 	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
 	github.com/ryanuber/go-glob v1.0.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.5.1
 	github.com/weaveworks/common v0.0.0-20190410110702-87611edc252e
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/whilp/git-urls v0.0.0-20160530060445-31bac0d230fa
 	github.com/xeipuuv/gojsonschema v1.1.0
-	go.mozilla.org/sops/v3 v3.6.0
+	go.mozilla.org/sops/v3 v3.6.1
+	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/sys v0.0.0-20191028164358-195ce5e7f934
+	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.17.11