Skip to content

Commit b1deb53

Browse files
committed
Fix SSH
1 parent 2823774 commit b1deb53

File tree

6 files changed

+54
-8
lines changed

6 files changed

+54
-8
lines changed

scenarios/AksOpenAiTerraform/terraform/.terraform.lock.hcl

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scenarios/AksOpenAiTerraform/terraform/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ module "aks_cluster" {
160160
admin_group_object_ids = var.admin_group_object_ids
161161
azure_rbac_enabled = var.azure_rbac_enabled
162162
admin_username = var.admin_username
163-
ssh_public_key = var.ssh_public_key
164163
keda_enabled = var.keda_enabled
165164
vertical_pod_autoscaler_enabled = var.vertical_pod_autoscaler_enabled
166165
workload_identity_enabled = var.workload_identity_enabled

scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
terraform {
2+
required_providers {
3+
azapi = {
4+
source = "Azure/azapi"
5+
version = "~>2.0.1"
6+
}
7+
}
8+
}
9+
110
resource "azurerm_user_assigned_identity" "aks_identity" {
211
resource_group_name = var.resource_group_name
312
location = var.location
@@ -50,7 +59,7 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
5059
linux_profile {
5160
admin_username = var.admin_username
5261
ssh_key {
53-
key_data = var.ssh_public_key
62+
key_data = azapi_resource_action.ssh_public_key_gen.output.publicKey
5463
}
5564
}
5665

scenarios/AksOpenAiTerraform/terraform/modules/aks/outputs.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ output "id" {
88
description = "Specifies the resource id of the AKS cluster."
99
}
1010

11-
1211
output "aks_identity_principal_id" {
1312
value = azurerm_user_assigned_identity.aks_identity.principal_id
1413
description = "Specifies the principal id of the managed identity of the AKS cluster."
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
resource "random_pet" "ssh_key_name" {
2+
prefix = "ssh"
3+
separator = ""
4+
}
5+
6+
resource "azapi_resource_action" "ssh_public_key_gen" {
7+
type = "Microsoft.Compute/sshPublicKeys@2024-07-01"
8+
resource_id = azapi_resource.ssh_public_key.id
9+
action = "generateKeyPair"
10+
method = "POST"
11+
12+
response_export_values = ["publicKey", "privateKey"]
13+
}
14+
15+
resource "azapi_resource" "ssh_public_key" {
16+
type = "Microsoft.Compute/sshPublicKeys@2024-07-01"
17+
name = random_pet.ssh_key_name.id
18+
location = var.location
19+
parent_id = var.resource_group_id
20+
}
21+
22+
output "key_data" {
23+
value = azapi_resource_action.ssh_public_key_gen.output.publicKey
24+
}

scenarios/AksOpenAiTerraform/terraform/modules/aks/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,6 @@ variable "admin_username" {
262262
default = "azadmin"
263263
}
264264

265-
variable "ssh_public_key" {
266-
description = "(Required) Specifies the SSH public key used to access the cluster. Changing this forces a new resource to be created."
267-
type = string
268-
}
269-
270265
variable "keda_enabled" {
271266
description = "(Optional) Specifies whether KEDA Autoscaler can be used for workloads."
272267
type = bool

0 commit comments

Comments
 (0)