Skip to content
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

fix: Azure storage and Vault simplified #89

Merged
merged 9 commits into from
Aug 5, 2024

Conversation

zacharyblasczyk
Copy link
Contributor

No description provided.

Comment on lines -133 to -146
locals {
container_name = try(module.storage[0].container.name, "")
account_name = try(module.storage[0].account.name, "")
access_key = try(module.storage[0].account.primary_access_key, "")
queue_name = try(module.storage[0].queue.name, "")
blob_container = var.external_bucket == null ? coalesce(var.blob_container, local.container_name) : ""
storage_account = var.external_bucket == null ? coalesce(var.storage_account, local.account_name) : ""
storage_key = var.external_bucket == null ? coalesce(var.storage_key, local.access_key) : ""
bucket = "az://${local.storage_account}/${local.blob_container}"
queue = (var.use_internal_queue || var.blob_container == "" || var.external_bucket == null) ? "internal://" : "az://${local.account_name}/${local.queue_name}"

redis_connection_string = "redis://:${module.redis.instance.primary_access_key}@${module.redis.instance.hostname}:${module.redis.instance.port}"
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsbroks I am so glad to get rid of this.

@zacharyblasczyk
Copy link
Contributor Author

This needs to be released before we can merge and roll out to QA

@zacharyblasczyk zacharyblasczyk changed the title fix: Azure storage and Vault simplified fix!: Azure storage and Vault simplified Aug 2, 2024
@zacharyblasczyk
Copy link
Contributor Author

zacharyblasczyk commented Aug 2, 2024

## Migrations

### Upgrading from 2.x -> 3.x

3.x of this terraform requires helm version 0.17.1+ to function properly if you don't set
- var.storage_account
- var.blob_container
- var.storage_key

We have opted to hold off on releasing the ability to decouple the object store from the k8s cluster creation for now.

@zacharyblasczyk zacharyblasczyk changed the title fix!: Azure storage and Vault simplified fix: Azure storage and Vault simplified Aug 5, 2024
@zacharyblasczyk zacharyblasczyk merged commit 4832d24 into main Aug 5, 2024
5 checks passed
@zacharyblasczyk zacharyblasczyk deleted the zacharyb/azure-vault-storage-simplified branch August 5, 2024 19:07
jsbroks pushed a commit that referenced this pull request Aug 5, 2024
### [2.13.1](v2.13.0...v2.13.1) (2024-08-05)

### Bug Fixes

* Azure storage and Vault simplified ([#89](#89)) ([4832d24](4832d24))
@jsbroks
Copy link
Member

jsbroks commented Aug 5, 2024

This PR is included in version 2.13.1 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants