Merge pull request from GHSA-m7vp-hqwv-7m5x

Upgrades the Go toolchain to version 1.16.12 Signed-off-by: Andrew Harding <aharding@vmware.com>
spiffe · Jan 7, 2022 · 431de73 · 431de73
1 parent 07058d8
commit 431de73
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml
@@ -3,7 +3,7 @@ on:
   pull_request: {}
   workflow_dispatch: {}
 env:
-  GO_VERSION: 1.16.5
+  GO_VERSION: 1.16.12
 jobs:
   cache-deps:
     runs-on: ubuntu-18.04

diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml
@@ -4,7 +4,7 @@ on:
     tags:
       - 'v[0-9].[0-9]+.[0-9]+'
 env:
-  GO_VERSION: 1.16.5
+  GO_VERSION: 1.16.12
 jobs:
   cache-deps:
     runs-on: ubuntu-18.04

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.16.5
+1.16.12
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.0.3] - 2022-01-07
+
+### Security
+- Fixed CVE-2021-44716
+
 ## [1.0.2] - 2021-09-02
 
 ### Added

diff --git a/pkg/common/version/version.go b/pkg/common/version/version.go
@@ -8,7 +8,7 @@ const (
 	// IMPORTANT: When updating, make sure to reconcile the versions list that
 	// is part of the upgrade integration test. See
 	// test/integration/suites/upgrade/README.md for details.
-	Base = "1.0.2"
+	Base = "1.0.3"
 )
 
 var (

diff --git a/test/integration/suites/upgrade/versions.txt b/test/integration/suites/upgrade/versions.txt
@@ -4,3 +4,4 @@
 0.12.3
 1.0.0
 1.0.1
+1.0.2