Initial setting configuration development

copy_images.tf

@@ -1,6 +1,8 @@
 locals {
-  kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version)
-  kiali_key          = format("%v#%v", "istio-tools/kiali", var.kiali_application_version)
+  kiali_operator_version             = "v2.2.0"
+  kiali_operator_key                 = format("%v#%v", "istio-tools/kiali-operator", local.kiali_operator_version)
+
+  kiali_server_key                   = format("%v#%v", "istio-tools/kiali", local.kiali_operator_version)
 
   image_config = [
     ## Images for Kiali
@@ -10,37 +12,31 @@ locals {
       name            = "istio-tools/kiali-operator"
       source_image    = "kiali/kiali-operator"
       source_registry = "quay.io"
-      source_tag      = var.kiali_application_version
-      tag             = var.kiali_application_version
+      source_tag      = local.kiali_operator_version
+      tag             = local.kiali_operator_version
     },
     {
       enabled         = true
       dest_path       = null
       name            = "istio-tools/kiali"
       source_image    = "kiali/kiali"
       source_registry = "quay.io"
-      source_tag      = var.kiali_application_version
-      tag             = var.kiali_application_version
+      source_tag      = local.kiali_operator_version
+      tag             = local.kiali_operator_version
     },
   ]
 }
 
 module "images" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade"
 
   profile          = var.profile
   application_name = var.cluster_name
   image_config     = local.image_config
   tags             = {}
 
-  ### optional
-  ##  account_alias        = ""
-  ##  account_id           = ""
-  ##  destination_password = ""
-  ##  destination_username = ""
-  ##  override_prefixes    = {}
-  ##  region               = ""
-  ##  source_password      = ""
-  ##  source_username      = ""
+  enable_lifecycle_policy = true
+  lifecycle_policy_all    = true
+  force_delete            = true
 }
 

charts/kiali/Chart.yaml → kiali-server/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: kiali
+name: kiali-server
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

kiali-server/templates/NOTES.txt

@@ -0,0 +1,2 @@
+1. Get the application URL by running these commands:
+

charts/kiali/templates/_helpers.tpl → kiali-server/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "kiali.name" -}}
+{{- define "kiali-server.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "kiali.fullname" -}}
+{{- define "kiali-server.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "kiali.chart" -}}
+{{- define "kiali-server.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "kiali.labels" -}}
-helm.sh/chart: {{ include "kiali.chart" . }}
-{{ include "kiali.selectorLabels" . }}
+{{- define "kiali-server.labels" -}}
+helm.sh/chart: {{ include "kiali-server.chart" . }}
+{{ include "kiali-server.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "kiali.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kiali.name" . }}
+{{- define "kiali-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kiali-server.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "kiali.serviceAccountName" -}}
+{{- define "kiali-server.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "kiali.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "kiali-server.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

kiali-server/templates/kiali.yaml

@@ -0,0 +1,35 @@
+apiVersion: kiali.io/v1alpha1
+kind: Kiali
+metadata:
+  name: kiali
+spec:
+  istio_namespace: {{ .Values.istioNamespace }}
+  auth:
+    strategy: "token"
+  deployment:
+    cluster_wide_access: true
+    view_only_mode: false
+  external_services:
+    prometheus:
+      enabled: true
+      auth:
+        insecure_skip_verify: true
+      # url: "http://prometheus-server.prometheus.svc.cluster.local:80/"
+      url: {{ .Values.prometheus.url }}
+    grafana:
+      enabled: true
+      auth:
+        type: basic
+        username: "admin"
+        password: secret:{{ .Values.grafana.secretName }}:{{ .Values.grafana.passwordKey }}
+      external_url: {{ .Values.grafana.externalUrl }}
+      internal_url: {{ .Values.grafana.internalUrl }}
+    tracing:
+      enabled: true
+      internal_url: {{ .Values.tracing.internalUrl }}
+      use_grpc: false
+      provider: "tempo"
+      tempo_config:
+        org_id: "1"
+        datasource_uid: "fedkp0zap3uv4d"
+        url_format: "grafana"

kiali-server/values.yaml

@@ -0,0 +1,31 @@
+# Default values for kiali-server.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+istioNamespace: "istio-system"
+
+prometheus:
+  enabled: true
+  url:
+
+grafana:
+  enabled: true
+  auth:
+    type: basic
+    username: "admin"
+    secretName: 
+    passwordKey: 
+    # password: "Q8rktnHqzYFEf591U35Uf66T1xFJ4HZZFqiOn4fh"
+        # password: secret:my-secret:my-cred
+  externalUrl: 
+  internalUrl: 
+
+tracing:
+  enabled: true
+  internalUrl: 
+  use_grpc: false
+  provider: "tempo"
+  tempo_config:
+    org_id: "1"
+    datasource_uid: 
+    url_format: "grafana"