Merge pull request #3897 from richardcase/resource-quotas-save

test: save original aws resource quotas as returned by API

Author: k8s-ci-robot

test/e2e/shared/aws.go

@@ -787,24 +787,27 @@ type ServiceQuota struct {
 	RequestStatus       string
 }
 
-func EnsureServiceQuotas(sess client.ConfigProvider) map[string]*ServiceQuota {
+func EnsureServiceQuotas(sess client.ConfigProvider) (map[string]*ServiceQuota, map[string]*servicequotas.ServiceQuota) {
 	limitedResources := getLimitedResources()
 	serviceQuotasClient := servicequotas.New(sess)
 
+	originalQuotas := map[string]*servicequotas.ServiceQuota{}
+
 	for k, v := range limitedResources {
 		out, err := serviceQuotasClient.GetServiceQuota(&servicequotas.GetServiceQuotaInput{
 			QuotaCode:   aws.String(v.QuotaCode),
 			ServiceCode: aws.String(v.ServiceCode),
 		})
 		Expect(err).NotTo(HaveOccurred())
+		originalQuotas[k] = out.Quota
 		v.Value = int(aws.Float64Value(out.Quota.Value))
 		limitedResources[k] = v
 		if v.Value < v.DesiredMinimumValue {
 			v.attemptRaiseServiceQuotaRequest(serviceQuotasClient)
 		}
 	}
 
-	return limitedResources
+	return limitedResources, originalQuotas
 }
 
 func (s *ServiceQuota) attemptRaiseServiceQuotaRequest(serviceQuotasClient *servicequotas.ServiceQuotas) {

test/e2e/shared/resource.go

@@ -27,6 +27,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/aws/aws-sdk-go/service/servicequotas"
 	"github.com/gofrs/flock"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/yaml"
@@ -66,6 +67,19 @@ func WriteResourceQuotesToFile(logPath string, serviceQuotas map[string]*Service
 	Expect(err).NotTo(HaveOccurred())
 }
 
+func WriteAWSResourceQuotesToFile(logPath string, serviceQuotas map[string]*servicequotas.ServiceQuota) {
+	if _, err := os.Stat(logPath); err == nil {
+		// If resource-quotas file exists, remove it. Should not fail on error, another ginkgo node might have already deleted it.
+		os.Remove(logPath)
+	}
+
+	data, err := yaml.Marshal(serviceQuotas)
+	Expect(err).NotTo(HaveOccurred())
+
+	err = os.WriteFile(logPath, data, 0644) //nolint:gosec
+	Expect(err).NotTo(HaveOccurred())
+}
+
 func (r *TestResource) String() string {
 	return fmt.Sprintf("{ec2-normal:%v, vpc:%v, eip:%v, ngw:%v, igw:%v, classiclb:%v, ec2-GPU:%v, volume-gp2:%v}", r.EC2Normal, r.VPC, r.EIP, r.NGW, r.IGW, r.ClassicLB, r.EC2GPU, r.VolumeGP2)
 }

test/e2e/shared/suite.go

@@ -158,9 +158,10 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
 
 	if !e2eCtx.Settings.SkipQuotas {
 		By("Writing AWS service quotas to a file for parallel tests")
-		quotas := EnsureServiceQuotas(e2eCtx.BootstrapUserAWSSession)
+		quotas, originalQuotas := EnsureServiceQuotas(e2eCtx.BootstrapUserAWSSession)
 		WriteResourceQuotesToFile(ResourceQuotaFilePath, quotas)
 		WriteResourceQuotesToFile(path.Join(e2eCtx.Settings.ArtifactFolder, "initial-resource-quotas.yaml"), quotas)
+		WriteAWSResourceQuotesToFile(path.Join(e2eCtx.Settings.ArtifactFolder, "initial-aws-resource-quotas.yaml"), originalQuotas)
 	}
 
 	e2eCtx.Settings.InstanceVCPU, err = strconv.Atoi(e2eCtx.E2EConfig.GetVariable(InstanceVcpu))