From 0f82cffc86483f051e62fa731796a7f43111e2c8 Mon Sep 17 00:00:00 2001 From: caroldelwing Date: Tue, 24 Sep 2024 16:29:15 -0400 Subject: [PATCH] fix: update Getting Started Terraform Tutorial files (#42) * docs: add tf files for the getting started tutorial * fix: address review suggestions * docs: fix azure azs issue * fix: add k9s to the container image, review grammar of docker.md * fix: add terraform tests * fix: addressed review suggestions * fix: update spectro provider version, cluster profile logic, and broken tag * fix: metallb pack type * docs: fix merge conflicts in dockerfile * docs: update pack and images version * fix: bump azure k8s version, update presets manifest * fix: bump metallb pack version --- .../cluster_profiles.tf | 10 +++++----- .../getting-started-deployment-tf/data.tf | 4 ++-- .../manifests/values-3tier.yaml | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/terraform/getting-started-deployment-tf/cluster_profiles.tf b/terraform/getting-started-deployment-tf/cluster_profiles.tf index cee044a..252cd76 100644 --- a/terraform/getting-started-deployment-tf/cluster_profiles.tf +++ b/terraform/getting-started-deployment-tf/cluster_profiles.tf @@ -53,7 +53,7 @@ resource "spectrocloud_cluster_profile" "aws-profile" { values = templatefile("manifests/values-3tier.yaml", { namespace = var.app_namespace, port = var.app_port, - replicas = var.replicas_number + replicas = var.replicas_number, db_password = base64encode(var.db_password), auth_token = base64encode(var.auth_token) }) @@ -113,7 +113,7 @@ resource "spectrocloud_cluster_profile" "aws-profile-kubecost" { values = templatefile("manifests/values-3tier.yaml", { namespace = var.app_namespace, port = var.app_port, - replicas = var.replicas_number + replicas = var.replicas_number, db_password = base64encode(var.db_password), auth_token = base64encode(var.auth_token) }) @@ -181,7 +181,7 @@ resource "spectrocloud_cluster_profile" "azure-profile" { values = templatefile("manifests/values-3tier.yaml", { namespace = var.app_namespace, port = var.app_port, - replicas = var.replicas_number + replicas = var.replicas_number, db_password = base64encode(var.db_password), auth_token = base64encode(var.auth_token) }) @@ -241,7 +241,7 @@ resource "spectrocloud_cluster_profile" "azure-profile-kubecost" { values = templatefile("manifests/values-3tier.yaml", { namespace = var.app_namespace, port = var.app_port, - replicas = var.replicas_number + replicas = var.replicas_number, db_password = base64encode(var.db_password), auth_token = base64encode(var.auth_token) }) @@ -310,7 +310,7 @@ resource "spectrocloud_cluster_profile" "gcp-profile" { values = templatefile("manifests/values-3tier.yaml", { namespace = var.app_namespace, port = var.app_port, - replicas = var.replicas_number + replicas = var.replicas_number, db_password = base64encode(var.db_password), auth_token = base64encode(var.auth_token) }) diff --git a/terraform/getting-started-deployment-tf/data.tf b/terraform/getting-started-deployment-tf/data.tf index 26fd122..a90193f 100644 --- a/terraform/getting-started-deployment-tf/data.tf +++ b/terraform/getting-started-deployment-tf/data.tf @@ -66,7 +66,7 @@ data "spectrocloud_pack" "azure_cni" { data "spectrocloud_pack" "azure_k8s" { name = "kubernetes" - version = "1.27.5" + version = "1.30.4" registry_uid = data.spectrocloud_registry.public_registry.id } @@ -143,7 +143,7 @@ data "spectrocloud_pack" "vmware_csi" { data "spectrocloud_pack" "vmware_metallb" { name = "lb-metallb-helm" - version = "0.13.11" + version = "0.14.8" registry_uid = data.spectrocloud_registry.public_registry.id } diff --git a/terraform/getting-started-deployment-tf/manifests/values-3tier.yaml b/terraform/getting-started-deployment-tf/manifests/values-3tier.yaml index 9fef889..af5885d 100644 --- a/terraform/getting-started-deployment-tf/manifests/values-3tier.yaml +++ b/terraform/getting-started-deployment-tf/manifests/values-3tier.yaml @@ -18,3 +18,21 @@ manifests: replicas: ${replicas} dbPassword: ${db_password} # Add base64 encoded password authToken: ${auth_token} # Add base64 encoded token + ui: + useTolerations: false + tolerations: + effect: PreferNoSchedule + key: app + value: ui + api: + useTolerations: false + tolerations: + effect: PreferNoSchedule + key: app + value: api + postgres: + useTolerations: false + tolerations: + effect: PreferNoSchedule + key: app + value: postgres