Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-09-19 20:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove exposure of qemu ip_range_start value

Browse source
This commit is contained in:
katexochen 2022-09-27 10:47:45 +02:00 • committed by Paul Meyer
parent ed78c48ed4
commit ccbc3d9123
9 changed files with 17 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/config/config.go
View file

@ -189,9 +189,6 @@ type QEMUConfig struct {
// Amount of memory per instance (MiB).
Memory int `yaml:"memory" validate:"required"`
// description: |
// First IP address to use within a node group's subnet.
IPRangeStart int `yaml:"ipRangeStart" validate:"required"`
// description: |
// Container image to use for the QEMU metadata server.
MetadataAPIImage string `yaml:"metadataAPIServer" validate:"required"`
// description: |
@ -239,7 +236,6 @@ func Default() *Config {
ImageFormat: "qcow2",
VCPUs: 2,
Memory: 2048,
IPRangeStart: 100,
Measurements: copyPCRMap(qemuPCRs),
MetadataAPIImage: "ghcr.io/edgelesssys/constellation/qemu-metadata-api:v2.1.0-pre.0.20220922072347-abb78344bc2a",
EnforcedMeasurements: []uint32{11, 12},

31
internal/config/config_doc.go
View file

@ -288,7 +288,7 @@ func init() {
FieldName: "qemu",
},
}
QEMUConfigDoc.Fields = make([]encoder.Doc, 8)
QEMUConfigDoc.Fields = make([]encoder.Doc, 7)
QEMUConfigDoc.Fields[0].Name = "image"
QEMUConfigDoc.Fields[0].Type = "string"
QEMUConfigDoc.Fields[0].Note = ""
@ -309,26 +309,21 @@ func init() {
QEMUConfigDoc.Fields[3].Note = ""
QEMUConfigDoc.Fields[3].Description = "Amount of memory per instance (MiB)."
QEMUConfigDoc.Fields[3].Comments[encoder.LineComment] = "Amount of memory per instance (MiB)."
QEMUConfigDoc.Fields[4].Name = "ipRangeStart"
QEMUConfigDoc.Fields[4].Type = "int"
QEMUConfigDoc.Fields[4].Name = "metadataAPIServer"
QEMUConfigDoc.Fields[4].Type = "string"
QEMUConfigDoc.Fields[4].Note = ""
QEMUConfigDoc.Fields[4].Description = "First IP address to use within a node group's subnet."
QEMUConfigDoc.Fields[4].Comments[encoder.LineComment] = "First IP address to use within a node group's subnet."
QEMUConfigDoc.Fields[5].Name = "metadataAPIServer"
QEMUConfigDoc.Fields[5].Type = "string"
QEMUConfigDoc.Fields[4].Description = "Container image to use for the QEMU metadata server."
QEMUConfigDoc.Fields[4].Comments[encoder.LineComment] = "Container image to use for the QEMU metadata server."
QEMUConfigDoc.Fields[5].Name = "measurements"
QEMUConfigDoc.Fields[5].Type = "Measurements"
QEMUConfigDoc.Fields[5].Note = ""
QEMUConfigDoc.Fields[5].Description = "Container image to use for the QEMU metadata server."
QEMUConfigDoc.Fields[5].Comments[encoder.LineComment] = "Container image to use for the QEMU metadata server."
QEMUConfigDoc.Fields[6].Name = "measurements"
QEMUConfigDoc.Fields[6].Type = "Measurements"
QEMUConfigDoc.Fields[5].Description = "Measurement used to enable measured boot."
QEMUConfigDoc.Fields[5].Comments[encoder.LineComment] = "Measurement used to enable measured boot."
QEMUConfigDoc.Fields[6].Name = "enforcedMeasurements"
QEMUConfigDoc.Fields[6].Type = "[]uint32"
QEMUConfigDoc.Fields[6].Note = ""
QEMUConfigDoc.Fields[6].Description = "Measurement used to enable measured boot."
QEMUConfigDoc.Fields[6].Comments[encoder.LineComment] = "Measurement used to enable measured boot."
QEMUConfigDoc.Fields[7].Name = "enforcedMeasurements"
QEMUConfigDoc.Fields[7].Type = "[]uint32"
QEMUConfigDoc.Fields[7].Note = ""
QEMUConfigDoc.Fields[7].Description = "List of values that should be enforced to be equal to the ones from the measurement list. Any non-equal values not in this list will only result in a warning."
QEMUConfigDoc.Fields[7].Comments[encoder.LineComment] = "List of values that should be enforced to be equal to the ones from the measurement list. Any non-equal values not in this list will only result in a warning."
QEMUConfigDoc.Fields[6].Description = "List of values that should be enforced to be equal to the ones from the measurement list. Any non-equal values not in this list will only result in a warning."
QEMUConfigDoc.Fields[6].Comments[encoder.LineComment] = "List of values that should be enforced to be equal to the ones from the measurement list. Any non-equal values not in this list will only result in a warning."
}
func (_ Config) Doc() *encoder.Doc {