Bump SPIRE to v1.9.6 (#5130)

Signed-off-by: Agustín Martínez Fayó <[email protected]>
spiffe · May 8, 2024 · 4df15ea · 4df15ea
1 parent 31c847e
commit 4df15ea
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.2
+1.22.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.9.5] - 2024-05-07
+
+### Security
+
+- Updated to Go 1.21.10 to address CVE-2024-24788
+
 ## [1.9.4] - 2023-04-05
 
 ### Security
@@ -65,6 +71,12 @@
 
 - X509-SVIDs issued by the server no longer have the x509UniqueIdentifier attribute as part of the subject (#4862)
 
+## [1.8.11] - 2024-05-07
+
+### Security
+
+- Updated to Go 1.21.10 to address CVE-2024-24788
+
 ## [1.8.10] - 2023-04-05
 
 ### Security

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/spiffe/spire
 
-go 1.22.2
+go 1.22.3
 
 require (
 	cloud.google.com/go/iam v1.1.7

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.9.5"
+	Base = "1.9.6"
 )
 
 var (

diff --git a/pkg/server/datastore/sqlstore/migration.go b/pkg/server/datastore/sqlstore/migration.go
@@ -220,6 +220,8 @@ import (
 // | v1.8.9  |        |                                                                           |
 // |---------|        |                                                                           |
 // | v1.8.10 |        |                                                                           |
+// |---------|        |                                                                           |
+// | v1.8.11 |        |                                                                           |
 // |*********|********|***************************************************************************|
 // | v1.9.0  |        |                                                                           |
 // |---------|        |                                                                           |
@@ -230,6 +232,8 @@ import (
 // | v1.9.3  |        |                                                                           |
 // |---------|        |                                                                           |
 // | v1.9.4  |        |                                                                           |
+// |---------|        |                                                                           |
+// | v1.9.5  |        |                                                                           |
 // ================================================================================================
 
 const (

diff --git a/test/integration/suites/upgrade/versions.txt b/test/integration/suites/upgrade/versions.txt
@@ -9,8 +9,10 @@
 1.8.8
 1.8.9
 1.8.10
+1.8.11
 1.9.0
 1.9.1
 1.9.2
 1.9.3
 1.9.4
+1.9.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,8 +9,10 @@ @@
 .8.8
 .8.9
 .8.10
+.8.11
 .9.0
 .9.1
 .9.2
 .9.3
 .9.4
+.9.5