From 10aed8784d2fb52a1f772a4ec7b3f70147027021 Mon Sep 17 00:00:00 2001
From: Stuart Hayton <sjhx@users.noreply.github.com>
Date: Thu, 6 Jan 2022 15:22:17 +0000
Subject: [PATCH] Prep v0.12.2 (#362)

* Prepare v0.12.2

* move to go-toolset:1.16.12

* CHANGELOG
---
 CHANGELOG.md               | 5 +++++
 Dockerfile                 | 2 +-
 Makefile                   | 2 +-
 helm/portieris/Chart.yaml  | 2 +-
 helm/portieris/values.yaml | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e82b93a6..679b59b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 # v-next
 ##
 
+# v0.12.2
+##
+* Resolves CVE-2021-3712
+* Build with go-toolset:1.16.12
+
 # v0.12.1
 ##
 * Resolves CVE-2021-23840
diff --git a/Dockerfile b/Dockerfile
index 516cd975..3564c569 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.15.14-10 as gobuild
+FROM registry.access.redhat.com/ubi8/go-toolset:1.16.12 as gobuild
 # This first stage of the build is purely to build the Golang binary for Portieris
 ARG VERSION=undefined
 # Work within the /opt/app-root/src working directory of the UBI go-toolset image
diff --git a/Makefile b/Makefile
index 2db9e075..933230bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 GOFILES=$(shell find . -type f -name '*.go' -not -path "./code-generator/*")
 GOPACKAGES=$(shell go list ./... | grep -v test/ | grep -v pkg/apis/)
 
-VERSION=v0.12.1
+VERSION=v0.12.2
 TAG=$(VERSION)
 GOTAGS='containers_image_openpgp'
 
diff --git a/helm/portieris/Chart.yaml b/helm/portieris/Chart.yaml
index 3cf66cc5..09121ef0 100644
--- a/helm/portieris/Chart.yaml
+++ b/helm/portieris/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: portieris
-version: v0.12.1
+version: v0.12.2
 description: Admission Controller webhook for enforcing image trust in your cluster
 maintainer:
   - stuart.hayton@uk.ibm.com
diff --git a/helm/portieris/values.yaml b/helm/portieris/values.yaml
index 14273dcf..eeb63349 100644
--- a/helm/portieris/values.yaml
+++ b/helm/portieris/values.yaml
@@ -12,7 +12,7 @@ image:
   host: icr.io/portieris
   pullSecret:
   image: portieris
-  tag: v0.12.1
+  tag: v0.12.2
   pullPolicy: Always
 
 service: