Merge pull request #108 from phenixblue/v2.3.3-release

Prepare v2.3.3 release
tmobile · May 26, 2021 · 45f51f4 · 45f51f4
2 parents 19e956c + 1b13bcb
commit 45f51f4
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -116,10 +116,29 @@ This release includes a fix for `CVE-2020-36242` in the Python Cryptography pack
 
 ### Fixes
 
-Bump cryptography from 3.2 to 3.3.2 in /app/imageswap-init (Dependabot)
+Bump [cryptography](https://github.com/pyca/cryptography) from 3.2 to 3.3.2 in /app/imageswap-init (Dependabot)
 
-    Bumps [cryptography](https://github.com/pyca/cryptography) from 3.2 to 3.3.2.
-    - [Release notes](https://github.com/pyca/cryptography/releases)
-    - [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
-    - [Commits](https://github.com/pyca/cryptography/compare/3.2...3.3.2)
+- [Release notes](https://github.com/pyca/cryptography/releases)
+- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
+- [Commits](https://github.com/pyca/cryptography/compare/3.2...3.3.2)
 
+## v2.3.2
+
+Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3. in /app/magtape (ref #99)
+
+- PyPI: https://pypi.org/project/Jinja2/2.11.3/
+- Changes: https://jinja.palletsprojects.com/en/2.11.x/changelog/#version-2-11-3
+
+## v2.3.3
+
+### Enhancements
+
+- Add multi-arch image builds for release workflow, amd64, arm64, and ppc64le to start (#107 authored by @phenixblue)
+- Fix typos in Makefile (#105 authored by @Freakin)
+- Bump urllib3 to 1.26.4 (#101 authored by dependabot)
+
+Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.3 to 1.26.4 in /app/magtape-init
+
+- [Release notes](https://github.com/urllib3/urllib3/releases)
+- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
+- [Commits](https://github.com/urllib3/urllib3/commit/a8913042b676c510e94fc2b097f6b514ae11a537)
diff --git a/Makefile b/Makefile
@@ -16,7 +16,8 @@
 # its contributors may be used to endorse or promote products derived from this
 # software without specific prior written permission.
 
-MAGTAPE_VERSION := v2.3.2
+
+MAGTAPE_VERSION := v2.3.3
 OPA_VERSION := 0.25.2
 KUBE_MGMT_VERSION := 0.11
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ You can use the following command to install MagTape and the example policies fr
 **NOTE:** The `master` branch of this repository is considered a working branch and may not always be in a functioning state. It's best to select a specific tag for a stable version of MagTape
 
 ```
-$ kubectl apply -f https://raw.githubusercontent.com/tmobile/magtape/v2.3.2/deploy/install.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/tmobile/magtape/v2.3.3/deploy/install.yaml
 ```
 
 #### This will do the following

diff --git a/app/magtape/magtape.py b/app/magtape/magtape.py
@@ -41,7 +41,7 @@
 metrics = PrometheusMetrics(app, defaults_prefix="magtape")
 
 # Static information as metric
-metrics.info("app_info", "Application info", version="v2.3.2")
+metrics.info("app_info", "Application info", version="v2.3.3")
 
 # Set logging config
 log = logging.getLogger("werkzeug")

diff --git a/deploy/install.yaml b/deploy/install.yaml
@@ -337,7 +337,7 @@ spec:
         runAsGroup: 1900
       initContainers:
         - name: magtape-init
-          image: tmobile/magtape-init:v2.3.2
+          image: tmobile/magtape-init:v2.3.3
           command: [/app/magtape-init.py]
           imagePullPolicy: Always
           securityContext:
@@ -361,7 +361,7 @@ spec:
             mountPath: /vwc
       containers:
       - name: magtape
-        image: tmobile/magtape:v2.3.2
+        image: tmobile/magtape:v2.3.3
         ports:
         - containerPort: 5000
         command: ["gunicorn", "magtape:app", "--config=config.py"]

diff --git a/deploy/manifests/magtape-deploy.yaml b/deploy/manifests/magtape-deploy.yaml
@@ -21,7 +21,7 @@ spec:
         runAsGroup: 1900
       initContainers:
         - name: magtape-init
-          image: tmobile/magtape-init:v2.3.2
+          image: tmobile/magtape-init:v2.3.3
           command: [/app/magtape-init.py]
           imagePullPolicy: Always
           securityContext:
@@ -45,7 +45,7 @@ spec:
             mountPath: /vwc
       containers:
       - name: magtape
-        image: tmobile/magtape:v2.3.2
+        image: tmobile/magtape:v2.3.3
         ports:
         - containerPort: 5000
         command: ["gunicorn", "magtape:app", "--config=config.py"]