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

Updating azure cause microsoft broke backwards compatibility #862

Merged
merged 1 commit into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/registry/azurerm/index.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
required_providers:
azurerm:
source: "hashicorp/azurerm"
version: "2.78.0"
version: "3.4.0"
helm:
source: "hashicorp/helm"
version: "2.4.1"
Expand Down
8 changes: 4 additions & 4 deletions modules/azure_aks/azure-aks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ inputs:
default: "10.0.128.10"
outputs:
- name: k8s_endpoint
export: true
export: false
description: The endpoint to communicate to the kubernetes cluster through.
- name: k8s_ca_data
export: true
export: false
description: The certificate authority used by the kubernetes cluster for ssl.
- name: k8s_cluster_name
export: true
description: The name of the kubernetes cluster.
- name: client_cert
export: true
export: false
description: Base64 encoded public certificate used by clients to authenticate to the Kubernetes cluster.
- name: client_key
export: true
export: false
description: Base64 encoded private key used by clients to authenticate to the Kubernetes cluster.
output_providers:
helm:
Expand Down
21 changes: 12 additions & 9 deletions modules/azure_aks/tf_module/aks.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
data "azurerm_nat_gateway" "nat" {
name = "opta-${var.env_name}-nat-gateway"
resource_group_name = data.azurerm_resource_group.opta.name
}

resource "azurerm_user_assigned_identity" "opta" {
name = "opta-${var.env_name}-aks"
location = data.azurerm_resource_group.opta.location
Expand Down Expand Up @@ -63,15 +68,13 @@ resource "azurerm_kubernetes_cluster" "main" {
service_cidr = var.service_cidr
dns_service_ip = var.dns_service_ip
docker_bridge_cidr = "172.17.0.1/16"
outbound_type = "userAssignedNATGateway"
}

role_based_access_control {
enabled = true
azure_active_directory {
managed = true
tenant_id = data.azurerm_client_config.current.tenant_id
admin_group_object_ids = var.admin_group_object_ids
}
azure_active_directory_role_based_access_control {
managed = true
tenant_id = data.azurerm_client_config.current.tenant_id
admin_group_object_ids = var.admin_group_object_ids
}

default_node_pool {
Expand All @@ -86,8 +89,8 @@ resource "azurerm_kubernetes_cluster" "main" {
}

identity {
type = "UserAssigned"
user_assigned_identity_id = azurerm_user_assigned_identity.opta.id
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.opta.id]
}

kubelet_identity {
Expand Down
12 changes: 12 additions & 0 deletions modules/azure_base/tf_module/logging.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ resource "azurerm_monitor_diagnostic_setting" "infra_logging" {
}
}

log {
category = "AzurePolicyEvaluationDetails"
enabled = false

retention_policy {
days = 0
enabled = false
}
}

metric {
category = "AllMetrics"

Expand All @@ -53,6 +63,8 @@ resource "azurerm_log_analytics_workspace" "watcher" {
}

resource "azurerm_network_watcher_flow_log" "vpc_flow_log" {
name = "opta-${var.env_name}"
location = data.azurerm_resource_group.opta.location
network_watcher_name = data.azurerm_network_watcher.default.name
resource_group_name = "NetworkWatcherRG"

Expand Down