Merge branch 'main' into t-lo/azure-enable-tpm-tests

Author: t-lo

cmd/kola/options.go

@@ -218,7 +218,7 @@ func init() {
 	sv(&kola.HetznerOptions.Token, "hetzner-token", "", "Hetzner token for client authentication")
 	sv(&kola.HetznerOptions.Location, "hetzner-location", "fsn1", "Hetzner location name")
 	sv(&kola.HetznerOptions.Image, "hetzner-image", "", "Hetzner image ID")
-	sv(&kola.HetznerOptions.ServerType, "hetzner-server-type", "cx22", "Hetzner instance type")
+	sv(&kola.HetznerOptions.ServerType, "hetzner-server-type", "cpx22", "Hetzner instance type")
 
 	// Akamai specific options
 	sv(&kola.AkamaiOptions.Token, "akamai-token", "", "Akamai access token")
@@ -230,7 +230,7 @@ func init() {
 	sv(&kola.STACKITOptions.Region, "stackit-region", "eu01", "STACKIT region")
 	sv(&kola.STACKITOptions.ProjectId, "stackit-project-id", "", "STACKIT project ID")
 	sv(&kola.STACKITOptions.ServiceAccountKeyPath, "stackit-service-account-key-path", "$HOME/.stackit/credentials.json", "STACKIT service account key path")
-	sv(&kola.STACKITOptions.MachineType, "stackit-type", "c2i.8", "STACKIT instance type")
+	sv(&kola.STACKITOptions.MachineType, "stackit-type", "c2i.2", "STACKIT instance type")
 	sv(&kola.STACKITOptions.AvailabilityZone, "stackit-availability-zone", "eu01-2", "STACKIT availability zone")
 	sv(&kola.STACKITOptions.ImageId, "stackit-image-id", "", "STACKIT image ID")
 }

platform/api/hetzner/api.go

@@ -31,7 +31,7 @@ type Options struct {
 	*platform.Options
 	// Image is the ID of the Hetzner image to deploy.
 	Image string
-	// ServerType is the type of the instance (e.g. cx22).
+	// ServerType is the type of the instance (e.g. cpx22).
 	ServerType string
 	// Location is used as "default" zone for all requests.
 	Location string