Bring main branch up-to-date after v1.5.4 release (#3765)

- Bump versions in code and integration test
- Bring CHANGELOG.md changes for v1.5.4 release

Signed-off-by: Ryan Turner <[email protected]>

Author: rturner3

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.5.4] - 2023-01-12
+
+### Added
+
+- Support to run SPIRE as a Windows service (#3625)
+- Configure admin SPIFFE IDs from federated trust domains (#3642)
+- New selectors in the `aws_iid` NodeAttestor plugin (#3640)
+- Support for additional upstream root certificates to the `awssecret` UpstreamAuthority plugin (#3578)
+- Serial number and revision number to SVID minting logging (#3699)
+- `spire-server federation` CLI commands now support the `-output` flag (#3660)
+
+### Fixed
+
+- Service configurations provided by the gRPC resolver are now ignored by SPIRE Agent (#3712)
+- CLI commands that supported the `-output` flag now properly shows the default value for the flag (#3713)
+
 ## [1.5.3] - 2022-12-14
 
 ### Added

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

pkg/server/datastore/sqlstore/migration.go

@@ -157,6 +157,7 @@ import (
 // | v1.5.1  |        |                                                                           |
 // | v1.5.2  |        |                                                                           |
 // | v1.5.3  |        |                                                                           |
+// | v1.5.4  |        |                                                                           |
 // ================================================================================================
 
 const (

test/integration/suites/upgrade/versions.txt

@@ -8,3 +8,4 @@
 1.5.1
 1.5.2
 1.5.3
+1.5.4