From a962a6d2aff779059bb8e437f04834e586c29a6b Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Tue, 11 Mar 2025 16:58:52 -0400 Subject: [PATCH 1/6] Initial setting configuration development --- charts/kiali/templates/kiali.yaml | 34 --- charts/kiali/templates/secret.yaml | 10 - charts/kiali/values.yaml | 22 -- copy_images.tf | 28 +- {charts/kiali => kiali-server}/.helmignore | 0 {charts/kiali => kiali-server}/Chart.yaml | 2 +- kiali-server/templates/NOTES.txt | 2 + .../templates/_helpers.tpl | 20 +- kiali-server/templates/kiali.yaml | 35 +++ kiali-server/values.yaml | 31 +++ main.tf | 244 ++++++++++-------- variables.tf | 20 +- 12 files changed, 239 insertions(+), 209 deletions(-) delete mode 100644 charts/kiali/templates/kiali.yaml delete mode 100644 charts/kiali/templates/secret.yaml delete mode 100644 charts/kiali/values.yaml rename {charts/kiali => kiali-server}/.helmignore (100%) rename {charts/kiali => kiali-server}/Chart.yaml (98%) create mode 100644 kiali-server/templates/NOTES.txt rename {charts/kiali => kiali-server}/templates/_helpers.tpl (73%) create mode 100644 kiali-server/templates/kiali.yaml create mode 100644 kiali-server/values.yaml diff --git a/charts/kiali/templates/kiali.yaml b/charts/kiali/templates/kiali.yaml deleted file mode 100644 index 939cafb..0000000 --- a/charts/kiali/templates/kiali.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: kiali.io/v1alpha1 -kind: Kiali -metadata: - name: {{ include "kiali.fullname" . }} - labels: - {{- include "kiali.labels" . | nindent 4 }} -spec: - image_version: "operator_version" - istio_namespace: {{ .Values.istioNamespace | quote }} - deployment: - accessible_namespaces: "**" - image_name: {{ .Values.image_name | quote }} - # image_version: {{ .Values.image_version | quote }} - external_services: - grafana: - auth: - type: "basic" - username: {{ .Values.grafanaUserName | quote }} - password: "secret:{{ .Values.grafanaSecretName }}:{{ .Values.grafanaSecretPasswordKey }}" - in_cluster_url: {{ .Values.grafanaInClusterUrl | quote}} - url: {{ .Values.grafanaPublicUrl | quote }} - prometheus: - url: {{ .Values.prometheusInClusterUrl | quote }} - tracing: - in_cluster_url: {{ .Values.jaegerInClusterUrl | quote }} - auth: - strategy: {{ .Values.kialiAuthStrategy }} -{{ if eq .Values.kialiAuthStrategy "openid" }} - openid: - client_id: {{ .Values.openid.clientId | quote }} - disable_rbac: {{ .Values.openid.disableRbac }} - issuer_uri: {{ .Values.openid.issuerUri | quote }} - username_claim: {{ .Values.openid.username_claim | quote }} -{{- end }} diff --git a/charts/kiali/templates/secret.yaml b/charts/kiali/templates/secret.yaml deleted file mode 100644 index 02637db..0000000 --- a/charts/kiali/templates/secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ if .Values.openid.secret }} -apiVersion: v1 -kind: Secret -metadata: - name: kiali-o - labels: - {{- include "kiali.labels" . | nindent 4 }} -stringData: - oidc-secret: {{ .Values.openid.secret | quote }} -{{- end }} diff --git a/charts/kiali/values.yaml b/charts/kiali/values.yaml deleted file mode 100644 index 65aabd5..0000000 --- a/charts/kiali/values.yaml +++ /dev/null @@ -1,22 +0,0 @@ - -publicHostname: "kiali" -publicDomain: "cluster.domain" - -istioNamespace: "istio-system" -prometheusInClusterUrl: "http://loki-prometheus-server.prometheus.svc.cluster.local/" -jaegerInClusterUrl: "http://istio-jaeger-query.istio-tools.svc.cluster.local:16686/" -grafanaInClusterUrl: "http://loki-grafana.grafana.svc.cluster.local/" -grafanaPublicUrl: "https://grafana.cluster.domain/" -# grafanaUserName: "admin" -grafanaUserName: "YWRtaW4=" -grafanaSecretName: "kiali" -grafanaSecretPasswordKey: "grafana_password" - -kialiAuthStrategy: openid -openid: - clientId: "sso_admin_client_id" - secret: "sso_admin_client_secret" - disableRbac: true - issuerUri: "https://keycloak.cluster.domain/realms/sso_admin_realm" - usernameClaim: "username_claim" - diff --git a/copy_images.tf b/copy_images.tf index 279ea35..e8232d7 100644 --- a/copy_images.tf +++ b/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,8 +12,8 @@ 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 @@ -19,28 +21,22 @@ locals { 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 } diff --git a/charts/kiali/.helmignore b/kiali-server/.helmignore similarity index 100% rename from charts/kiali/.helmignore rename to kiali-server/.helmignore diff --git a/charts/kiali/Chart.yaml b/kiali-server/Chart.yaml similarity index 98% rename from charts/kiali/Chart.yaml rename to kiali-server/Chart.yaml index f6f22a3..29729f4 100644 --- a/charts/kiali/Chart.yaml +++ b/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. diff --git a/kiali-server/templates/NOTES.txt b/kiali-server/templates/NOTES.txt new file mode 100644 index 0000000..c3b3453 --- /dev/null +++ b/kiali-server/templates/NOTES.txt @@ -0,0 +1,2 @@ +1. Get the application URL by running these commands: + diff --git a/charts/kiali/templates/_helpers.tpl b/kiali-server/templates/_helpers.tpl similarity index 73% rename from charts/kiali/templates/_helpers.tpl rename to kiali-server/templates/_helpers.tpl index 1a082cd..b7e85ed 100644 --- a/charts/kiali/templates/_helpers.tpl +++ b/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 }} diff --git a/kiali-server/templates/kiali.yaml b/kiali-server/templates/kiali.yaml new file mode 100644 index 0000000..aca8d96 --- /dev/null +++ b/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" diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml new file mode 100644 index 0000000..33d4e43 --- /dev/null +++ b/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" diff --git a/main.tf b/main.tf index 1e1b963..917be5d 100644 --- a/main.tf +++ b/main.tf @@ -1,4 +1,3 @@ - locals { public_hostname = format("kiali.%v", var.cluster_domain) public_port_number = "80" @@ -8,23 +7,8 @@ locals { internal_port_number = "20001" internal_url = format("http://%v:%v/", local.internal_hostname, local.internal_port_number) - have_keycloak = ( - try(length(var.keycloak_namespace), 0) > 0 && - try(length(var.sso_client_id), 0) > 0 && - try(length(var.sso_client_secret), 0) > 0 && - try(length(var.keycloak_public_url), 0) > 0 && - try(length(var.keycloak_realm), 0) > 0 - ) ? true : false - - keycloak_issuer_uri = ( - local.have_keycloak ? - format("%v/realms/%v", - var.keycloak_public_url, - var.keycloak_realm - ) - : "") - - kiali_oidc_secret = local.have_keycloak ? "ensure_secret kiali oidc-secret \"${var.sso_client_secret}\"" : ";" + grafana_secret_name = "kiali" + grafana_password_key = "grafana_password" preinstall_script = < Date: Wed, 12 Mar 2025 09:57:02 -0400 Subject: [PATCH 2/6] Remove legacy chart --- charts/kiali/templates/kiali.yaml | 35 ------------------------------ charts/kiali/templates/secret.yaml | 11 ---------- charts/kiali/values.yaml | 21 ------------------ 3 files changed, 67 deletions(-) delete mode 100644 charts/kiali/templates/kiali.yaml delete mode 100644 charts/kiali/templates/secret.yaml delete mode 100644 charts/kiali/values.yaml diff --git a/charts/kiali/templates/kiali.yaml b/charts/kiali/templates/kiali.yaml deleted file mode 100644 index 541fb62..0000000 --- a/charts/kiali/templates/kiali.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -apiVersion: kiali.io/v1alpha1 -kind: Kiali -metadata: - name: {{ include "kiali.fullname" . }} - labels: - {{- include "kiali.labels" . | nindent 4 }} -spec: - image_version: "operator_version" - istio_namespace: {{ .Values.istioNamespace | quote }} - deployment: - accessible_namespaces: "**" - image_name: {{ .Values.image_name | quote }} - # image_version: {{ .Values.image_version | quote }} - external_services: - grafana: - auth: - type: "basic" - username: {{ .Values.grafanaUserName | quote }} - password: "secret:{{ .Values.grafanaSecretName }}:{{ .Values.grafanaSecretPasswordKey }}" - in_cluster_url: {{ .Values.grafanaInClusterUrl | quote}} - url: {{ .Values.grafanaPublicUrl | quote }} - prometheus: - url: {{ .Values.prometheusInClusterUrl | quote }} - tracing: - in_cluster_url: {{ .Values.jaegerInClusterUrl | quote }} - auth: - strategy: {{ .Values.kialiAuthStrategy }} -{{ if eq .Values.kialiAuthStrategy "openid" }} - openid: - client_id: {{ .Values.openid.clientId | quote }} - disable_rbac: {{ .Values.openid.disableRbac }} - issuer_uri: {{ .Values.openid.issuerUri | quote }} - username_claim: {{ .Values.openid.username_claim | quote }} -{{- end }} diff --git a/charts/kiali/templates/secret.yaml b/charts/kiali/templates/secret.yaml deleted file mode 100644 index d7a530e..0000000 --- a/charts/kiali/templates/secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -{{ if .Values.openid.secret }} -apiVersion: v1 -kind: Secret -metadata: - name: kiali-o - labels: - {{- include "kiali.labels" . | nindent 4 }} -stringData: - oidc-secret: {{ .Values.openid.secret | quote }} -{{- end }} diff --git a/charts/kiali/values.yaml b/charts/kiali/values.yaml deleted file mode 100644 index 888c110..0000000 --- a/charts/kiali/values.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -publicHostname: "kiali" -publicDomain: "cluster.domain" - -istioNamespace: "istio-system" -prometheusInClusterUrl: "http://loki-prometheus-server.prometheus.svc.cluster.local/" -jaegerInClusterUrl: "http://istio-jaeger-query.istio-tools.svc.cluster.local:16686/" -grafanaInClusterUrl: "http://loki-grafana.grafana.svc.cluster.local/" -grafanaPublicUrl: "https://grafana.cluster.domain/" -# grafanaUserName: "admin" -grafanaUserName: "YWRtaW4=" -grafanaSecretName: "kiali" -grafanaSecretPasswordKey: "grafana_password" - -kialiAuthStrategy: openid -openid: - clientId: "sso_admin_client_id" - secret: "sso_admin_client_secret" - disableRbac: true - issuerUri: "https://keycloak.cluster.domain/realms/sso_admin_realm" - usernameClaim: "username_claim" From 520f146b21f2f55e991a4b1e87adf08db36aaf81 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Wed, 12 Mar 2025 10:49:21 -0400 Subject: [PATCH 3/6] Code cleanup --- copy_images.tf | 8 +-- main.tf | 159 +------------------------------------------------ outputs.tf | 6 +- variables.tf | 32 ---------- 4 files changed, 7 insertions(+), 198 deletions(-) diff --git a/copy_images.tf b/copy_images.tf index 72f2a49..32b3c5f 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -10,8 +10,8 @@ locals { name = "istio-tools/kiali-operator" source_image = "kiali/kiali-operator" source_registry = "quay.io" - source_tag = local.kiali_operator_version - tag = local.kiali_operator_version + source_tag = var.kiali_operator_version + tag = var.kiali_operator_version }, { enabled = true @@ -19,8 +19,8 @@ locals { name = "istio-tools/kiali" source_image = "kiali/kiali" source_registry = "quay.io" - source_tag = local.kiali_operator_version - tag = local.kiali_operator_version + source_tag = var.kiali_operator_version + tag = var.kiali_operator_version }, ] } diff --git a/main.tf b/main.tf index c4325d1..473812f 100644 --- a/main.tf +++ b/main.tf @@ -87,7 +87,7 @@ resource "helm_release" "kiali_operator" { resource "helm_release" "kiali" { depends_on = [ - helm_release.kiali-operator, + helm_release.kiali_operator, module.preinstall, ] @@ -134,8 +134,7 @@ resource "helm_release" "kiali" { module "ingress_resources" { # tflint-ignore: terraform_module_version # tflint-ignore: terraform_module_pinned_source - # source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio-service-ingress.git?ref=main" - source = "/apps/terraform/workspaces/mcgin314/tfmod-istio-service-ingress" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-istio-service-ingress.git?ref=main" public_hostname = "kiali" public_domain = format("%v.%v", var.cluster_name, var.cluster_domain) @@ -143,157 +142,3 @@ module "ingress_resources" { service_namespace = var.namespace service_port = local.internal_port_number } - -# grafana: -# enabled: true -# auth: -# type: basic -# username: "admin" -# password: "Q8rktnHqzYFEf591U35Uf66T1xFJ4HZZFqiOn4fh" - -# tracing: -# enabled: true -# internalUrl: "http://tempo.tempo.svc.cluster.local:3100" -# use_grpc: false -# provider: "tempo" -# tempo_config: -# org_id: "1" -# datasource_uid: "fedkp0zap3uv4d" -# url_format: "grafana" - - -# resource "helm_release" "kiali" { -# depends_on = [ -# helm_release.kiali-operator, -# # module.preinstall, -# ] - -# chart = "kiali" -# name = "kiali" -# namespace = local.ns -# repository = "./charts" -# # repository = "${path.module}/charts" - -# set { -# name = "image_name" -# value = format("%v/%v", -# module.images.images[local.kiali_key].dest_registry, -# module.images.images[local.kiali_key].dest_repository -# ) -# } -# set { -# name = "image_version" -# value = module.images.images[local.kiali_key].tag -# } - -# set { -# name = "kialiAuthStrategy" -# value = "anonymous" -# } - -# set { -# name = "publicHostname" -# value = var.public_hostname -# } -# set { -# name = "publicDomain" -# value = var.cluster_domain -# } - -# set { -# name = "istioNamespace" -# value = var.istio_namespace -# } -# set { -# name = "prometheusInClusterUrl" -# value = var.prometheus_internal_url -# } -# set { -# name = "jaegerInClusterUrl" -# value = var.jaeger_internal_url -# } -# set { -# name = "grafanaInClusterUrl" -# value = var.grafana_internal_url -# } -# set { -# name = "grafanaPublicUrl" -# value = var.grafana_public_url -# } -# set { -# name = "grafanaUserName" -# value = "YWRtaW4=" -# # value = "admin" -# } -# set { -# name = "grafanaSecretName" -# value = "kiali" -# } -# set { -# name = "grafanaPasswordKey" -# value = "grafana_password" -# } -# } - - - - # dynamic "set" { - # for_each = local.have_keycloak ? ["openid"] : ["anonymous"] - # content { - # name = "kialiAuthStrategy" - # value = set.value - # } - # } - # dynamic "set" { - # for_each = local.have_keycloak ? [var.sso_client_id] : [] - # content { - # name = "openid.clientId" - # value = set.value - # } - # } - # dynamic "set" { - # for_each = local.have_keycloak ? [var.sso_client_secret] : [] - # content { - # name = "openid.secret" - # value = set.value - # } - # } - # dynamic "set" { - # for_each = local.have_keycloak ? [local.keycloak_issuer_uri] : [] - # content { - # name = "openid.issuerUri" - # value = set.value - # } - # } - # dynamic "set" { - # for_each = local.have_keycloak ? ["username_claim"] : [] - # content { - # name = "openid.username_claim" - # value = set.value - # } - # } - - -# module "kiali_ingress" { -# depends_on = [helm_release.kiali] - -# #source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//>ref=1.0.0" -# source = "git@github.it.census.gov:SOA/tfmod-gogatekeeper.git//" - -# certificate_issuer = var.certificate_issuer - -# namespace = local.ns -# application_name = "kiali" -# public_hostname = "kiali" -# cluster_domain = var.cluster_domain -# upstream_hostname = local.internal_hostname -# upstream_port = local.internal_port_number -# redirection_url = local.public_url -# client_id = var.sso_client_id -# client_secret = var.sso_client_secret -# keycloak_public_url = var.keycloak_public_url -# gogatekeeper_chart_version = var.gogatekeeper_chart_version -# gogatekeeper_registry = var.gogatekeeper_registry -# gogatekeeper_repository = var.gogatekeeper_repository -# gogatekeeper_tag = var.gogatekeeper_tag -# } diff --git a/outputs.tf b/outputs.tf index 8664c39..d3b64bb 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,11 +1,7 @@ output "public_endpoint" { description = "The public endpoint to use to access kiali" - value = { - hostname = local.public_hostname - port_number = local.public_port_number - url = local.public_url - } + value = module.ingress_resources.service_url } output "internal_endpoint" { diff --git a/variables.tf b/variables.tf index 3986584..e019c65 100644 --- a/variables.tf +++ b/variables.tf @@ -26,12 +26,6 @@ variable "istio_namespace" { default = "istio-system" } -variable "keycloak_namespace" { - description = "The namespace holding the keycloak instance." - type = string - default = "" -} - variable "grafana_namespace" { description = "The namespace holding the grafana instance, used to look up the grafana password." type = string @@ -67,38 +61,12 @@ variable "tempo_datasource_id" { type = string } -variable "sso_client_id" { - description = "The client id to use for SSO" - type = string - default = "" -} - -variable "sso_client_secret" { - description = "The secret associated with the sso_client_id" - type = string - default = "" -} - -variable "keycloak_public_url" { - description = "The hostname used with the cluster domain to access keycloak" - type = string - default = "" -} - -variable "keycloak_realm" { - description = "The existing keycloak realm in which the client should be created" - type = string - default = "" -} - variable "public_hostname" { description = "The hostname to use for kiali that will be publicly available" type = string default = "kiali" } - - # helm repo add kiali https://kiali.org/helm-charts # helm search repo kiali/kiali-operator variable "kiali_operator_version" { From 7fcece3a06c0fb1ae3bd288fda5c2650d710330a Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Wed, 12 Mar 2025 10:58:18 -0400 Subject: [PATCH 4/6] Fix operator image reference --- copy_images.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy_images.tf b/copy_images.tf index 32b3c5f..135c5e2 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,6 +1,6 @@ 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_server_key = format("%v#%v", "istio-tools/kiali", var.kiali_operator_version) image_config = [ ## Images for Kiali From 6046a936a1bdc752c80e4e08b92288d593ee8cf9 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Thu, 13 Mar 2025 10:48:19 -0400 Subject: [PATCH 5/6] Working out versions and images --- copy_images.tf | 4 ++-- main.tf | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/copy_images.tf b/copy_images.tf index 135c5e2..745054c 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -10,8 +10,8 @@ locals { name = "istio-tools/kiali-operator" source_image = "kiali/kiali-operator" source_registry = "quay.io" - source_tag = var.kiali_operator_version - tag = var.kiali_operator_version + source_tag = var.kiali_application_version + tag = var.kiali_application_version }, { enabled = true diff --git a/main.tf b/main.tf index 473812f..b02d609 100644 --- a/main.tf +++ b/main.tf @@ -63,6 +63,8 @@ resource "helm_release" "kiali_operator" { name = "image.tag" value = module.images.images[local.kiali_operator_key].tag } + + set { name = "cr.create" value = "false" From 8534e06a3a5977cd5653eef599710aa812f4626a Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Thu, 13 Mar 2025 12:50:38 -0400 Subject: [PATCH 6/6] Resolve versions --- copy_images.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/copy_images.tf b/copy_images.tf index 745054c..96cc219 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -1,6 +1,6 @@ locals { - kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version) - kiali_server_key = format("%v#%v", "istio-tools/kiali", var.kiali_operator_version) + kiali_operator_key = format("%v#%v", "istio-tools/kiali-operator", var.kiali_application_version) + kiali_server_key = format("%v#%v", "istio-tools/kiali", var.kiali_application_version) image_config = [ ## Images for Kiali @@ -19,8 +19,8 @@ locals { name = "istio-tools/kiali" source_image = "kiali/kiali" source_registry = "quay.io" - source_tag = var.kiali_operator_version - tag = var.kiali_operator_version + source_tag = var.kiali_application_version + tag = var.kiali_application_version }, ] }