Skip to content

Commit

Permalink
Merge pull request #43 from phenixblue/prepare-v1.4.1-release
Browse files Browse the repository at this point in the history
Prepare v1.4.1 release
  • Loading branch information
phenixblue authored Jul 18, 2021
2 parents 3461663 + 66824db commit 293244d
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 6 deletions.
32 changes: 31 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,34 @@ ImageSwap v1.4.0 requires some new configuration settings and makes major change

- Bump jinja2 from 2.11.2 to 2.11.3 in /app/imageswap (#28 authored by dependabot)
- Bump urllib3 from 1.26.3 to 1.26.4 in /app/imageswap-init (#26 authored by dependabot)
- Bump urllib3 from 1.26.4 to 1.26.5 in /app/imageswap-init (#25 authored by dependabot)
- Bump urllib3 from 1.26.4 to 1.26.5 in /app/imageswap-init (#25 authored by dependabot)

## 1.4.1

This release adds logic to process maps for library level images differently from images nested under a specific project/organization.

**EXAMPLE:**

```
docker.io:harbor.example.com
docker.io-library:harbor.example.com/library
```

This would be the output for the library vs. non-library images:

`nginx:latest` **->** `harbor.example.com/library/nginx:latest`

`tmobile/magtape:latest` **->** `harbor.example.com/tmobile/magtape:latest`

This is applicable for use cases such as the [Harbor projects image pull-through cache](https://goharbor.io/docs/2.1.0/administration/configure-proxy-cache/)

- See the [maps examples](https://github.com/phenixblue/imageswap-webhook/blob/9e8d9abb9ed9b7e480140e64ff730a4c4eaf716c/README.md#maps-mode) for specific syntax on using the library map
- [Docker documentation for image naming](https://docs.docker.com/registry/introduction/#understanding-image-naming)

### Enhancements

- Add logic to handle maps for library level images (#42)

### Acknowledgements

- Thanks to @fragolinux for the suggestion!
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

IMAGESWAP_VERSION := v1.4.0
IMAGESWAP_VERSION := v1.4.1
IMAGESWAP_INIT_VERSION := v0.0.2

REPO_ROOT := $(CURDIR)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,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.4.0/deploy/install.yaml
$ kubectl apply -f https://raw.githubusercontent.com/phenixblue/imageswap-webhook/v1.4.1/deploy/install.yaml
```

#### This will do the following
Expand Down
2 changes: 1 addition & 1 deletion app/imageswap/imageswap.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def swap_image(container_spec):

def main():

app.logger.info("ImageSwap v1.4.0 Startup")
app.logger.info("ImageSwap v1.4.1 Startup")

app.run(
host="0.0.0.0", port=5000, debug=False, threaded=True, ssl_context=("./tls/cert.pem", "./tls/key.pem",),
Expand Down
2 changes: 1 addition & 1 deletion deploy/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ spec:
mountPath: /mwc
containers:
- name: imageswap
image: thewebroot/imageswap:v1.4.0
image: thewebroot/imageswap:v1.4.1
ports:
- containerPort: 5000
command: ["gunicorn", "imageswap:app", "--config=config.py"]
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/imageswap-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
mountPath: /mwc
containers:
- name: imageswap
image: thewebroot/imageswap:v1.4.0
image: thewebroot/imageswap:v1.4.1
ports:
- containerPort: 5000
command: ["gunicorn", "imageswap:app", "--config=config.py"]
Expand Down

0 comments on commit 293244d

Please sign in to comment.