mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-09-30 04:38:38 -04:00
Bring in changes from release branch (#479)
* Bump version to v2.2.0 * Update changelog * Fix release detection in pipeline * Fix PKI selection in pipeline * Set enforced measurements for AWS * Update default images * Fix release docs * Update mini-con defaults * Fix measurements action * Fix syft env variable naming Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
parent
2b64f31104
commit
011f9c597d
17 changed files with 75 additions and 46 deletions
|
@ -268,7 +268,7 @@ func Default() *Config {
|
|||
IAMProfileControlPlane: "",
|
||||
IAMProfileWorkerNodes: "",
|
||||
Measurements: copyPCRMap(awsPCRs),
|
||||
EnforcedMeasurements: []uint32{}, // TODO: add default values
|
||||
EnforcedMeasurements: []uint32{4, 8, 9, 11, 12, 13, 15},
|
||||
},
|
||||
Azure: &AzureConfig{
|
||||
SubscriptionID: "",
|
||||
|
@ -298,7 +298,7 @@ func Default() *Config {
|
|||
EnforcedMeasurements: []uint32{0, 4, 8, 9, 11, 12, 13, 15},
|
||||
},
|
||||
QEMU: &QEMUConfig{
|
||||
ImageFormat: "qcow2",
|
||||
ImageFormat: "raw",
|
||||
VCPUs: 2,
|
||||
Memory: 2048,
|
||||
MetadataAPIImage: versions.QEMUMetadataImage,
|
||||
|
@ -306,7 +306,7 @@ func Default() *Config {
|
|||
LibvirtContainerImage: versions.LibvirtImage,
|
||||
Measurements: copyPCRMap(qemuPCRs),
|
||||
EnforcedMeasurements: []uint32{4, 8, 9, 11, 12, 13, 15},
|
||||
NVRAM: "testing",
|
||||
NVRAM: "production",
|
||||
},
|
||||
},
|
||||
KubernetesVersion: string(versions.Default),
|
||||
|
|
|
@ -9,6 +9,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
package config
|
||||
|
||||
const (
|
||||
DefaultImageAzure = "/communityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/images/constellation/versions/2.1.0"
|
||||
DefaultImageGCP = "projects/constellation-images/global/images/constellation-v2-1-0"
|
||||
DefaultImageAzure = "/communityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/images/constellation/versions/2.2.0"
|
||||
DefaultImageGCP = "projects/constellation-images/global/images/constellation-v2-2-0"
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue