Upgrade AKS cluster to Kubernetes 1.26. Disable patch-level auto-upgr…

…ades again to avoid state drift.
danskernesdigitalebibliotek · Dec 15, 2023 · 7d06181 · 7d06181
1 parent e76e030
commit 7d06181
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/infrastructure/environments/dplplat01/infrastructure/main.tf b/infrastructure/environments/dplplat01/infrastructure/main.tf
@@ -16,8 +16,7 @@ module "environment" {
   # When copying this value, consider leaving it out and falling back to the
   # default of 102400.
   sql_storage_mb          = 409600
-  control_plane_version   = "1.25.11"
-  cluster_upgrade_channel = "patch"
+  control_plane_version   = "1.26.10"
 }
 
 # Outputs, for values that comes straight from the dpl-platform-environment

diff --git a/infrastructure/terraform/modules/dpl-platform-environment/aks.tf b/infrastructure/terraform/modules/dpl-platform-environment/aks.tf
@@ -1,11 +1,10 @@
 # Setup a single cluster in a single availabillity zone.
 resource "azurerm_kubernetes_cluster" "cluster" {
-  name                      = "aks-${var.environment_name}-01"
-  location                  = var.location
-  resource_group_name       = azurerm_resource_group.rg.name
-  dns_prefix                = var.environment_name
-  kubernetes_version        = var.control_plane_version
-  automatic_channel_upgrade = var.cluster_upgrade_channel
+  name                = "aks-${var.environment_name}-01"
+  location            = var.location
+  resource_group_name = azurerm_resource_group.rg.name
+  dns_prefix          = var.environment_name
+  kubernetes_version  = var.control_plane_version
 
   # We use a single manually scaled node pool in a single availabillity zone.
   default_node_pool {

diff --git a/infrastructure/terraform/modules/dpl-platform-environment/variables.tf b/infrastructure/terraform/modules/dpl-platform-environment/variables.tf
@@ -9,12 +9,6 @@ variable "control_plane_version" {
   type        = string
 }
 
-variable "cluster_upgrade_channel" {
-  description = "Which channel to use for automatic cluster upgrades. Valid values are 'stable', 'rapid', 'patch' and 'node-image'."
-  type        = string
-  default     = "patch"
-}
-
 variable "domain_ttl" {
   description = "The Time To Live for the provisioned domains."
   type        = number

diff --git a/tools/dplsh/Dockerfile b/tools/dplsh/Dockerfile
@@ -25,7 +25,7 @@ ARG KREW_VERSION=v0.4.4
 ARG CERT_MANAGER_VERIFIER_VERSION=0.3.0
 
 # The kubectl version can be bumped as we upgrade the cluster minor version.
-ARG KUBECTL_VERSION=v1.25.11
+ARG KUBECTL_VERSION=v1.26.10
 # kubelogin is a client-go credential plugin implementing azure authentication.
 # https://github.com/Azure/kubelogin/releases
 ARG KUBELOGIN_VERSION=v0.0.34