Ajay Tripathy 5 лет назад
Родитель
Сommit
ec13073554
2 измененных файлов с 26 добавлено и 8 удалено
  1. 26 1
      pkg/cloud/awsprovider.go
  2. 0 7
      test/cloud_test.go

+ 26 - 1
pkg/cloud/awsprovider.go

@@ -102,6 +102,8 @@ type AWS struct {
 	DownloadPricingDataLock sync.RWMutex
 	DownloadPricingDataLock sync.RWMutex
 	Config                  *ProviderConfig
 	Config                  *ProviderConfig
 	ServiceAccountChecks    []*ServiceAccountCheck
 	ServiceAccountChecks    []*ServiceAccountCheck
+	canListSpotObjects      bool
+	canGetSpotObjects       bool
 	*CustomProvider
 	*CustomProvider
 }
 }
 
 
@@ -2228,7 +2230,30 @@ func (a *AWS) getReservedInstances() ([]*AWSReservedInstance, error) {
 }
 }
 
 
 func (a *AWS) ServiceAccountStatus() *ServiceAccountStatus {
 func (a *AWS) ServiceAccountStatus() *ServiceAccountStatus {
+	checks := []*ServiceAccountCheck{}
+	if a.canGetSpotObjects {
+		checks = append(checks, &ServiceAccountCheck{
+			Message: "Can Get Objects in Spot Bucket",
+			Status:  true,
+		})
+	} else {
+		checks = append(checks, &ServiceAccountCheck{
+			Message: "Can Get Objects in Spot Bucket",
+			Status:  false,
+		})
+	}
+	if a.canListSpotObjects {
+		checks = append(checks, &ServiceAccountCheck{
+			Message: "Can List Objects in Spot Bucket",
+			Status:  true,
+		})
+	} else {
+		checks = append(checks, &ServiceAccountCheck{
+			Message: "Can List Objects in Spot Bucket",
+			Status:  false,
+		})
+	}
 	return &ServiceAccountStatus{
 	return &ServiceAccountStatus{
-		Checks: []*ServiceAccountCheck{},
+		Checks: checks,
 	}
 	}
 }
 }

+ 0 - 7
test/cloud_test.go

@@ -231,17 +231,10 @@ func TestNodePriceFromCSVWithRegion(t *testing.T) {
 
 
 func TestNodePriceFromCSVWithCase(t *testing.T) {
 func TestNodePriceFromCSVWithCase(t *testing.T) {
 	n := &v1.Node{}
 	n := &v1.Node{}
-<<<<<<< HEAD
-	n.Spec.ProviderID = "azure:///subscriptions/75d6a706-70ad-4689-9ca4-4659a44f0ba8/resourceGroups/ethos_11_stage_va7/providers/Microsoft.Compute/virtualMachineScaleSets/vmss-agent-worker0-11stageva7-ezpwh/virtualMachines/7"
-	n.Labels = make(map[string]string)
-	n.Labels[v1.LabelZoneRegion] = "eastus2"
-	wantPrice := "0.443952693121295"
-=======
 	n.Spec.ProviderID = "azure:///subscriptions/123a7sd-asd-1234-578a9-123abcdef/resourceGroups/case_12_STaGe_TeSt7/providers/Microsoft.Compute/virtualMachineScaleSets/vmss-agent-worker0-12stagetest7-ezggnore/virtualMachines/7"
 	n.Spec.ProviderID = "azure:///subscriptions/123a7sd-asd-1234-578a9-123abcdef/resourceGroups/case_12_STaGe_TeSt7/providers/Microsoft.Compute/virtualMachineScaleSets/vmss-agent-worker0-12stagetest7-ezggnore/virtualMachines/7"
 	n.Labels = make(map[string]string)
 	n.Labels = make(map[string]string)
 	n.Labels[v1.LabelZoneRegion] = "eastus2"
 	n.Labels[v1.LabelZoneRegion] = "eastus2"
 	wantPrice := "0.13370357"
 	wantPrice := "0.13370357"
->>>>>>> 2ceed3650993693345cd3222ceab14547daebb4b
 
 
 	c := &cloud.CSVProvider{
 	c := &cloud.CSVProvider{
 		CSVLocation: "../configs/pricing_schema_case.csv",
 		CSVLocation: "../configs/pricing_schema_case.csv",