d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

assigned subscriptionID to provider

Browse Source
This commit is contained in:
yaron2
2018-08-01 16:25:47 -07:00
parent fdb2c29ea3
commit 1ee747cb6f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
providers/sfmesh/sfmesh.go
View File

@@ -43,6 +43,7 @@ type SFMeshProvider struct {
serviceClient *servicefabricmesh.ServiceClient serviceClient *servicefabricmesh.ServiceClient
region string region string
resourceGroup string resourceGroup string
subscriptionID string
resourceManager *manager.ResourceManager resourceManager *manager.ResourceManager
} }
@@ -111,6 +112,7 @@ func NewSFMeshProvider(rm *manager.ResourceManager, nodeName, operatingSystem st
region: region, region: region,
resourceGroup: resourceGroup, resourceGroup: resourceGroup,
resourceManager: rm, resourceManager: rm,
subscriptionID: azureSubscriptionID,
} }
return &provider, nil return &provider, nil
} }
@@ -417,7 +419,7 @@ func (p *SFMeshProvider) CreatePod(pod *v1.Pod) error {
} }
networkName := *meshNetwork.Name networkName := *meshNetwork.Name
resourceID := "/subscriptions/" + os.Getenv("AZURE_SUBSCRIPTION_ID") + "/resourceGroups/" + p.resourceGroup + "/providers/Microsoft.ServiceFabricMesh/networks/" + networkName resourceID := "/subscriptions/" + p.subscriptionID + "/resourceGroups/" + p.resourceGroup + "/providers/Microsoft.ServiceFabricMesh/networks/" + networkName
service := (*meshApp.Services)[0] service := (*meshApp.Services)[0]