Merge pull request #457 from IBM/prep-v0.13.13

prepare release
IBM · Mar 28, 2024 · 7b3c478 · 7b3c478
2 parents 1b98479 + 6c4c887
commit 7b3c478
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/go-portieris.yaml b/.github/workflows/go-portieris.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup correct Go version
       uses: actions/setup-go@v2
       with:
-        go-version: '1.19.10'
+        go-version: '1.20.12'
         check-latest: true
 
     - name: alltests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## v-next
 
+## v0.13.13
+
+* start with go=toolset:1.20.12 also for the installer (consistency)
+Note: the build pulls dynamic updates to the builder image currently gets go-toolset:1.20.12-3 which resolves CVE-2024-1394
+
 ## v0.13.12
 
 Released 2024-03-06

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # This first stage of the build uses go-toolset to build the portieris binary creates
 # a simplified operating system image that satisfies vulnerability scanning requirements
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:1.20.12-2 as builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/go-toolset:1.20.12 as builder
 ARG PORTIERIS_VERSION=undefined
 
 # switch to root user as we need to run yum and rpm to ensure packages are up to date
@@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
     -tags containers_image_openpgp -o /opt/app-root/bin/portieris ./cmd/portieris
 RUN go version -m -v /opt/app-root/bin/portieris | (grep dep || true) | awk '{print "{\"Path\": \""$2 "\", \"Version\": \"" $3 "\"}"}' > /deps.jsonl
 
-FROM registry.access.redhat.com/ubi8/go-toolset:1.20.10-3 as installer
+FROM registry.access.redhat.com/ubi8/go-toolset:1.20.12 as installer
 ARG TARGETOS TARGETARCH
 USER root
 RUN yum update -y

diff --git 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.12
+VERSION=v0.13.13
 TAG=$(VERSION)
 GOTAGS='containers_image_openpgp'
 

diff --git a/helm/portieris/Chart.yaml b/helm/portieris/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: portieris
-version: v0.13.12
+version: v0.13.13
 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
@@ -15,7 +15,7 @@ image:
   host: icr.io/portieris
   pullSecret:
   image: portieris
-  tag: v0.13.12
+  tag: v0.13.13
   pullPolicy: Always
 
 service:

diff --git a/scripts/env.sh b/scripts/env.sh
@@ -2,11 +2,9 @@
 export PORTIERIS_PULL_APIKEY=
 export PORTIERIS_TESTIMAGE_APIKEY=
 # charts to test
-export VERSION=v0.13.2
-# image tag to test e.g. prep-v0.13.2
+export VERSION=v0.13.13
+# image tag to test e.g. prep-v0.13.13
 export TAG=
-# uuid of the account holding the VA exemption
-export E2E_ACCOUNT_HEADER=
 
 # name of the secret used to pull portieris made from $REG and $PORTIERIS_PULL_APIKEY
 export PULLSECRET=portieris-test