From 2a9bdd12e4f9a3a827b40507d421d2b488499fac Mon Sep 17 00:00:00 2001 From: Joe Searcy Date: Wed, 12 Apr 2023 17:44:02 -0400 Subject: [PATCH 1/2] Prepare v1.5.2 release Signed-off-by: Joe Searcy --- CHANGELOG.md | 22 ++++++++++++++++++++++ Makefile | 4 ++-- README.md | 2 +- app/imageswap/imageswap.py | 2 +- deploy/install.yaml | 4 ++-- deploy/manifests/imageswap-deploy.yaml | 4 ++-- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ba249..38c540e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,3 +156,25 @@ This is primarily a maintenance release with a couple of small enhancements. - Thanks to @jchanam for their work on #76 - Thanks to @howardburgess for suggesting #67 - Thanks to @rainsun for bringing #56 to our attention and supplying logs to help triage the issue + +## 1.5.2 + +This is primarily a maintenance release, but does introduce new MAPS syntax. + +The `replace` feature gives the ability to match a pattern explicitly and replace all of it with a provided pattern. [More info here](https://github.com/phenixblue/imageswap-webhook#replace-image-mapping). + +### Enhancements + +- Bump oauthlib from 3.2.0 to 3.2.1 in /app/imageswap-init (#79) +- Add `replace` feature to maps syntax (#85) +- Bump certifi from 2022.9.14 to 2022.12.7 in /app/imageswap-init (#91) +- Move to `actions/setup-python@v4` in CI (#91) +- Fix detection of `IMAGESWAP_DISABLE_AUTO_MWC` (#88) +- Bump cryptography from 38.0.4 to 39.0.1 in /app/imageswap-init (#92) +- Bump werkzeug from 2.2.2 to 2.2.3 in /app/imageswap (#93) + +### Acknowledgements + +- Thanks to @dependabot for keeping our Dependencies up to date! +- Thanks to @M4C4R for #85 +- Thanks to @howardburgess for #88 diff --git a/Makefile b/Makefile index f38a0bb..09f0481 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ # NOTE: The version for both `imageswap-init` and `imageswap` should be identical for now. # Some effort will need to be put in to be able to distringuish changes to one vs. the other # in CI/Release steps. -IMAGESWAP_VERSION := v1.5.1 -IMAGESWAP_INIT_VERSION := v1.5.1 +IMAGESWAP_VERSION := v1.5.2 +IMAGESWAP_INIT_VERSION := v1.5.2 REPO_ROOT := $(CURDIR) APP_NAME ?= "imageswap.py" diff --git a/README.md b/README.md index a50f236..ffb8470 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ You can use the following command to install ImageSwap from this repo with sane **NOTE:** The quickstart installation is not meant for production use. Please read through the [Cautions](#cautions) sections, and as always, use your best judgement when configuring ImageSwap for production scenarios. ```shell -$ kubectl apply -f https://raw.githubusercontent.com/phenixblue/imageswap-webhook/v1.5.1/deploy/install.yaml +$ kubectl apply -f https://raw.githubusercontent.com/phenixblue/imageswap-webhook/v1.5.2/deploy/install.yaml ``` #### This will do the following diff --git a/app/imageswap/imageswap.py b/app/imageswap/imageswap.py index 1d77134..89e2e31 100755 --- a/app/imageswap/imageswap.py +++ b/app/imageswap/imageswap.py @@ -426,7 +426,7 @@ def swap_image(container_spec): def main(): - app.logger.info("ImageSwap v1.5.1 Startup") + app.logger.info("ImageSwap v1.5.2 Startup") app.run( host="0.0.0.0", diff --git a/deploy/install.yaml b/deploy/install.yaml index 31e9030..7d9fe87 100644 --- a/deploy/install.yaml +++ b/deploy/install.yaml @@ -275,7 +275,7 @@ spec: runAsGroup: 1898 initContainers: - name: imageswap-init - image: thewebroot/imageswap-init:v1.5.1 + image: thewebroot/imageswap-init:v1.5.2 command: [/app/imageswap-init.py] imagePullPolicy: Always securityContext: @@ -299,7 +299,7 @@ spec: mountPath: /mwc containers: - name: imageswap - image: thewebroot/imageswap:v1.5.1 + image: thewebroot/imageswap:v1.5.2 ports: - containerPort: 5000 command: ["gunicorn", "imageswap:app", "--config=config.py"] diff --git a/deploy/manifests/imageswap-deploy.yaml b/deploy/manifests/imageswap-deploy.yaml index d60aa73..da1ad2a 100644 --- a/deploy/manifests/imageswap-deploy.yaml +++ b/deploy/manifests/imageswap-deploy.yaml @@ -22,7 +22,7 @@ spec: runAsGroup: 1898 initContainers: - name: imageswap-init - image: thewebroot/imageswap-init:v1.5.1 + image: thewebroot/imageswap-init:v1.5.2 command: [/app/imageswap-init.py] imagePullPolicy: Always securityContext: @@ -46,7 +46,7 @@ spec: mountPath: /mwc containers: - name: imageswap - image: thewebroot/imageswap:v1.5.1 + image: thewebroot/imageswap:v1.5.2 ports: - containerPort: 5000 command: ["gunicorn", "imageswap:app", "--config=config.py"] From 4a332b380b8cb0de0f58fe23dac8e356ab84435e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 22:21:50 +0000 Subject: [PATCH 2/2] Bump flask from 2.2.2 to 2.2.5 in /app/imageswap Bumps [flask](https://github.com/pallets/flask) from 2.2.2 to 2.2.5. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.2.2...2.2.5) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/imageswap/Pipfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/imageswap/Pipfile.lock b/app/imageswap/Pipfile.lock index 609b5dc..34eed30 100644 --- a/app/imageswap/Pipfile.lock +++ b/app/imageswap/Pipfile.lock @@ -26,11 +26,11 @@ }, "flask": { "hashes": [ - "sha256:642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b", - "sha256:b9c46cc36662a7949f34b52d8ec7bb59c0d74ba08ba6cb9ce9adc1d8676d9526" + "sha256:58107ed83443e86067e41eff4631b058178191a355886f8e479e347fa1285fdf", + "sha256:edee9b0a7ff26621bd5a8c10ff484ae28737a2410d99b0bb9a6850c7fb977aa0" ], "index": "pypi", - "version": "==2.2.2" + "version": "==2.2.5" }, "gunicorn": { "hashes": [ @@ -42,11 +42,11 @@ }, "importlib-metadata": { "hashes": [ - "sha256:7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad", - "sha256:e354bedeb60efa6affdcc8ae121b73544a7aa74156d047311948f6d711cd378d" + "sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed", + "sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705" ], "markers": "python_version < '3.10'", - "version": "==6.0.0" + "version": "==6.6.0" }, "itsdangerous": { "hashes": [ @@ -154,11 +154,11 @@ }, "setuptools": { "hashes": [ - "sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012", - "sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48" + "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b", + "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990" ], "markers": "python_version >= '3.7'", - "version": "==67.3.2" + "version": "==67.7.2" }, "werkzeug": { "hashes": [ @@ -170,11 +170,11 @@ }, "zipp": { "hashes": [ - "sha256:23f70e964bc11a34cef175bc90ba2914e1e4545ea1e3e2f67c079671883f9cb6", - "sha256:e8b2a36ea17df80ffe9e2c4fda3f693c3dad6df1697d3cd3af232db680950b0b" + "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b", + "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556" ], "markers": "python_version >= '3.7'", - "version": "==3.13.0" + "version": "==3.15.0" } }, "develop": {}