Use 4 vCPU instances by default (#24)

* Use 4 vcpu instances by default

* Remove 2 vcpu instance type option

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

.github/docs/README.md

@@ -9,7 +9,7 @@ gh workflow run e2e-test-manual.yml \
     --ref feat/e2e_pipeline \                       # On your specific branch!
     -F autoscale=false -F cloudProvider=gcp \       # With your ...
     -F controlNodesCount=1 -F workerNodesCount=2 \  # ... settings
-    -F machineType=n2d-standard-2
+    -F machineType=n2d-standard-4
 ```
 
 ### E2E Test Suites
@@ -49,7 +49,7 @@ Create a new JSON file to describe the event ([relevant issue](https://github.co
       "controlNodesCount": "1",
       "autoscale": false,
       "cloudProvider": "gcp",
-      "machineType": "n2d-standard-2",
+      "machineType": "n2d-standard-4",
       "sonobuoyTestSuiteCmd": "--mode quick"
   }
 }

.github/workflows/e2e-test-gcp-weekly.yml

@@ -26,7 +26,7 @@ jobs:
           controlNodesCount: "1"
           autoscale: "false"
           cloudProvider: "gcp"
-          machineType: "n2d-standard-2"
+          machineType: "n2d-standard-4"
           gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
           gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }}
           sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml'

.github/workflows/e2e-test-gcp.yml

@@ -21,7 +21,7 @@ jobs:
           controlNodesCount: "1"
           autoscale: "false"
           cloudProvider: "gcp"
-          machineType: "n2d-standard-2"
+          machineType: "n2d-standard-4"
           gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
           gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }}
           # TODO: Remove E2E_SKIP once AB#2174 is resolved
@@ -54,7 +54,7 @@ jobs:
           controlNodesCount: "1"
           autoscale: "false"
           cloudProvider: "gcp"
-          machineType: "n2d-standard-2"
+          machineType: "n2d-standard-4"
           gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
           gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }}
           sonobuoyTestSuiteCmd: "--mode quick"

.github/workflows/e2e-test-manual.yml

@@ -28,9 +28,9 @@ on:
         description: "VM machine type. Make sure it matches selected cloud provider!"
         type: choice
         options:
-          - "n2d-standard-2" # GCP
+          - "n2d-standard-4" # GCP
           - "Standard_DC4as_v5" # Azure
-        default: "n2d-standard-2"
+        default: "n2d-standard-4"
         required: true
       sonobuoyTestSuiteCmd:
         description: "Which tests should be run? Check README for guidance!"

cli/internal/azure/instancetypes.go

@@ -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",

cli/internal/azure/scaleset_test.go

@@ -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",

cli/internal/gcp/client/instances_test.go

@@ -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")

cli/internal/gcp/instancetypes.go

@@ -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",

conformance/README.md

@@ -14,7 +14,7 @@ These tests results were produced using Sonobuoy v0.56.4.
 ## Provision Constellation Cluster
 
 ```sh
-constellation create gcp 1 2 n2d-standard-2 -y
+constellation create gcp 1 2 n2d-standard-4 -y
 constellation init
 export KUBECONFIG="$PWD/constellation-admin.conf"
 ```

internal/config/config.go

@@ -245,7 +245,7 @@ func Default() *Config {
 				Location:             "",
 				UserAssignedIdentity: "",
 				Image:                DefaultImageAzure,
-				StateDiskType:        "StandardSSD_LRS", // TODO: Replace with Premium_LRS when we replace the default VM size (Standard_D2a_v4) since the size does not support Premium_LRS
+				StateDiskType:        "Premium_LRS",
 				Measurements:         copyPCRMap(azurePCRs),
 				EnforcedMeasurements: []uint32{8, 9, 11, 12},
 				ConfidentialVM:       func() *bool { b := true; return &b }(),