From 81fe3d5ad8bc6990ec6ad18419922bfc63474174 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Thu, 13 Jun 2024 15:30:39 +0200 Subject: [PATCH] feat(ci.jenkins.io-kubernetes-agents) change OS of nodes to Azure Linux (#724) Related to https://github.com/jenkins-infra/helpdesk/issues/3954 Twin of https://github.com/jenkins-infra/azure/pull/723, this PR fixes the OS to use Azure Linux. It was a mistake I did by forgetting to specify it: as such, the nodes are currently using Ubuntu --- ci.jenkins.io-kubernetes-agents.tf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci.jenkins.io-kubernetes-agents.tf b/ci.jenkins.io-kubernetes-agents.tf index 560b1e01..2d500725 100644 --- a/ci.jenkins.io-kubernetes-agents.tf +++ b/ci.jenkins.io-kubernetes-agents.tf @@ -67,6 +67,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "linux_arm64_n2_applications" { name = "la64n2app" vm_size = "Standard_D4pds_v5" os_disk_type = "Ephemeral" + os_sku = "AzureLinux" os_disk_size_gb = 150 # Ref. Cache storage size at https://learn.microsoft.com/en-us/azure/virtual-machines/dv3-dsv3-series#dsv3-series (depends on the instance size) orchestrator_version = local.kubernetes_versions["cijenkinsio_agents_1"] kubernetes_cluster_id = azurerm_kubernetes_cluster.cijenkinsio_agents_1.id @@ -96,6 +97,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "linux_x86_64_n4_agents_1" { provider = azurerm.jenkins-sponsorship name = "lx86n3agt1" vm_size = "Standard_D16ads_v5" + os_sku = "AzureLinux" os_disk_type = "Ephemeral" os_disk_size_gb = 600 # Ref. Cache storage size at https://learn.microsoft.com/en-us/azure/virtual-machines/dv3-dsv3-series#dsv3-series (depends on the instance size) orchestrator_version = local.kubernetes_versions["cijenkinsio_agents_1"] @@ -126,6 +128,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "linux_x86_64_n4_bom_1" { provider = azurerm.jenkins-sponsorship name = "lx86n3bom1" vm_size = "Standard_D16ads_v5" + os_sku = "AzureLinux" os_disk_type = "Ephemeral" os_disk_size_gb = 600 # Ref. Cache storage size at https://learn.microsoft.com/en-us/azure/virtual-machines/dv3-dsv3-series#dsv3-series (depends on the instance size) orchestrator_version = local.kubernetes_versions["cijenkinsio_agents_1"]