add eecr_account_id

README.md

@@ -2,7 +2,7 @@
 
 Kiali is a web console for the Istio Service Mesh. It is analogous to how the Kubernetes Dashboard is a web console for Kubernetes, ie. it is a web interface for viewing configurations and operations of the system. Additionally, the same as the Kubernetes Dashboard, we deploy Kiali in a read-only manner, given mesh objects should only be configured through code and pipelines, not modification through web or command line. Kiali provides a useful tool for reviewing configurations and topology, observing mesh health and performance, and tracing along with its associated details. Additional details about Kiali can be reviewed at the [Kiali website](https://kiali.io/).
 
-This module deploys and configures Kiali via its operator and integrates it with Istio and the other telemetry oriented tools of the cluster. 
+This module deploys and configures Kiali via its operator and integrates it with Istio and the other telemetry oriented tools of the cluster.
 
 <!-- BEGIN_TF_DOCS -->
 ## Requirements
@@ -44,9 +44,10 @@ This module deploys and configures Kiali via its operator and integrates it with
 | <a name="input_account_id"></a> [account\_id](#input\_account\_id) | aws account number | `string` | `""` | no |
 | <a name="input_cluster_domain"></a> [cluster\_domain](#input\_cluster\_domain) | The domain name used to reference ingresses for the cluster | `string` | n/a | yes |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the cluster into which the tools are deployed. | `string` | n/a | yes |
+| <a name="input_eecr_account_id"></a> [eecr\_account\_id](#input\_eecr\_account\_id) | enterpirse ecr source aws account number | `string` | `""` | no |
 | <a name="input_grafana_internal_url"></a> [grafana\_internal\_url](#input\_grafana\_internal\_url) | The url within the cluster to use to access grafana. | `string` | n/a | yes |
-| <a name="input_grafana_public_url"></a> [grafana\_public\_url](#input\_grafana\_public\_url) | The URL incoming traffic from outisde the cluster uses to access grafana. | `string` | n/a | yes |
 | <a name="input_grafana_secret_name"></a> [grafana\_secret\_name](#input\_grafana\_secret\_name) | The secret in the <grafana\_namespace> holding the grafana admin password. | `string` | n/a | yes |
+| <a name="input_grafana_service_name"></a> [grafana\_service\_name](#input\_grafana\_service\_name) | The name of the service used for grafana. | `string` | `"grafana"` | no |
 | <a name="input_istio_namespace"></a> [istio\_namespace](#input\_istio\_namespace) | The namespace where istio has been deployed. | `string` | `"istio-system"` | no |
 | <a name="input_kiali_application_version"></a> [kiali\_application\_version](#input\_kiali\_application\_version) | The version of kiali to install | `string` | `"v1.73.0"` | no |
 | <a name="input_kiali_operator_version"></a> [kiali\_operator\_version](#input\_kiali\_operator\_version) | The version of kiali to install | `string` | `"1.73.0"` | no |

main.tf

@@ -2,17 +2,17 @@ locals {
   internal_hostname    = format("%v.%v.svc.cluster.local", var.service_name, var.namespace)
   internal_port_number = "20001"
   internal_url         = format("http://%s:%s/", local.internal_hostname, local.internal_port_number)
-  # This may seem unusual, but we cannot input/pass the grafana ingress url, since kiali is a dependency of gatekeeper 
+  # This may seem unusual, but we cannot input/pass the grafana ingress url, since kiali is a dependency of gatekeeper
   # that creates the ingress (circular dep). So, we build the ingress url here using the same variables as gatekeeper.
-  grafana_public_url   = format("https://%s.%s", var.grafana_service_name, var.cluster_domain)
+  grafana_public_url = format("https://%s.%s", var.grafana_service_name, var.cluster_domain)
 }
 
 resource "helm_release" "kiali_operator" {
-  
-  chart      = "./kiali-operator"
-  version    = var.kiali_operator_version
-  name       = "kiali-operator"
-  namespace  = var.namespace
+
+  chart     = "./kiali-operator"
+  version   = var.kiali_operator_version
+  name      = "kiali-operator"
+  namespace = var.namespace
 
   set {
     name = "image.repo"
@@ -77,9 +77,9 @@ resource "helm_release" "kiali" {
     helm_release.kiali_operator,
   ]
 
-  chart      = "./kiali-server"
-  name       = "kiali"
-  namespace  = var.namespace
+  chart     = "./kiali-server"
+  name      = "kiali"
+  namespace = var.namespace
 
   set {
     name  = "auth.strategy"

variables.tf

@@ -1,23 +1,23 @@
-variable "profile" {
-  description = "The AWS_PROFILE to use while running the scripts."
+variable "account_id" {
+  description = "aws account number"
   type        = string
   default     = ""
 }
 
-variable "cluster_name" {
-  description = "The name of the cluster into which the tools are deployed."
+variable "cluster_domain" {
+  description = "The domain name used to reference ingresses for the cluster"
   type        = string
 }
 
-variable "cluster_domain" {
-  description = "The domain name used to reference ingresses for the cluster"
+variable "cluster_name" {
+  description = "The name of the cluster into which the tools are deployed."
   type        = string
 }
 
-variable "namespace" {
-  description = "The namespace to create and into which the tools are deployed."
+variable "eecr_account_id" {
+  description = "enterpirse ecr source aws account number"
   type        = string
-  default     = "namespace"
+  default     = ""
 }
 
 variable "istio_namespace" {
@@ -42,19 +42,12 @@ variable "grafana_service_name" {
   default     = "grafana"
 }
 
-variable "prometheus_internal_url" {
-  description = "The url within the cluster to use to query the prometheus server."
-  type        = string
-}
-
-variable "tempo_internal_url" {
-  description = "The url within the cluster to use to query tempo tracing."
-  type        = string
-}
-
-variable "tempo_datasource_id" {
-  description = "The UID of the created Tempo datasource"
+# See the [APP VERSION] found while determining kiali_operator_version
+# helm show values kiali/kiali-operator | grep tag:
+variable "kiali_application_version" {
+  description = "The version of kiali to install"
   type        = string
+  default     = "v1.73.0"
 }
 
 # helm repo add kiali https://kiali.org/helm-charts
@@ -65,25 +58,21 @@ variable "kiali_operator_version" {
   default     = "1.73.0"
 }
 
-# See the [APP VERSION] found while determining kiali_operator_version
-# helm show values kiali/kiali-operator | grep tag:
-variable "kiali_application_version" {
-  description = "The version of kiali to install"
+variable "namespace" {
+  description = "The namespace to create and into which the tools are deployed."
   type        = string
-  default     = "v1.73.0"
+  default     = "namespace"
 }
 
-variable "service_name" {
-  description = "The name of the service for Kiali."
+variable "profile" {
+  description = "The AWS_PROFILE to use while running the scripts."
   type        = string
-  default     = "kiali"
+  default     = ""
 }
 
-# tflint-ignore: terraform_unused_declarations
-variable "account_id" {
-  description = "aws account number"
+variable "prometheus_internal_url" {
+  description = "The url within the cluster to use to query the prometheus server."
   type        = string
-  default     = ""
 }
 
 # tflint-ignore: terraform_unused_declarations
@@ -92,3 +81,19 @@ variable "region" {
   type        = string
   default     = "us-gov-east-1"
 }
+
+variable "service_name" {
+  description = "The name of the service for Kiali."
+  type        = string
+  default     = "kiali"
+}
+
+variable "tempo_internal_url" {
+  description = "The url within the cluster to use to query tempo tracing."
+  type        = string
+}
+
+variable "tempo_datasource_id" {
+  description = "The UID of the created Tempo datasource"
+  type        = string
+}