diff --git a/.github/docs/README.md b/.github/docs/README.md index ee28164c8..21ec9b616 100644 --- a/.github/docs/README.md +++ b/.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" } } diff --git a/.github/workflows/e2e-test-gcp-weekly.yml b/.github/workflows/e2e-test-gcp-weekly.yml index 800da9542..daa5fc9f0 100644 --- a/.github/workflows/e2e-test-gcp-weekly.yml +++ b/.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' diff --git a/.github/workflows/e2e-test-gcp.yml b/.github/workflows/e2e-test-gcp.yml index dafd57243..8bf96114c 100644 --- a/.github/workflows/e2e-test-gcp.yml +++ b/.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" diff --git a/.github/workflows/e2e-test-manual.yml b/.github/workflows/e2e-test-manual.yml index 00794caf9..44243945b 100644 --- a/.github/workflows/e2e-test-manual.yml +++ b/.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!" diff --git a/cli/internal/azure/instancetypes.go b/cli/internal/azure/instancetypes.go index 82c79404f..394859cfe 100644 --- a/cli/internal/azure/instancetypes.go +++ b/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", diff --git a/cli/internal/azure/scaleset_test.go b/cli/internal/azure/scaleset_test.go index 746993cc8..b9e181415 100644 --- a/cli/internal/azure/scaleset_test.go +++ b/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", diff --git a/cli/internal/gcp/client/instances_test.go b/cli/internal/gcp/client/instances_test.go index 9ec6a8371..7493879a8 100644 --- a/cli/internal/gcp/client/instances_test.go +++ b/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") diff --git a/cli/internal/gcp/instancetypes.go b/cli/internal/gcp/instancetypes.go index 7f4ce6069..56dc1b738 100644 --- a/cli/internal/gcp/instancetypes.go +++ b/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", diff --git a/conformance/README.md b/conformance/README.md index a6d344492..5899ac3f6 100644 --- a/conformance/README.md +++ b/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" ``` diff --git a/docs/constellation-shell-windowframe.svg b/docs/constellation-shell-windowframe.svg index 2d630edec..a68367c31 100644 --- a/docs/constellation-shell-windowframe.svg +++ b/docs/constellation-shell-windowframe.svg @@ -207,5 +207,5 @@ - ~/constellation ❯ ❯ c ❯ co ❯ con ❯ cons ❯ const ❯ conste ❯ constel ❯ constell ❯ constella ❯ constellat ❯ constellation ❯ constellation c ❯ constellation co ❯ constellation con ❯ constellation conf ❯ constellation confi ❯ constellation config ❯ constellation config ❯ constellation config g ❯ constellation config ge ❯ constellation config generate ❯ constellation config generate g ❯ constellation config generate gc ❯ constellation config generate gcp ❯ constellation config generate gcp❯ constellation cr ❯ constellation cre ❯ constellation crea ❯ constellation creat ❯ constellation create ❯ constellation create ❯ constellation create g ❯ constellation create gc ❯ constellation create gcp ❯ constellation create gcp ❯ constellation create gcp - ❯ constellation create gcp -c ❯ constellation create gcp -c ❯ constellation create gcp -c 3 ❯ constellation create gcp -c 3 ❯ constellation create gcp -c 3 - ❯ constellation create gcp -c 3 -w ❯ constellation create gcp -c 3 -w ❯ constellation create gcp -c 3 -w 5 ❯ constellation create gcp -c 3 -w 5 ❯ constellation create gcp -c 3 -w 5 - ❯ constellation create gcp -c 3 -w 5 -- ❯ constellation create gcp -c 3 -w 5 --n ❯ constellation create gcp -c 3 -w 5 --na ❯ constellation create gcp -c 3 -w 5 --nam ❯ constellation create gcp -c 3 -w 5 --name ❯ constellation create gcp -c 3 -w 5 --name ❯ constellation create gcp -c 3 -w 5 --name d ❯ constellation create gcp -c 3 -w 5 --name de ❯ constellation create gcp -c 3 -w 5 --name dem ❯ constellation create gcp -c 3 -w 5 --name demo ❯ constellation create gcp -c 3 -w 5 --name demo ❯ constellation create gcp -c 3 -w 5 --name demo The following Constellation cluster will be created:3 control-plane nodes of type n2d-standard-2 will be created.5 worker nodes of type n2d-standard-2 will be created.Do you want to create this cluster? [y/n]: Do you want to create this cluster? [y/n]: y Do you want to create this cluster? [y/n]: yYour Constellation cluster was created successfully.~/constellation took 2m23s ❯ constellati ❯ constellatio ❯ constellation ❯ constellation i ❯ constellation in ❯ constellation ini ❯ constellation init ❯ constellation initYour Constellation master secret was successfully written to ./constellation-mastersecret.jsonCreating service account ...Your Constellation cluster was successfully initialized.Constellation cluster identifier 7V/9WEa8P4sn7deu33UZEjmMF6SM7eiHv87QikQWGaU=Kubernetes configuration constellation-admin.confYou can now connect to your cluster by executing:export KUBECONFIG="$PWD/constellation-admin.conf"~/constellation took 4m11s ❯ export KUBECONFIG="$PWD/constellation-admin.conf" ❯ export KUBECONFIG="$PWD/constellation-admin.conf"❯ k ❯ ku ❯ kub ❯ kube ❯ kubec ❯ kubect ❯ kubectl ❯ kubectl ❯ kubectl g ❯ kubectl ge ❯ kubectl get ❯ kubectl get ❯ kubectl get n ❯ kubectl get no ❯ kubectl get nod ❯ kubectl get node ❯ kubectl get nodes ❯ kubectl get nodesNAME STATUS ROLES AGE VERSIONconstellation-control-plane-qedq4-8nzl Ready control-plane 3m34s v1.24.3constellation-control-plane-qedq4-j9sl Ready control-plane 68s v1.24.3constellation-control-plane-qedq4-qcmk Ready control-plane 62s v1.24.3constellation-worker-qedq4-1sq7 Ready <none> 78s v1.24.3constellation-worker-qedq4-7wzj Ready <none> 82s v1.24.3constellation-worker-qedq4-lr11 Ready <none> 95s v1.24.3constellation-worker-qedq4-nzzr Ready <none> 83s v1.24.3constellation-worker-qedq4-r3zp Ready <none> 82s v1.24.3❯ . ❯ ❯ c ❯ co ❯ con ❯ cons ❯ const ❯ conste ❯ constel ❯ constell ❯ constella ❯ constellat ❯ constellati ❯ constellatio ❯ constellation ❯ constellation ❯ constellation t ❯ constellation te ❯ constellation ter ❯ constellation term ❯ constellation termi ❯ constellation termin ❯ constellation termina ❯ constellation terminat ❯ constellation terminate ❯ constellation terminate Terminating ...Your Constellation cluster was terminated successfully.~/constellation took 3m50s ❯ exit - \ No newline at end of file + ~/constellation ❯ ❯ c ❯ co ❯ con ❯ cons ❯ const ❯ conste ❯ constel ❯ constell ❯ constella ❯ constellat ❯ constellation ❯ constellation c ❯ constellation co ❯ constellation con ❯ constellation conf ❯ constellation confi ❯ constellation config ❯ constellation config ❯ constellation config g ❯ constellation config ge ❯ constellation config generate ❯ constellation config generate g ❯ constellation config generate gc ❯ constellation config generate gcp ❯ constellation config generate gcp❯ constellation cr ❯ constellation cre ❯ constellation crea ❯ constellation creat ❯ constellation create ❯ constellation create ❯ constellation create g ❯ constellation create gc ❯ constellation create gcp ❯ constellation create gcp ❯ constellation create gcp - ❯ constellation create gcp -c ❯ constellation create gcp -c ❯ constellation create gcp -c 3 ❯ constellation create gcp -c 3 ❯ constellation create gcp -c 3 - ❯ constellation create gcp -c 3 -w ❯ constellation create gcp -c 3 -w ❯ constellation create gcp -c 3 -w 5 ❯ constellation create gcp -c 3 -w 5 ❯ constellation create gcp -c 3 -w 5 - ❯ constellation create gcp -c 3 -w 5 -- ❯ constellation create gcp -c 3 -w 5 --n ❯ constellation create gcp -c 3 -w 5 --na ❯ constellation create gcp -c 3 -w 5 --nam ❯ constellation create gcp -c 3 -w 5 --name ❯ constellation create gcp -c 3 -w 5 --name ❯ constellation create gcp -c 3 -w 5 --name d ❯ constellation create gcp -c 3 -w 5 --name de ❯ constellation create gcp -c 3 -w 5 --name dem ❯ constellation create gcp -c 3 -w 5 --name demo ❯ constellation create gcp -c 3 -w 5 --name demo ❯ constellation create gcp -c 3 -w 5 --name demo The following Constellation cluster will be created:3 control-plane nodes of type n2d-standard-4 will be created.5 worker nodes of type n2d-standard-4 will be created.Do you want to create this cluster? [y/n]: Do you want to create this cluster? [y/n]: y Do you want to create this cluster? [y/n]: yYour Constellation cluster was created successfully.~/constellation took 2m23s ❯ constellati ❯ constellatio ❯ constellation ❯ constellation i ❯ constellation in ❯ constellation ini ❯ constellation init ❯ constellation initYour Constellation master secret was successfully written to ./constellation-mastersecret.jsonCreating service account ...Your Constellation cluster was successfully initialized.Constellation cluster identifier 7V/9WEa8P4sn7deu33UZEjmMF6SM7eiHv87QikQWGaU=Kubernetes configuration constellation-admin.confYou can now connect to your cluster by executing:export KUBECONFIG="$PWD/constellation-admin.conf"~/constellation took 4m11s ❯ export KUBECONFIG="$PWD/constellation-admin.conf" ❯ export KUBECONFIG="$PWD/constellation-admin.conf"❯ k ❯ ku ❯ kub ❯ kube ❯ kubec ❯ kubect ❯ kubectl ❯ kubectl ❯ kubectl g ❯ kubectl ge ❯ kubectl get ❯ kubectl get ❯ kubectl get n ❯ kubectl get no ❯ kubectl get nod ❯ kubectl get node ❯ kubectl get nodes ❯ kubectl get nodesNAME STATUS ROLES AGE VERSIONconstellation-control-plane-qedq4-8nzl Ready control-plane 3m34s v1.24.3constellation-control-plane-qedq4-j9sl Ready control-plane 68s v1.24.3constellation-control-plane-qedq4-qcmk Ready control-plane 62s v1.24.3constellation-worker-qedq4-1sq7 Ready <none> 78s v1.24.3constellation-worker-qedq4-7wzj Ready <none> 82s v1.24.3constellation-worker-qedq4-lr11 Ready <none> 95s v1.24.3constellation-worker-qedq4-nzzr Ready <none> 83s v1.24.3constellation-worker-qedq4-r3zp Ready <none> 82s v1.24.3❯ . ❯ ❯ c ❯ co ❯ con ❯ cons ❯ const ❯ conste ❯ constel ❯ constell ❯ constella ❯ constellat ❯ constellati ❯ constellatio ❯ constellation ❯ constellation ❯ constellation t ❯ constellation te ❯ constellation ter ❯ constellation term ❯ constellation termi ❯ constellation termin ❯ constellation termina ❯ constellation terminat ❯ constellation terminate ❯ constellation terminate Terminating ...Your Constellation cluster was terminated successfully.~/constellation took 3m50s ❯ exit + diff --git a/internal/config/config.go b/internal/config/config.go index b73fb01d7..6e210000a 100644 --- a/internal/config/config.go +++ b/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 }(),