Skip to content

Commit

Permalink
Merge pull request kubernetes#15132 from chewong/multi-zone-bug
Browse files Browse the repository at this point in the history 
Add additional JSON fields for aks-engine API model
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Nov 6, 2019
2 parents 0490589 + 3e99808 commit 09649c7
Showing 1 changed file with 34 additions and 31 deletions.
65 changes: 34 additions & 31 deletions kubetest/azure_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ type AksEngineAPIModel struct {
Location string `json:"location,omitempty"`
Name string `json:"name,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
APIVersion string `json:"APIVersion"`

Properties *Properties `json:"properties"`
APIVersion string `json:"apiVersion"`
Properties *Properties `json:"properties"`
}

type Properties struct {
Expand Down Expand Up @@ -100,27 +99,28 @@ type KubernetesAddon struct {
}

type KubernetesConfig struct {
CustomWindowsPackageURL string `json:"customWindowsPackageURL,omitempty"`
CustomHyperkubeImage string `json:"customHyperkubeImage,omitempty"`
CustomCcmImage string `json:"customCcmImage,omitempty"` // Image for cloud-controller-manager
UseCloudControllerManager *bool `json:"useCloudControllerManager,omitempty"`
NetworkPlugin string `json:"networkPlugin,omitempty"`
PrivateAzureRegistryServer string `json:"privateAzureRegistryServer,omitempty"`
AzureCNIURLLinux string `json:"azureCNIURLLinux,omitempty"`
AzureCNIURLWindows string `json:"azureCNIURLWindows,omitempty"`
Addons []KubernetesAddon `json:"addons,omitempty"`
NetworkPolicy string `json:"networkPolicy,omitempty"`
CloudProviderRateLimitQPS float64 `json:"cloudProviderRateLimitQPS,omitempty"`
CloudProviderRateLimitBucket int `json:"cloudProviderRateLimitBucket,omitempty"`
APIServerConfig map[string]string `json:"apiServerConfig,omitempty"`
KubernetesImageBase string `json:"kubernetesImageBase,omitempty"`
ControllerManagerConfig map[string]string `json:"controllerManagerConfig,omitempty"`
KubeletConfig map[string]string `json:"kubeletConfig,omitempty"`
KubeProxyMode string `json:"kubeProxyMode,omitempty"`
LoadBalancerSku string `json:"loadBalancerSku,omitempty"`
ExcludeMasterFromStandardLB *bool `json:"excludeMasterFromStandardLB,omitempty"`
ServiceCidr string `json:"serviceCidr,omitempty"`
DNSServiceIP string `json:"dnsServiceIP,omitempty"`
CustomWindowsPackageURL string `json:"customWindowsPackageURL,omitempty"`
CustomHyperkubeImage string `json:"customHyperkubeImage,omitempty"`
CustomCcmImage string `json:"customCcmImage,omitempty"` // Image for cloud-controller-manager
UseCloudControllerManager *bool `json:"useCloudControllerManager,omitempty"`
NetworkPlugin string `json:"networkPlugin,omitempty"`
PrivateAzureRegistryServer string `json:"privateAzureRegistryServer,omitempty"`
AzureCNIURLLinux string `json:"azureCNIURLLinux,omitempty"`
AzureCNIURLWindows string `json:"azureCNIURLWindows,omitempty"`
Addons []KubernetesAddon `json:"addons,omitempty"`
NetworkPolicy string `json:"networkPolicy,omitempty"`
CloudProviderRateLimitQPS float64 `json:"cloudProviderRateLimitQPS,omitempty"`
CloudProviderRateLimitBucket int `json:"cloudProviderRateLimitBucket,omitempty"`
APIServerConfig map[string]string `json:"apiServerConfig,omitempty"`
KubernetesImageBase string `json:"kubernetesImageBase,omitempty"`
ControllerManagerConfig map[string]string `json:"controllerManagerConfig,omitempty"`
KubeletConfig map[string]string `json:"kubeletConfig,omitempty"`
KubeProxyMode string `json:"kubeProxyMode,omitempty"`
LoadBalancerSku string `json:"loadBalancerSku,omitempty"`
ExcludeMasterFromStandardLB *bool `json:"excludeMasterFromStandardLB,omitempty"`
ServiceCidr string `json:"serviceCidr,omitempty"`
DNSServiceIP string `json:"dnsServiceIP,omitempty"`
OutboundRuleIdleTimeoutInMinutes int32 `json:"outboundRuleIdleTimeoutInMinutes,omitempty"`
}

type OrchestratorProfile struct {
Expand All @@ -130,13 +130,15 @@ type OrchestratorProfile struct {
}

type MasterProfile struct {
Count int `json:"count"`
Distro string `json:"distro"`
DNSPrefix string `json:"dnsPrefix"`
VMSize string `json:"vmSize" validate:"required"`
IPAddressCount int `json:"ipAddressCount,omitempty"`
Extensions []map[string]string `json:"extensions,omitempty"`
OSDiskSizeGB int `json:"osDiskSizeGB,omitempty" validate:"min=0,max=1023"`
Count int `json:"count"`
Distro string `json:"distro"`
DNSPrefix string `json:"dnsPrefix"`
VMSize string `json:"vmSize" validate:"required"`
IPAddressCount int `json:"ipAddressCount,omitempty"`
Extensions []map[string]string `json:"extensions,omitempty"`
OSDiskSizeGB int `json:"osDiskSizeGB,omitempty" validate:"min=0,max=1023"`
AvailabilityProfile string `json:"availabilityProfile,omitempty"`
AvailabilityZones []string `json:"availabilityZones,omitempty"`
}

type AgentPoolProfile struct {
Expand All @@ -146,6 +148,7 @@ type AgentPoolProfile struct {
VMSize string `json:"vmSize"`
OSType string `json:"osType,omitempty"`
AvailabilityProfile string `json:"availabilityProfile"`
AvailabilityZones []string `json:"availabilityZones,omitempty"`
IPAddressCount int `json:"ipAddressCount,omitempty"`
PreProvisionExtension map[string]string `json:"preProvisionExtension,omitempty"`
Extensions []map[string]string `json:"extensions,omitempty"`
Expand Down

0 comments on commit 09649c7

Please sign in to comment.