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

Add terraform for capz monitoring cluster #7776

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 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
89 changes: 89 additions & 0 deletions infra/azure/terraform/capz/capz-monitoring/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
Copyright 2024 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

variable "resource_group_name" {
type = string
}

variable "location" {
type = string
}

variable "subscription_id" {
type = string
}

# Create the "capz-monitoring" resource group
resource "azurerm_resource_group" "capz-monitoring" {
location = var.location
name = var.resource_group_name
tags = {
DO-NOT-DELETE = "contact capz"
creationTimestamp = "2024-10-24T00:00:00Z"
}
}

resource "azurerm_resource_group" "MC_capz-monitoring_capz-monitoring_eastus" {
Copy link
Contributor

Choose a reason for hiding this comment

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

I am surprised that this resource group needs to be captured in the terraform. This is a RG that is managed by AKS and shouldn't be managed by terraform AFAIK.

https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster#node_resource_group-1

Says confirms that for me, in that we could provide a name but otherwise don't need to specify it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah that makes sense. I included it because I noticed that this resource group has been getting deleted on the CNCF sub periodically while I'm testing even though I have the do not delete tag set on it. Does this need to be in terraform if I don't want it to be deleted, or is that being caused by something else?

Copy link
Contributor

Choose a reason for hiding this comment

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

I believe that if you put the tags do-not-delete on the AKS resource group and AKS cluster, it will carry those through when it creates managed RG.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm okay, next time it gets deleted I might need some help figuring out what is causing it. Thanks!

location = var.location
name = "MC_capz-monitoring_capz-monitoring_eastus"
tags = {
DO-NOT-DELETE = "contact capz"
creationTimestamp = "2024-10-24T00:00:00Z"
}
}

resource "azurerm_user_assigned_identity" "capz_monitoring_user_identity" {
name = "capz-monitoring-user-identity"
location = azurerm_resource_group.capz-monitoring.location
resource_group_name = azurerm_resource_group.capz-monitoring.name
}

resource "azurerm_role_assignment" "monitoring_reader" {
principal_id = azurerm_user_assigned_identity.capz_monitoring_user_identity.principal_id
role_definition_name = "Monitoring Reader"
scope = "/subscriptions/${var.subscription_id}"
depends_on = [ azurerm_user_assigned_identity.capz_monitoring_user_identity ]
}

resource "azurerm_kubernetes_cluster" "capz-monitoring" {
dns_prefix = var.resource_group_name
location = var.location
name = var.resource_group_name
resource_group_name = var.resource_group_name
node_resource_group = azurerm_resource_group.MC_capz-monitoring_capz-monitoring_eastus.name
tags = {
DO-NOT-DELETE = "contact capz"
creationTimestamp = "2024-10-24T00:00:00Z"
}
depends_on = [
azurerm_resource_group.capz-monitoring,
azurerm_user_assigned_identity.capz_monitoring_user_identity,
]
kubelet_identity {
user_assigned_identity_id = azurerm_user_assigned_identity.capz_monitoring_user_identity.id
}
identity {
type = "UserAssigned"
identity_ids = [
azurerm_user_assigned_identity.capz_monitoring_user_identity.id
]
}
default_node_pool {
name = "default"
node_count = 1
vm_size = "Standard_Ds2_v2"
}
}
8 changes: 8 additions & 0 deletions infra/azure/terraform/capz/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,11 @@ module "cluster_api_gallery" {
location = var.location
depends_on = module.role_assignments
}

# Import CAPZ monitoring module
module "capz_monitoring" {
source = "./capz-monitoring"
resource_group_name = var.resource_group_name
location = var.location
subscription_id = data.azurerm_client_config.current.subscription_id
}