[#2586] Terraform core module has wrong Helm link

#2586
airyhq · Nov 22, 2021 · 102b0dc · 102b0dc
1 parent f5d1251
commit 102b0dc
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 19 deletions.
diff --git a/...re/helm-chart/charts/components/charts/frontend/charts/frontend-ui/templates/ingress.yaml b/...re/helm-chart/charts/components/charts/frontend/charts/frontend-ui/templates/ingress.yaml
@@ -17,6 +17,9 @@ spec:
                 name: frontend-ui
                 port:
                   number: 80
+    {{- if .Values.global.host }}
+      host: {{ .Values.global.host }}
+    {{- end }}
   ingressClassName: nginx
 ---
 kind: Ingress
@@ -38,4 +41,7 @@ spec:
                 name: frontend-ui
                 port:
                   number: 80
+    {{- if .Values.global.host }}
+      host: {{ .Values.global.host }}
+    {{- end }}
   ingressClassName: nginx
diff --git a/...-chart/charts/components/charts/sources/charts/chatplugin/templates/frontend/ingress.yaml b/...-chart/charts/components/charts/sources/charts/chatplugin/templates/frontend/ingress.yaml
@@ -17,4 +17,7 @@ spec:
                 name: frontend-chat-plugin
                 port:
                   number: 80
+    {{- if .Values.global.host }}
+      host: {{ .Values.global.host }}
+    {{- end }}
   ingressClassName: nginx
diff --git a/infrastructure/helm-chart/charts/components/templates/ingress.yaml b/infrastructure/helm-chart/charts/components/templates/ingress.yaml
@@ -208,4 +208,7 @@ spec:
                 name: sources-chatplugin
                 port:
                   number: 80
+    {{- if .Values.global.host }}
+      host: {{ .Values.global.host }}
+    {{- end }}
   ingressClassName: nginx
diff --git a/infrastructure/terraform/main/main.tf b/infrastructure/terraform/main/main.tf
@@ -1,3 +1,13 @@
+provider "helm" {
+  kubernetes {
+    config_path = var.kubeconfig_output_path
+  }
+}
+
+provider "kubernetes" {
+  config_path = var.kubeconfig_output_path
+}
+
 module "my-airy-core" {
   source  = "../modules/core"
   values_yaml = data.template_file.airy_yaml.rendered

diff --git a/infrastructure/terraform/modules/aws_eks/main.tf b/infrastructure/terraform/modules/aws_eks/main.tf
@@ -96,10 +96,10 @@ module "eks" {
 resource "aws_eks_fargate_profile" "example" {
 
 
-  cluster_name           = module.eks.cluster_name
-  fargate_profile_name   = "example"
-  pod_execution_role_arn = module.eks.cluster_iam_role_arn
-  subnet_ids             = module.eks.subnet_ids
+  cluster_name           = var.core_id
+  fargate_profile_name   = "stateless"
+  pod_execution_role_arn = module.eks.fargate_iam_role_arn
+  subnet_ids             = module.vpc.private_subnets
 
   dynamic "selector" {
     for_each = var.fargate_profiles

diff --git a/infrastructure/terraform/modules/aws_eks/variables.tf b/infrastructure/terraform/modules/aws_eks/variables.tf
@@ -38,7 +38,6 @@ variable "private_subnets" {
 
 variable "public_subnets" {
   default = ["10.0.4.0/24", "10.0.5.0/24", "10.0.6.0/24"]
-
 }
 
 variable "instance_type" {

diff --git a/infrastructure/terraform/modules/core/main.tf b/infrastructure/terraform/modules/core/main.tf
@@ -22,21 +22,29 @@ data "http" "core_version" {
   }
 }
 
+locals {
+  core_version = var.core_version != "" ? var.core_version : trimspace(data.http.core_version.body)
+}
+
 resource "helm_release" "airy_core" {
   name  = "airy-release"
-  chart = "https://airy-core-helm-charts.s3.amazonaws.com/testing/airy-${trimspace(data.http.core_version.body)}.tgz"
+  chart = "https://airy-core-helm-charts.s3.amazonaws.com/stable/airy-${local.core_version}.tgz"
 
   timeout = "600"
   values = [
     var.values_yaml
   ]
 
+  namespace = var.namespace
 
-  namespace = var.namespaced ? var.core_id : "default"
+  set {
+    name  = "global.appImageTag"
+    value = local.core_version
+  }
 
   set {
-    name = "global.appImageTag"
-    value = trimspace(data.http.core_version.body)
+    name  = "ingress-controller.enabled"
+    value = var.ingress_controller_enabled
   }
 
   depends_on = [

diff --git a/infrastructure/terraform/modules/core/variables.tf b/infrastructure/terraform/modules/core/variables.tf
@@ -1,19 +1,29 @@
 variable "kubeconfig_output_path" {
-  default = "./.kubeconfig"
-}
-
-variable "kubernetes_namespace" {
-  default = "default"
+  description = "The KUBECONFIG file"
+  default     = "./.kubeconfig"
 }
 
 variable "core_id" {
-  default = "airy-core"
+  description = "Unique ID if the Airy Core instance"
+  default     = "airy-core"
 }
 
-variable "namespaced" {
-  default = false
+variable "namespace" {
+  description = "The Kubernetes namespace where Airy Core will be deployed"
+  default     = "default"
 }
 
 variable "values_yaml" {
-
-}
+  description = "The helm values overrides"
+}
+
+variable "core_version" {
+  description = "Version of the Airy Core instance"
+  type        = string
+}
+
+variable "ingress_controller_enabled" {
+  description = "Whether to create the NGinx ingress controller"
+  type        = string
+  default     = "true"
+}