From 49abd3b2f31d5f013156d49a847e2d91aa51cc5d Mon Sep 17 00:00:00 2001
From: Michael Hough <michaelh@uk.ibm.com>
Date: Mon, 19 Aug 2024 12:31:01 +0100
Subject: [PATCH] Prep release v0.13.18

Signed-off-by: Michael Hough <michaelh@uk.ibm.com>
---
 .secrets.baseline          | 4 ++--
 CHANGELOG.md               | 8 +++++++-
 Makefile                   | 2 +-
 helm/portieris/Chart.yaml  | 2 +-
 helm/portieris/values.yaml | 2 +-
 scripts/env.sh             | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 3f7fda78..2e118319 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.*|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-05-01T16:13:08Z",
+  "generated_at": "2024-08-19T17:46:31Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -1170,7 +1170,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.56.dss",
+  "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,
     "hash": null
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63680ac1..5ca06d61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,12 +13,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v-next
 
+## v0.13.18
+
+Released: 2024-08-20
+
+* Remediates CVE-2024-41110 in github.com/docker/docker
+
 ## v0.13.17
 
 Released: 2024-07-15
 
 * Remediates NIST-CVE-2024-6104 in github.com/hashicorp/go-retryablehttp
-* Remediates CVE-2024-24789, CVE-2024-24790 using go-toolset:1.21.11 
+* Remediates CVE-2024-24789, CVE-2024-24790 using go-toolset:1.21.11
 
 
 ## v0.13.16
diff --git a/Makefile b/Makefile
index 87f3f1de..326e31a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 GOFILES=$(shell find . -type f -name '*.go' -not -path "./code-generator/*" -not -path "./pkg/apis/*")
 GOPACKAGES=$(shell go list ./... | grep -v test/ | grep -v pkg/apis/)
 
-VERSION=v0.13.17
+VERSION=v0.13.18
 TAG=$(VERSION)
 GOTAGS='containers_image_openpgp'
 
diff --git a/helm/portieris/Chart.yaml b/helm/portieris/Chart.yaml
index bd9edb3b..86c45f6b 100644
--- a/helm/portieris/Chart.yaml
+++ b/helm/portieris/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: portieris
-version: v0.13.17
+version: v0.13.18
 description: Admission Controller webhook for enforcing image trust in your cluster
 maintainers:
   - name: Stuart Hayton
diff --git a/helm/portieris/values.yaml b/helm/portieris/values.yaml
index 09da51a0..ee3a68a8 100644
--- a/helm/portieris/values.yaml
+++ b/helm/portieris/values.yaml
@@ -15,7 +15,7 @@ image:
   host: icr.io/portieris
   pullSecret:
   image: portieris
-  tag: v0.13.17
+  tag: v0.13.18
   pullPolicy: Always
 
 service:
diff --git a/scripts/env.sh b/scripts/env.sh
index 5e314fe6..e5c69a18 100644
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -2,8 +2,8 @@
 export PORTIERIS_PULL_APIKEY=
 export PORTIERIS_TESTIMAGE_APIKEY=
 # charts to test
-export VERSION=v0.13.15
-# image tag to test e.g. prep-v0.13.15
+export VERSION=v0.13.18
+# image tag to test e.g. prep-v0.13.18
 export TAG=
 
 # name of the secret used to pull portieris made from $REG and $PORTIERIS_PULL_APIKEY