From da0f72e864602b7702aa9e3b90c633a0ee1ddf57 Mon Sep 17 00:00:00 2001 From: jmcshane Date: Fri, 24 Jul 2020 13:35:03 -0500 Subject: [PATCH] Upgrading containerservice API to 2020-04-01 to support new features --- .../services/containers/client/client.go | 2 +- .../services/containers/kubernetes_addons.go | 2 +- .../kubernetes_cluster_data_source.go | 2 +- ...ubernetes_cluster_node_pool_data_source.go | 2 +- .../kubernetes_cluster_node_pool_resource.go | 2 +- .../containers/kubernetes_cluster_resource.go | 2 +- .../containers/kubernetes_cluster_validate.go | 2 +- .../containers/kubernetes_nodepool.go | 2 +- .../containerservice/agentpools.go | 12 +++--- .../containerservice/client.go | 0 .../containerservice/containerservices.go | 0 .../containerservice/managedclusters.go | 34 ++++++++------- .../containerservice/models.go | 42 +++++++++++++++---- .../openshiftmanagedclusters.go | 0 .../containerservice/operations.go | 2 +- .../containerservice/version.go | 2 +- vendor/modules.txt | 2 +- 17 files changed, 70 insertions(+), 40 deletions(-) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/agentpools.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/client.go (100%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/containerservices.go (100%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/managedclusters.go (98%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/models.go (98%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/openshiftmanagedclusters.go (100%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/operations.go (99%) rename vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/{2020-03-01 => 2020-04-01}/containerservice/version.go (99%) diff --git a/azurerm/internal/services/containers/client/client.go b/azurerm/internal/services/containers/client/client.go index 5e2cbf13e905f..5bf4d7d41e92b 100644 --- a/azurerm/internal/services/containers/client/client.go +++ b/azurerm/internal/services/containers/client/client.go @@ -3,7 +3,7 @@ package client import ( "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance" "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2018-09-01/containerregistry" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/Azure/go-autorest/autorest/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common" ) diff --git a/azurerm/internal/services/containers/kubernetes_addons.go b/azurerm/internal/services/containers/kubernetes_addons.go index c4f28ef2d293e..a6731db67cc05 100644 --- a/azurerm/internal/services/containers/kubernetes_addons.go +++ b/azurerm/internal/services/containers/kubernetes_addons.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/Azure/go-autorest/autorest/azure" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" diff --git a/azurerm/internal/services/containers/kubernetes_cluster_data_source.go b/azurerm/internal/services/containers/kubernetes_cluster_data_source.go index aceaa0a338572..691b01932ccfc 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_data_source.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_data_source.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/kubernetes" diff --git a/azurerm/internal/services/containers/kubernetes_cluster_node_pool_data_source.go b/azurerm/internal/services/containers/kubernetes_cluster_node_pool_data_source.go index 26dd83b3b6c98..1e666a44310a8 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_node_pool_data_source.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_node_pool_data_source.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go b/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go index 65bdc2f0b1987..0d919bda51fe2 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_node_pool_resource.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/containers/kubernetes_cluster_resource.go b/azurerm/internal/services/containers/kubernetes_cluster_resource.go index 654cee40799b9..c1e53d74b6d3c 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_resource.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_resource.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/containers/kubernetes_cluster_validate.go b/azurerm/internal/services/containers/kubernetes_cluster_validate.go index 83b9430de483c..4bff33b6380f7 100644 --- a/azurerm/internal/services/containers/kubernetes_cluster_validate.go +++ b/azurerm/internal/services/containers/kubernetes_cluster_validate.go @@ -6,7 +6,7 @@ import ( "net/http" "strings" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/containers/client" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" diff --git a/azurerm/internal/services/containers/kubernetes_nodepool.go b/azurerm/internal/services/containers/kubernetes_nodepool.go index be25a750d42fc..6641cedff6015 100644 --- a/azurerm/internal/services/containers/kubernetes_nodepool.go +++ b/azurerm/internal/services/containers/kubernetes_nodepool.go @@ -3,7 +3,7 @@ package containers import ( "fmt" - "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" + "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/agentpools.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/agentpools.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go index 0aa9c57834694..4b986aee1458a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/agentpools.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/agentpools.go @@ -93,7 +93,7 @@ func (client AgentPoolsClient) CreateOrUpdatePreparer(ctx context.Context, resou "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -182,7 +182,7 @@ func (client AgentPoolsClient) DeletePreparer(ctx context.Context, resourceGroup "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -274,7 +274,7 @@ func (client AgentPoolsClient) GetPreparer(ctx context.Context, resourceGroupNam "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -359,7 +359,7 @@ func (client AgentPoolsClient) GetAvailableAgentPoolVersionsPreparer(ctx context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -447,7 +447,7 @@ func (client AgentPoolsClient) GetUpgradeProfilePreparer(ctx context.Context, re "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -534,7 +534,7 @@ func (client AgentPoolsClient) ListPreparer(ctx context.Context, resourceGroupNa "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/client.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/client.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/client.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/client.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/containerservices.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/containerservices.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/containerservices.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/containerservices.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/managedclusters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go similarity index 98% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/managedclusters.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go index a5b85ddb044a8..b6ff2bd73c42d 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/managedclusters.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/managedclusters.go @@ -133,7 +133,7 @@ func (client ManagedClustersClient) CreateOrUpdatePreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -220,7 +220,7 @@ func (client ManagedClustersClient) DeletePreparer(ctx context.Context, resource "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -310,7 +310,7 @@ func (client ManagedClustersClient) GetPreparer(ctx context.Context, resourceGro "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -342,7 +342,11 @@ func (client ManagedClustersClient) GetResponder(resp *http.Response) (result Ma } // GetAccessProfile gets the accessProfile for the specified role name of the managed cluster with a specified resource -// group and name. +// group and name. **WARNING**: This API will be deprecated. Instead use +// [ListClusterUserCredentials](https://docs.microsoft.com/en-us/rest/api/aks/managedclusters/listclusterusercredentials) +// or +// [ListClusterAdminCredentials](https://docs.microsoft.com/en-us/rest/api/aks/managedclusters/listclusteradmincredentials) +// . // Parameters: // resourceGroupName - the name of the resource group. // resourceName - the name of the managed cluster resource. @@ -398,7 +402,7 @@ func (client ManagedClustersClient) GetAccessProfilePreparer(ctx context.Context "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -484,7 +488,7 @@ func (client ManagedClustersClient) GetUpgradeProfilePreparer(ctx context.Contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -556,7 +560,7 @@ func (client ManagedClustersClient) ListPreparer(ctx context.Context) (*http.Req "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -674,7 +678,7 @@ func (client ManagedClustersClient) ListByResourceGroupPreparer(ctx context.Cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -797,7 +801,7 @@ func (client ManagedClustersClient) ListClusterAdminCredentialsPreparer(ctx cont "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -883,7 +887,7 @@ func (client ManagedClustersClient) ListClusterMonitoringUserCredentialsPreparer "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -969,7 +973,7 @@ func (client ManagedClustersClient) ListClusterUserCredentialsPreparer(ctx conte "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1049,7 +1053,7 @@ func (client ManagedClustersClient) ResetAADProfilePreparer(ctx context.Context, "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1138,7 +1142,7 @@ func (client ManagedClustersClient) ResetServicePrincipalProfilePreparer(ctx con "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1224,7 +1228,7 @@ func (client ManagedClustersClient) RotateClusterCertificatesPreparer(ctx contex "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } @@ -1309,7 +1313,7 @@ func (client ManagedClustersClient) UpdateTagsPreparer(ctx context.Context, reso "subscriptionId": autorest.Encode("path", client.SubscriptionID), } - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/models.go similarity index 98% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/models.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/models.go index ae56d83229aae..3d30ed739bd92 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/models.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/models.go @@ -28,7 +28,7 @@ import ( ) // The package's fully qualified name. -const fqdn = "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice" +const fqdn = "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice" // AgentPoolMode enumerates the values for agent pool mode. type AgentPoolMode string @@ -340,8 +340,6 @@ func PossibleScaleSetEvictionPolicyValues() []ScaleSetEvictionPolicy { type ScaleSetPriority string const ( - // Low ... - Low ScaleSetPriority = "Low" // Regular ... Regular ScaleSetPriority = "Regular" // Spot ... @@ -350,7 +348,7 @@ const ( // PossibleScaleSetPriorityValues returns an array of possible values for the ScaleSetPriority const type. func PossibleScaleSetPriorityValues() []ScaleSetPriority { - return []ScaleSetPriority{Low, Regular, Spot} + return []ScaleSetPriority{Regular, Spot} } // StorageProfileTypes enumerates the values for storage profile types. @@ -1198,6 +1196,8 @@ type AgentPoolUpgradeProfileProperties struct { OsType OSType `json:"osType,omitempty"` // Upgrades - List of orchestrator types and versions available for upgrade. Upgrades *[]AgentPoolUpgradeProfilePropertiesUpgradesItem `json:"upgrades,omitempty"` + // LatestNodeImageVersion - LatestNodeImageVersion is the latest AKS supported node image version. + LatestNodeImageVersion *string `json:"latestNodeImageVersion,omitempty"` } // AgentPoolUpgradeProfilePropertiesUpgradesItem ... @@ -1208,6 +1208,12 @@ type AgentPoolUpgradeProfilePropertiesUpgradesItem struct { IsPreview *bool `json:"isPreview,omitempty"` } +// AgentPoolUpgradeSettings settings for upgrading an agentpool +type AgentPoolUpgradeSettings struct { + // MaxSurge - Count or percentage of additional nodes to be added during upgrade. If empty uses AKS default + MaxSurge *string `json:"maxSurge,omitempty"` +} + // CloudError an error response from the Container service. type CloudError struct { // Error - Details about the error. @@ -1876,15 +1882,19 @@ type ManagedClusterAgentPoolProfile struct { Mode AgentPoolMode `json:"mode,omitempty"` // OrchestratorVersion - Version of orchestrator specified when creating the managed cluster. OrchestratorVersion *string `json:"orchestratorVersion,omitempty"` + // NodeImageVersion - Version of node image + NodeImageVersion *string `json:"nodeImageVersion,omitempty"` + // UpgradeSettings - Settings for upgrading the agentpool + UpgradeSettings *AgentPoolUpgradeSettings `json:"upgradeSettings,omitempty"` // ProvisioningState - READ-ONLY; The current deployment or provisioning state, which only appears in the response. ProvisioningState *string `json:"provisioningState,omitempty"` // AvailabilityZones - Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType. AvailabilityZones *[]string `json:"availabilityZones,omitempty"` // EnableNodePublicIP - Enable public IP for nodes EnableNodePublicIP *bool `json:"enableNodePublicIP,omitempty"` - // ScaleSetPriority - ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Spot', 'Low', 'Regular' + // ScaleSetPriority - ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Spot', 'Regular' ScaleSetPriority ScaleSetPriority `json:"scaleSetPriority,omitempty"` - // ScaleSetEvictionPolicy - ScaleSetEvictionPolicy to be used to specify eviction policy for Spot or low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate' + // ScaleSetEvictionPolicy - ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate' ScaleSetEvictionPolicy ScaleSetEvictionPolicy `json:"scaleSetEvictionPolicy,omitempty"` // SpotMaxPrice - SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. SpotMaxPrice *float64 `json:"spotMaxPrice,omitempty"` @@ -1938,6 +1948,12 @@ func (mcapp ManagedClusterAgentPoolProfile) MarshalJSON() ([]byte, error) { if mcapp.OrchestratorVersion != nil { objectMap["orchestratorVersion"] = mcapp.OrchestratorVersion } + if mcapp.NodeImageVersion != nil { + objectMap["nodeImageVersion"] = mcapp.NodeImageVersion + } + if mcapp.UpgradeSettings != nil { + objectMap["upgradeSettings"] = mcapp.UpgradeSettings + } if mcapp.AvailabilityZones != nil { objectMap["availabilityZones"] = mcapp.AvailabilityZones } @@ -1991,15 +2007,19 @@ type ManagedClusterAgentPoolProfileProperties struct { Mode AgentPoolMode `json:"mode,omitempty"` // OrchestratorVersion - Version of orchestrator specified when creating the managed cluster. OrchestratorVersion *string `json:"orchestratorVersion,omitempty"` + // NodeImageVersion - Version of node image + NodeImageVersion *string `json:"nodeImageVersion,omitempty"` + // UpgradeSettings - Settings for upgrading the agentpool + UpgradeSettings *AgentPoolUpgradeSettings `json:"upgradeSettings,omitempty"` // ProvisioningState - READ-ONLY; The current deployment or provisioning state, which only appears in the response. ProvisioningState *string `json:"provisioningState,omitempty"` // AvailabilityZones - Availability zones for nodes. Must use VirtualMachineScaleSets AgentPoolType. AvailabilityZones *[]string `json:"availabilityZones,omitempty"` // EnableNodePublicIP - Enable public IP for nodes EnableNodePublicIP *bool `json:"enableNodePublicIP,omitempty"` - // ScaleSetPriority - ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Spot', 'Low', 'Regular' + // ScaleSetPriority - ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. Possible values include: 'Spot', 'Regular' ScaleSetPriority ScaleSetPriority `json:"scaleSetPriority,omitempty"` - // ScaleSetEvictionPolicy - ScaleSetEvictionPolicy to be used to specify eviction policy for Spot or low priority virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate' + // ScaleSetEvictionPolicy - ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate' ScaleSetEvictionPolicy ScaleSetEvictionPolicy `json:"scaleSetEvictionPolicy,omitempty"` // SpotMaxPrice - SpotMaxPrice to be used to specify the maximum price you are willing to pay in US Dollars. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand. SpotMaxPrice *float64 `json:"spotMaxPrice,omitempty"` @@ -2050,6 +2070,12 @@ func (mcappp ManagedClusterAgentPoolProfileProperties) MarshalJSON() ([]byte, er if mcappp.OrchestratorVersion != nil { objectMap["orchestratorVersion"] = mcappp.OrchestratorVersion } + if mcappp.NodeImageVersion != nil { + objectMap["nodeImageVersion"] = mcappp.NodeImageVersion + } + if mcappp.UpgradeSettings != nil { + objectMap["upgradeSettings"] = mcappp.UpgradeSettings + } if mcappp.AvailabilityZones != nil { objectMap["availabilityZones"] = mcappp.AvailabilityZones } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/openshiftmanagedclusters.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/openshiftmanagedclusters.go similarity index 100% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/openshiftmanagedclusters.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/openshiftmanagedclusters.go diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/operations.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/operations.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/operations.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/operations.go index b98eb6a33eb3e..7bf838c1deb0a 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/operations.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/operations.go @@ -76,7 +76,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe // ListPreparer prepares the List request. func (client OperationsClient) ListPreparer(ctx context.Context) (*http.Request, error) { - const APIVersion = "2020-03-01" + const APIVersion = "2020-04-01" queryParameters := map[string]interface{}{ "api-version": APIVersion, } diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/version.go similarity index 99% rename from vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/version.go rename to vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/version.go index d24586c9ba1d5..57f38f2e70bc1 100644 --- a/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice/version.go +++ b/vendor/github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice/version.go @@ -21,7 +21,7 @@ import "github.com/Azure/azure-sdk-for-go/version" // UserAgent returns the UserAgent string to use when sending http.Requests. func UserAgent() string { - return "Azure-SDK-For-Go/" + Version() + " containerservice/2020-03-01" + return "Azure-SDK-For-Go/" + Version() + " containerservice/2020-04-01" } // Version returns the semantic version (see http://semver.org) of the client. diff --git a/vendor/modules.txt b/vendor/modules.txt index 0e5b8863b360b..ffc129ad6c80a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -20,7 +20,7 @@ github.com/Azure/azure-sdk-for-go/services/cognitiveservices/mgmt/2017-04-18/cog github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2018-09-01/containerregistry -github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-03-01/containerservice +github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2020-04-01/documentdb github.com/Azure/azure-sdk-for-go/services/costmanagement/mgmt/2019-10-01/costmanagement github.com/Azure/azure-sdk-for-go/services/databricks/mgmt/2018-04-01/databricks