From 07e95c44db0b9759d4c9fa654e25e42350b8154a Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 20 Jul 2023 10:47:24 +0100 Subject: [PATCH 1/5] scaletest: stop kubernetes_secret from being constantly recreated --- scaletest/terraform/coder.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf index 13bd15205b6eb..8a63ae2484025 100644 --- a/scaletest/terraform/coder.tf +++ b/scaletest/terraform/coder.tf @@ -54,7 +54,7 @@ resource "random_password" "prometheus-postgres-password" { } resource "kubernetes_secret" "coder-db" { - type = "" # Opaque + type = "Opaque" metadata { name = "coder-db-url" namespace = local.coder_namespace From c6ad5e2c34054fecc6b424733ccd1adbac476be0 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 20 Jul 2023 10:47:52 +0100 Subject: [PATCH 2/5] scaletest: ensure we do not get auto-upgraded --- scaletest/terraform/gcp_cluster.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaletest/terraform/gcp_cluster.tf b/scaletest/terraform/gcp_cluster.tf index a1b12678749ee..3021059598323 100644 --- a/scaletest/terraform/gcp_cluster.tf +++ b/scaletest/terraform/gcp_cluster.tf @@ -18,7 +18,7 @@ resource "google_container_cluster" "primary" { } release_channel { - channel = "STABLE" + channel = "UNSPECIFIED" } initial_node_count = 1 remove_default_node_pool = true From ff706274813b30ccafd1770576c592ea52d99a9a Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 20 Jul 2023 10:48:20 +0100 Subject: [PATCH 3/5] scaletest: add external provisionerd deployment, the lazy way --- scaletest/terraform/coder.tf | 165 +++++++++++++++++++++++++++++++++++ scaletest/terraform/vars.tf | 31 +++++++ 2 files changed, 196 insertions(+) diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf index 8a63ae2484025..b25823ec6a4b8 100644 --- a/scaletest/terraform/coder.tf +++ b/scaletest/terraform/coder.tf @@ -125,6 +125,9 @@ coder: value: "${var.coder_experiments}" - name: "CODER_DANGEROUS_DISABLE_RATE_LIMITS" value: "true" + # Disabling built-in provisioner daemons + - name: "CODER_PROVISIONER_DAEMONS" + value: "0" image: repo: ${var.coder_image_repo} tag: ${var.coder_image_tag} @@ -242,6 +245,168 @@ resource "local_file" "kubernetes_template" { EOF } +# TODO(cian): Remove this when we have support in the Helm chart. +# Ref: https://github.com/coder/coder/issues/8243 +resource "local_file" "provisionerd_deployment" { + filename = "${path.module}/../.coderv2/provisionerd-deployment.yaml" + content = < Date: Thu, 20 Jul 2023 11:09:54 +0100 Subject: [PATCH 4/5] Update scaletest/terraform/gcp_cluster.tf --- scaletest/terraform/gcp_cluster.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/scaletest/terraform/gcp_cluster.tf b/scaletest/terraform/gcp_cluster.tf index 3021059598323..d83ab99c8cb74 100644 --- a/scaletest/terraform/gcp_cluster.tf +++ b/scaletest/terraform/gcp_cluster.tf @@ -18,6 +18,7 @@ resource "google_container_cluster" "primary" { } release_channel { + # Setting release channel as STABLE can cause unexpected cluster upgrades. channel = "UNSPECIFIED" } initial_node_count = 1 From dc8c3e231daedf178932e987d6dae0e2fb8f8d8f Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 20 Jul 2023 11:12:56 +0100 Subject: [PATCH 5/5] make fmt --- scaletest/terraform/coder.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf index b25823ec6a4b8..55a9e7a35721e 100644 --- a/scaletest/terraform/coder.tf +++ b/scaletest/terraform/coder.tf @@ -248,8 +248,8 @@ resource "local_file" "kubernetes_template" { # TODO(cian): Remove this when we have support in the Helm chart. # Ref: https://github.com/coder/coder/issues/8243 resource "local_file" "provisionerd_deployment" { - filename = "${path.module}/../.coderv2/provisionerd-deployment.yaml" - content = <