Merge pull request #65 from robbiezhang/master

Fix the EmptyDir Volume Error in ACI Provider
This commit is contained in:
Ria Bhatia
2018-01-22 10:58:32 -08:00
committed by GitHub
20 changed files with 1048 additions and 6 deletions

View File

@@ -471,10 +471,7 @@ func (p *ACIProvider) getVolumes(pod *v1.Pod) ([]aci.Volume, error) {
if v.EmptyDir != nil {
volumes = append(volumes, aci.Volume{
Name: v.Name,
EmptyDir: map[string]interface{}{
"medium": v.EmptyDir.Medium,
"sizeLimit": v.EmptyDir.SizeLimit,
},
EmptyDir: map[string]interface{}{},
})
continue
}

View File

@@ -263,7 +263,7 @@ type UsageListResult struct {
type Volume struct {
Name string `json:"name,omitempty"`
AzureFile *AzureFileVolume `json:"azureFile,omitempty"`
EmptyDir map[string]interface{} `json:"emptyDir,omitempty"`
EmptyDir map[string]interface{} `json:"emptyDir"`
Secret map[string]string `json:"secret,omitempty"`
GitRepo *GitRepoVolume `json:"gitRepo,omitempty"`
}