Update mini-con defaults

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-11-08 16:19:55 +01:00
parent b0379eb766
commit 497d75b0e3
No known key found for this signature in database
GPG key ID: 7DD3015F3DDE4B9C
4 changed files with 5 additions and 5 deletions

View file

@ -28,7 +28,7 @@ func newMiniDownCmd() *cobra.Command {
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
RunE: runDown, RunE: runDown,
} }
cmd.Flags().BoolP("yes", "y", false, "terminate the cluster without further confirmation")
return cmd return cmd
} }

View file

@ -189,7 +189,7 @@ func prepareConfig(cmd *cobra.Command, fileHandler file.Handler) (*config.Config
} }
// download image to current directory if it doesn't exist // download image to current directory if it doesn't exist
const imagePath = "./constellation.qcow2" const imagePath = "./constellation.raw"
if _, err := os.Stat(imagePath); err == nil { if _, err := os.Stat(imagePath); err == nil {
cmd.Printf("Using existing image at %s\n\n", imagePath) cmd.Printf("Using existing image at %s\n\n", imagePath)
} else if errors.Is(err, os.ErrNotExist) { } else if errors.Is(err, os.ErrNotExist) {

View file

@ -298,7 +298,7 @@ func Default() *Config {
EnforcedMeasurements: []uint32{0, 4, 8, 9, 11, 12, 13, 15}, EnforcedMeasurements: []uint32{0, 4, 8, 9, 11, 12, 13, 15},
}, },
QEMU: &QEMUConfig{ QEMU: &QEMUConfig{
ImageFormat: "qcow2", ImageFormat: "raw",
VCPUs: 2, VCPUs: 2,
Memory: 2048, Memory: 2048,
MetadataAPIImage: versions.QEMUMetadataImage, MetadataAPIImage: versions.QEMUMetadataImage,
@ -306,7 +306,7 @@ func Default() *Config {
LibvirtContainerImage: versions.LibvirtImage, LibvirtContainerImage: versions.LibvirtImage,
Measurements: copyPCRMap(qemuPCRs), Measurements: copyPCRMap(qemuPCRs),
EnforcedMeasurements: []uint32{4, 8, 9, 11, 12, 13, 15}, EnforcedMeasurements: []uint32{4, 8, 9, 11, 12, 13, 15},
NVRAM: "testing", NVRAM: "production",
}, },
}, },
KubernetesVersion: string(versions.Default), KubernetesVersion: string(versions.Default),

View file

@ -61,7 +61,7 @@ const (
LibvirtImage = "ghcr.io/edgelesssys/constellation/libvirt:v2.2.0@sha256:81ddc30cd679a95379e94e2f154861d9112bcabfffa96330c09a4917693f7cce" // renovate:container LibvirtImage = "ghcr.io/edgelesssys/constellation/libvirt:v2.2.0@sha256:81ddc30cd679a95379e94e2f154861d9112bcabfffa96330c09a4917693f7cce" // renovate:container
// ConstellationQEMUImageURL is the artifact URL for QEMU qcow2 images. // ConstellationQEMUImageURL is the artifact URL for QEMU qcow2 images.
ConstellationQEMUImageURL = "https://d1gl9j3ejrmbpr.cloudfront.net/mini-constellation-v2.1.0.qcow2" ConstellationQEMUImageURL = "https://cdn.confidential.cloud/constellation/images/mini-constellation/v2.2.0/constellation.raw"
// currently supported versions. // currently supported versions.
//nolint:revive //nolint:revive