Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-12-10 05:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use 4 vCPU instances by default (#24)

Browse source 
* Use 4 vcpu instances by default

* Remove 2 vcpu instance type option

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2022-08-31 10:33:33 +02:00 • committed by GitHub
parent 2d611e8148
commit b27e205399
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/internal/azure/instancetypes.go
View file

@ -4,7 +4,6 @@ package azure
var CVMInstanceTypes = []string{
// CVMs (3rd Generation EPYC 7763v processors)
// DCasv5-series
"Standard_DC2as_v5",
"Standard_DC4as_v5",
"Standard_DC8as_v5",
"Standard_DC16as_v5",
@ -13,7 +12,6 @@ var CVMInstanceTypes = []string{
"Standard_DC64as_v5",
"Standard_DC96as_v5",
// DCadsv5-series
"Standard_DC2ads_v5",
"Standard_DC4ads_v5",
"Standard_DC8ads_v5",
"Standard_DC16ads_v5",
@ -22,7 +20,6 @@ var CVMInstanceTypes = []string{
"Standard_DC64ads_v5",
"Standard_DC96ads_v5",
// ECasv5-series
"Standard_EC2as_v5",
"Standard_EC4as_v5",
"Standard_EC8as_v5",
"Standard_EC16as_v5",
@ -32,7 +29,6 @@ var CVMInstanceTypes = []string{
"Standard_EC64as_v5",
"Standard_EC96as_v5",
// ECadsv5-series
"Standard_EC2ads_v5",
"Standard_EC4ads_v5",
"Standard_EC8ads_v5",
"Standard_EC16ads_v5",
@ -47,7 +43,6 @@ var CVMInstanceTypes = []string{
var TrustedLaunchInstanceTypes = []string{
// Trusted Launch (2nd Generation AMD EPYC 7452 or 3rd Generation EPYC 7763v processors)
// Dav4-series
"Standard_D2a_v4",
"Standard_D4a_v4",
"Standard_D8a_v4",
"Standard_D16a_v4",
@ -56,7 +51,6 @@ var TrustedLaunchInstanceTypes = []string{
"Standard_D64a_v4",
"Standard_D96a_v4",
// Dasv4-series
"Standard_D2as_v4",
"Standard_D4as_v4",
"Standard_D8as_v4",
"Standard_D16as_v4",
@ -65,7 +59,6 @@ var TrustedLaunchInstanceTypes = []string{
"Standard_D64as_v4",
"Standard_D96as_v4",
// Eav4-series
"Standard_E2a_v4",
"Standard_E4a_v4",
"Standard_E8a_v4",
"Standard_E16a_v4",
@ -74,7 +67,6 @@ var TrustedLaunchInstanceTypes = []string{
"Standard_E64a_v4",
"Standard_E96a_v4",
// Easv4-series
"Standard_E2as_v4",
"Standard_E4as_v4",
"Standard_E8as_v4",
"Standard_E16as_v4",

2
cli/internal/azure/scaleset_test.go
View file

@ -15,7 +15,7 @@ func TestFirewallPermissions(t *testing.T) {
Name: "name",
NamePrefix: "constellation-",
Location: "UK South",
InstanceType: "Standard_DC2as_v5",
InstanceType: "Standard_DC4as_v5",
Count: 3,
Username: "constellation",
SubnetID: "subnet-id",

2
cli/internal/gcp/client/instances_test.go
View file

@ -46,7 +46,7 @@ func TestCreateInstances(t *testing.T) {
CountControlPlanes: 3,
CountWorkers: 4,
ImageID: "img",
InstanceType: "n2d-standard-2",
InstanceType: "n2d-standard-4",
KubeEnv: "kube-env",
}
someErr := errors.New("failed")

4
cli/internal/gcp/instancetypes.go
View file

@ -2,7 +2,6 @@ package gcp
// InstanceTypes are valid GCP instance types.
var InstanceTypes = []string{
"n2d-standard-2",
"n2d-standard-4",
"n2d-standard-8",
"n2d-standard-16",
@ -12,8 +11,7 @@ var InstanceTypes = []string{
"n2d-standard-80",
"n2d-standard-96",
"n2d-standard-128",
"n2d-standard-224",
"n2d-highmem-2",
"n2d-standard-424",
"n2d-highmem-4",
"n2d-highmem-8",
"n2d-highmem-16",