From ea2a4913d4031e03a87ed6e09aff1623f529f871 Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Wed, 2 Aug 2023 04:29:43 +0530 Subject: [PATCH] fix(terraform): set linode/grub2 kernel on custom images --- terraform/ops-cluster-o11y/main.tf | 4 +++- terraform/ops-test/main.tf | 3 ++- terraform/prd-cluster-oldeworld/next-01-pxy.tf | 1 + terraform/prd-cluster-oldeworld/next-03-clt.tf | 1 + terraform/prd-cluster-oldeworld/next-04-api.tf | 1 + terraform/prd-cluster-oldeworld/next-05-nws.tf | 1 + terraform/prd-cluster-publish/main.tf | 4 +++- terraform/stg-cluster-oldeworld/next-01-pxy.tf | 1 + terraform/stg-cluster-oldeworld/next-03-clt.tf | 1 + terraform/stg-cluster-oldeworld/next-04-api.tf | 1 + terraform/stg-cluster-oldeworld/next-05-nws.tf | 1 + 11 files changed, 16 insertions(+), 3 deletions(-) diff --git a/terraform/ops-cluster-o11y/main.tf b/terraform/ops-cluster-o11y/main.tf index 452ab4df..aa0a8007 100644 --- a/terraform/ops-cluster-o11y/main.tf +++ b/terraform/ops-cluster-o11y/main.tf @@ -19,7 +19,7 @@ data "linode_domain" "ops_dns_domain" { data "hcp_packer_image" "linode_ubuntu" { bucket_name = "linode-ubuntu" - channel = "latest" + channel = "golden" cloud_provider = "linode" region = "us-east" } @@ -109,6 +109,7 @@ resource "linode_instance_config" "ops_o11y_leaders_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } @@ -227,6 +228,7 @@ resource "linode_instance_config" "ops_o11y_workers_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/ops-test/main.tf b/terraform/ops-test/main.tf index 420a6c8e..2bbd6a46 100644 --- a/terraform/ops-test/main.tf +++ b/terraform/ops-test/main.tf @@ -19,7 +19,7 @@ data "linode_domain" "ops_dns_domain" { data "hcp_packer_image" "linode_ubuntu" { bucket_name = "linode-ubuntu" - channel = "latest" + channel = "golden" cloud_provider = "linode" region = "us-east" } @@ -104,6 +104,7 @@ resource "linode_instance_config" "ops_test_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/prd-cluster-oldeworld/next-01-pxy.tf b/terraform/prd-cluster-oldeworld/next-01-pxy.tf index 0db61f3f..f31d9ea7 100644 --- a/terraform/prd-cluster-oldeworld/next-01-pxy.tf +++ b/terraform/prd-cluster-oldeworld/next-01-pxy.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "prd_oldeworld_pxy_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/prd-cluster-oldeworld/next-03-clt.tf b/terraform/prd-cluster-oldeworld/next-03-clt.tf index 73f0d5cf..7378ea84 100644 --- a/terraform/prd-cluster-oldeworld/next-03-clt.tf +++ b/terraform/prd-cluster-oldeworld/next-03-clt.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "prd_oldeworld_clt_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/prd-cluster-oldeworld/next-04-api.tf b/terraform/prd-cluster-oldeworld/next-04-api.tf index f3727a8c..f72f2302 100644 --- a/terraform/prd-cluster-oldeworld/next-04-api.tf +++ b/terraform/prd-cluster-oldeworld/next-04-api.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "prd_oldeworld_api_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/prd-cluster-oldeworld/next-05-nws.tf b/terraform/prd-cluster-oldeworld/next-05-nws.tf index af3241ea..fc97f13f 100644 --- a/terraform/prd-cluster-oldeworld/next-05-nws.tf +++ b/terraform/prd-cluster-oldeworld/next-05-nws.tf @@ -100,6 +100,7 @@ resource "linode_instance_config" "prd_oldeworld_nws_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/prd-cluster-publish/main.tf b/terraform/prd-cluster-publish/main.tf index a88aeb2e..4846815b 100644 --- a/terraform/prd-cluster-publish/main.tf +++ b/terraform/prd-cluster-publish/main.tf @@ -19,7 +19,7 @@ data "linode_domain" "ops_dns_domain" { data "hcp_packer_image" "linode_ubuntu" { bucket_name = "linode-ubuntu" - channel = "latest" + channel = "golden" cloud_provider = "linode" region = "us-east" } @@ -109,6 +109,7 @@ resource "linode_instance_config" "prd_publish_leaders_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } @@ -227,6 +228,7 @@ resource "linode_instance_config" "prd_publish_workers_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/stg-cluster-oldeworld/next-01-pxy.tf b/terraform/stg-cluster-oldeworld/next-01-pxy.tf index a7a798a2..78ee3ab9 100644 --- a/terraform/stg-cluster-oldeworld/next-01-pxy.tf +++ b/terraform/stg-cluster-oldeworld/next-01-pxy.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "stg_oldeworld_pxy_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/stg-cluster-oldeworld/next-03-clt.tf b/terraform/stg-cluster-oldeworld/next-03-clt.tf index 1c63f0b6..7fa3b003 100644 --- a/terraform/stg-cluster-oldeworld/next-03-clt.tf +++ b/terraform/stg-cluster-oldeworld/next-03-clt.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "stg_oldeworld_clt_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/stg-cluster-oldeworld/next-04-api.tf b/terraform/stg-cluster-oldeworld/next-04-api.tf index ed435db8..d6cf01e7 100644 --- a/terraform/stg-cluster-oldeworld/next-04-api.tf +++ b/terraform/stg-cluster-oldeworld/next-04-api.tf @@ -90,6 +90,7 @@ resource "linode_instance_config" "stg_oldeworld_api_config" { updatedb_disabled = true } + kernel = "linode/grub2" booted = true } diff --git a/terraform/stg-cluster-oldeworld/next-05-nws.tf b/terraform/stg-cluster-oldeworld/next-05-nws.tf index 67252dbd..f47d3fe2 100644 --- a/terraform/stg-cluster-oldeworld/next-05-nws.tf +++ b/terraform/stg-cluster-oldeworld/next-05-nws.tf @@ -100,6 +100,7 @@ # updatedb_disabled = true # } +# kernel = "linode/grub2" # booted = true # }