Add Load Balancer SKU name model config for Azure provider #10355
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wallyworld
reviewed
Jun 20, 2019
wallyworld
reviewed
Jun 20, 2019
timClicks
force-pushed
the
2.5-azure-support-basic-sku
branch
from
78d092f to
74a2899
Compare
timClicks
commented
Jun 20, 2019
timClicks
changed the title
timClicks
commented
Jun 21, 2019
babbageclunk
approved these changes
Jun 24, 2019
| loadBalancerSkuName, ok := validated[configAttrLoadBalancerSkuName].(string) | ||
| if ok { | ||
| loadBalancerSkuNameTitle := strings.Title(loadBalancerSkuName) | ||
| if loadBalancerSkuName != loadBalancerSkuNameTitle { |
provider/azure/environ.go
Outdated
| @@ -495,6 +495,7 @@ func (env *azureEnviron) StartInstance(ctx context.ProviderCallContext, args env | |||
| } | |||
| if seriesOS == os.Windows { | |||
| if instanceSpec.InstanceType.RootDisk < windowsMinRootDiskMB { | |||
| // TODO(tsm) add log message that the spec has been changed | |||
There was a problem hiding this comment.
Do you still want to do this?
provider/azure/environ.go
Outdated
| @@ -690,16 +689,20 @@ func (env *azureEnviron) createVirtualMachine( | |||
|
|
|||
| publicIPAddressName := vmName + "-public-ip" | |||
| publicIPAddressId := fmt.Sprintf(`[resourceId('Microsoft.Network/publicIPAddresses', '%s')]`, publicIPAddressName) | |||
| publicIPAddressAllocationMethod := network.Static | |||
| if strings.ToLower(env.config.loadBalancerSkuName) == "basic" { // preserve the settings that were used in Juju 2.4 and earlier | |||
There was a problem hiding this comment.
Since you're title-casing the setting when creating it, might make more sense to just compare to "Basic" here?
provider/vsphere/environ.go
Outdated
| @@ -20,8 +20,6 @@ import ( | |||
| "github.com/juju/juju/provider/common" | |||
| ) | |||
|
|
|||
| // Note: This provider/environment does *not* implement storage. | |||
There was a problem hiding this comment.
Did you mean to remove this? It's still true - the root-disk-source setting is separate from the more general storage facilities.
mitechie
reviewed
Jun 24, 2019
| func (s *configSuite) TestValidateInvalidLoadBalancerSkuName(c *gc.C) { | ||
| s.assertConfigInvalid( | ||
| c, testing.Attrs{"load-balancer-sku-name": "premium"}, | ||
| `invalid load balancer SKU name "Premium", expected one of: \["Basic" "Standard"\]`, |
There was a problem hiding this comment.
does the case matter to the Azure end? Can we be more forgiving of case here?
There was a problem hiding this comment.
We are. As you can see from the error message, we're transforming the input from "premium" to "Premium" on the user's behalf.
timClicks
force-pushed
the
2.5-azure-support-basic-sku
branch
from
2a35fca to
aa049a5
Compare
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Juju 2.5 changed the default Azure Load Balancer SKU from Basic to Standard. Unfortunately, models created by Juju 2.4 get stuck when their controllers are upgraded.
This change introduces a model config parameter
load-balancer-sku-name(name chosen to be consistent with the Azure SDK naming scheme) that allows for operators to select between Basic and Standard types. It also cleans up some of the internals of the Azure provider, which should make it friendlier to newcomers to the code.QA steps
(Assuming
jujuis this branch)Documentation changes
Required. We need to document the new model config parameter.
Bug reference