diskover - pre migration actions (#2235)

truenas · Jul 20, 2024 · 7b8a456 · 7b8a456
1 parent 359a7b2
commit 7b8a456
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/library/ix-dev/charts/diskoverdata/Chart.yaml b/library/ix-dev/charts/diskoverdata/Chart.yaml
@@ -3,7 +3,7 @@ description: Diskover is used to monitor size/volumes of distributed dataset.
 annotations:
   title: Diskover Data
 type: application
-version: 1.0.14
+version: 1.0.15
 apiVersion: v2
 appVersion: "2.0.1"
 kubeVersion: '>=1.16.0-0'

diff --git a/library/ix-dev/charts/diskoverdata/templates/_diskover.tpl b/library/ix-dev/charts/diskoverdata/templates/_diskover.tpl
@@ -13,7 +13,7 @@
 
 {{- define "elasticsearch.IP" -}}
     {{ $envList := (default list) }}
-    {{ $envList = mustAppend $envList (dict "name" "ES_HOST" "value" (printf "%s" (include "common.names.fullname" .))) }}
+    {{ $envList = mustAppend $envList (dict "name" "ES_HOST" "value" (printf "%s-es" (include "common.names.fullname" .))) }}
     {{ $envList = mustAppend $envList (dict "name" "ES_PORT" "value" "9200") }}
     {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) }}
 {{- end -}}

diff --git a/library/ix-dev/charts/diskoverdata/templates/deployment.yaml b/library/ix-dev/charts/diskoverdata/templates/deployment.yaml
@@ -5,7 +5,7 @@
 apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-diskover
   labels:
     app: {{ template "common.names.name" . }}
     chart: {{ template "common.names.chart" . }}

diff --git a/library/ix-dev/charts/diskoverdata/templates/elastic_search_deployment.yaml b/library/ix-dev/charts/diskoverdata/templates/elastic_search_deployment.yaml
@@ -1,5 +1,5 @@
 {{ $values := (. | mustDeepCopy) }}
-{{ $_ := set $values "common" (dict "nameSuffix" "elasticsearch") }}
+{{ $_ := set $values "common" (dict "nameSuffix" "elasticsearch-es") }}
 {{ include "common.deployment.common_config" $values | nindent 0 }}
 spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
   template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }}

diff --git a/library/ix-dev/charts/diskoverdata/templates/elastic_search_service.yaml b/library/ix-dev/charts/diskoverdata/templates/elastic_search_service.yaml
@@ -1,6 +1,6 @@
 {{ $ports := list }}
 {{ $ports = mustAppend $ports (dict "name" "es-port" "port" 9200 "targetPort" 9200) }}
 {{ $values := (. | mustDeepCopy) }}
-{{ $_ := set $values "common" (dict "nameSuffix" "elasticsearch") }}
+{{ $_ := set $values "common" (dict "nameSuffix" "elasticsearch-es") }}
 {{ $_1 := set $values "commonService" (dict "type" "ClusterIP" "ports" $ports ) }}
 {{ include "common.classes.service" $values }}