Merge branch 'issue-28-v4-branch' into 'v4'

Align v4 branch and master

See merge request !37

CHANGELOG

@@ -18,6 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Add the requirement for an explicit image_name to deploy, which breaks previous
    versions that ignored image updates.
 
+## [3.1.2] - 2021-07-15
+### Changed
+ - Surface Cloud NAT variable for minimum number of SNAT tuples, supporting a larger
+   number of outbound connections id required.
+
 ## [3.1.1] - 2021-06-16
 ### Changed
  - Surface the alerting success threshold variable from the monitoring module.

README.md

@@ -20,9 +20,9 @@ the ``gcloud auth application-default`` command output for more information.
 
 ## Versioning
 
-The `master` branch contains the tip of development and corresponds to the `v2`
-branch. The `v1` branch will maintain source compatibility with the initial
-release.
+The `master` branch contains the tip of development and corresponds to the `v4`
+branch. The `v1`, `v2` and `v3` branches will maintain source compatibility with
+the initial release.
 
 ## Ingress style
 There are two supported ingress styles depending on `var.ingress_style` variable.