-
Notifications
You must be signed in to change notification settings - Fork 212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update bundles per arm mixin usage #862
Conversation
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
d8a5753
to
a0bf4ed
Compare
Signed-off-by: Vaughn Dice <[email protected]>
@@ -31,8 +31,8 @@ Once a parameter has been declared in the `porter.yaml`, Porter provides a simpl | |||
|
|||
```yaml | |||
install: | |||
- description: "Install MySQL" | |||
helm: | |||
- helm: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dang I thought I had gotten all of these, so glad you noticed! 🙇♀
examples/aks-spring-music/README.md
Outdated
@@ -37,7 +37,7 @@ The bundle will use the service principal created above to interact with Azure. | |||
``` | |||
|
|||
* Update params for your deployment | |||
* change the `invocationImage` Docker repo to match your Docker Hub account (line 4) | |||
* change the `tag` Docker repo to match your Docker Hub account (line 5) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit/suggestion: leave off the line # as it's easy to drift without us noticing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call; will remove.
@@ -35,6 +36,15 @@ install: | |||
- "--tenant" | |||
- "{{ bundle.credentials.TENANT_ID}}" | |||
|
|||
- exec: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jeremyrickard Now that we have the az mixin, long term (not this PR) do we want to update this to use the az mixin?
mysql_password=iloveporter-127c6!J9$ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol strong stance there 😉 Take that CNAB
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😂 Also added those extry chars b/c Azure was like 'password not complex enuff'
examples/azure-wordpress/porter.yaml
Outdated
@@ -67,8 +72,8 @@ install: | |||
externalDatabase.database: "{{ bundle.parameters.database_name }}" | |||
|
|||
uninstall: | |||
# TODO: enable once the porter-azure mixin supports this action | |||
# - azure: | |||
# TODO: enable once the porter-arm mixin supports this action |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
arm supports uninstall where the old azure mixin didn't. Maybe a follow-up would be to implement the stanza for uninstall
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh nice! I'd be down to add it in this same PR, if you are?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, n/m. Not quite ready for primetime: https://github.com/deislabs/porter-arm/blob/master/pkg/arm/uninstall.go
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a link to the issue around implementing uninstall (getporter/arm-mixin#7) in the comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤦♀
@@ -1,42 +1,37 @@ | |||
resource "random_string" "password" { | |||
length = 16 | |||
special = true | |||
override_special = "/@\" " | |||
override_special = "/@£$" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😂 the "
was messing with my VSCode formatting... all lines below it weren't right... 'twas thinking it was all in one big quote. Obvi more of a terraform extension issue buuut I figured the actual override chars didn't really matter (pulled the new chars from the azurerm docs/examples).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🖖 Carry on!
Signed-off-by: Vaughn Dice <[email protected]>
Signed-off-by: Vaughn Dice <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Not sure if there are any dangling things you wanted in this PR. I'll leave to you to merge when ready
What does this change
Updates/refactors all example and workshop bundles that had previously used the deprecated
azure
mixin to use thearm
mixin.In doing so and testing the subsequent bundles, I also sometimes made some tweaks to other aspects of the bundles, for instance, updating terraform and terraform provider versions (and corresponding usage), updating some ARM template values, aligning parameter name formats (usually updating hyphenated params to snake case as the majority dictated), etc.
What issue does it fix
Closes #861
Notes for the reviewer
Please call out any changes/updates that we don't wish to make at this time.
Checklist