Skip to content

Commit

Permalink
feat: Fixed branch (issue-id-43) issue (#76)
Browse files Browse the repository at this point in the history
Added otel_identity variable by default false
  • Loading branch information
amanpruthi authored Jun 25, 2024
1 parent ad1f476 commit 49876fc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ resources that lack official modules.
| <a name="input_allowed_ip_ranges"></a> [allowed\_ip\_ranges](#input\_allowed\_ip\_ranges) | allowed public IP addresses or CIDR ranges. | `list(string)` | `[]` | no |
| <a name="input_allowed_subscriptions"></a> [allowed\_subscriptions](#input\_allowed\_subscriptions) | List of allowed customer subscriptions coma seperated values | `string` | `""` | no |
| <a name="input_app_wandb_env"></a> [app\_wandb\_env](#input\_app\_wandb\_env) | Extra environment variables for W&B | `map(string)` | `{}` | no |
| <a name="input_azuremonitor"></a> [azuremonitor](#input\_azuremonitor) | # To support otel azure monitor sql and redis metrics need operator-wandb chart minimum version 0.14.0 | `bool` | `true` | no |
| <a name="input_azuremonitor"></a> [azuremonitor](#input\_azuremonitor) | # To support otel azure monitor sql and redis metrics need operator-wandb chart minimum version 0.14.0 | `bool` | `false` | no |
| <a name="input_blob_container"></a> [blob\_container](#input\_blob\_container) | Use an existing bucket. | `string` | `""` | no |
| <a name="input_cluster_sku_tier"></a> [cluster\_sku\_tier](#input\_cluster\_sku\_tier) | The Azure AKS SKU Tier to use for this cluster (https://learn.microsoft.com/en-us/azure/aks/free-standard-pricing-tiers) | `string` | `"Free"` | no |
| <a name="input_create_private_link"></a> [create\_private\_link](#input\_create\_private\_link) | Use for the azure private link. | `bool` | `true` | no |
Expand Down
12 changes: 6 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ locals {
locals {
service_account_name = "wandb-app"
private_endpoint_approval_sa = "private-endpoint-sa"
otel_sa_name = "wandb-otel-daemonset"
otel_sa_name = "wandb-otel-daemonset"
}

resource "azurerm_federated_identity_credential" "app" {
Expand Down Expand Up @@ -172,7 +172,7 @@ resource "azurerm_role_assignment" "gateway_role" {
scope = module.app_lb.gateway.id
role_definition_name = "Contributor"
principal_id = module.pod_identity[0].identity.principal_id

}

module "cron_job" {
Expand All @@ -185,10 +185,10 @@ module "cron_job" {
resourceGroupName = azurerm_resource_group.default.name
applicationGatewayName = module.app_lb.gateway.name
allowedSubscriptions = var.allowed_subscriptions
depends_on = [module.app_lb, module.pod_identity ]
depends_on = [module.app_lb, module.pod_identity]

}

resource "azurerm_role_assignment" "otel_role" {
count = var.azuremonitor ? 1 : 0
scope = azurerm_resource_group.default.id
Expand Down Expand Up @@ -336,7 +336,7 @@ module "wandb" {

mysql = { install = false }
redis = { install = false }

parquet = {
extraEnv = var.parquet_wandb_env
}
Expand Down
1 change: 1 addition & 0 deletions modules/identity/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ variable "location" {

variable "otel_identity" {
type = bool
default = false
}
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ variable "cluster_sku_tier" {
## To support otel azure monitor sql and redis metrics need operator-wandb chart minimum version 0.14.0
variable "azuremonitor" {
type = bool
default = true
default = false
}

variable "node_max_pods" {
Expand Down

0 comments on commit 49876fc

Please sign in to comment.