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

Adding network policy reference (#269)

Browse Source
This commit is contained in:
Jeremy Rickard
2018-07-24 15:19:20 -07:00
committed by Robbie Zhang
parent 25e454d18f
commit f3578bfc9b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
providers/azure/client/aci/types.go
View File

@@ -93,11 +93,8 @@ type ContainerGroupProperties struct {
OsType OperatingSystemTypes `json:"osType,omitempty"`
Volumes []Volume `json:"volumes,omitempty"`
InstanceView ContainerGroupPropertiesInstanceView `json:"instanceView,omitempty"`
<<<<<<< HEAD
Diagnostics *ContainerGroupDiagnostics `json:"diagnostics,omitempty"`
=======
NetworkProfile *NetworkProfileDefinition `json:"networkProfile,omitempty"`
>>>>>>> Adding network policy reference (#269)
}
// ContainerGroupPropertiesInstanceView is the instance view of the container group. Only valid in response.