diff --git a/cli/internal/cmd/minidown.go b/cli/internal/cmd/minidown.go index 9b869c0b8..aa5c798a9 100644 --- a/cli/internal/cmd/minidown.go +++ b/cli/internal/cmd/minidown.go @@ -28,7 +28,7 @@ func newMiniDownCmd() *cobra.Command { Args: cobra.ExactArgs(0), RunE: runDown, } - + cmd.Flags().BoolP("yes", "y", false, "terminate the cluster without further confirmation") return cmd } diff --git a/cli/internal/cmd/miniup.go b/cli/internal/cmd/miniup.go index 7feb149d0..1f5498cfd 100644 --- a/cli/internal/cmd/miniup.go +++ b/cli/internal/cmd/miniup.go @@ -189,7 +189,7 @@ func prepareConfig(cmd *cobra.Command, fileHandler file.Handler) (*config.Config } // 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 { cmd.Printf("Using existing image at %s\n\n", imagePath) } else if errors.Is(err, os.ErrNotExist) { diff --git a/internal/config/config.go b/internal/config/config.go index f135f7207..5670b4311 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -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), diff --git a/internal/versions/versions.go b/internal/versions/versions.go index 4d7431174..13a979802 100644 --- a/internal/versions/versions.go +++ b/internal/versions/versions.go @@ -61,7 +61,7 @@ const ( LibvirtImage = "ghcr.io/edgelesssys/constellation/libvirt:v2.2.0@sha256:81ddc30cd679a95379e94e2f154861d9112bcabfffa96330c09a4917693f7cce" // renovate:container // 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. //nolint:revive