diff --git a/charts/diskoverdata/1.0.14/Chart.lock b/charts/diskoverdata/1.0.15/Chart.lock similarity index 100% rename from charts/diskoverdata/1.0.14/Chart.lock rename to charts/diskoverdata/1.0.15/Chart.lock diff --git a/charts/diskoverdata/1.0.14/Chart.yaml b/charts/diskoverdata/1.0.15/Chart.yaml similarity index 97% rename from charts/diskoverdata/1.0.14/Chart.yaml rename to charts/diskoverdata/1.0.15/Chart.yaml index 685a34f499..b6e10ed95d 100644 --- a/charts/diskoverdata/1.0.14/Chart.yaml +++ b/charts/diskoverdata/1.0.15/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/charts/diskoverdata/1.0.14/README.md b/charts/diskoverdata/1.0.15/README.md similarity index 100% rename from charts/diskoverdata/1.0.14/README.md rename to charts/diskoverdata/1.0.15/README.md diff --git a/charts/diskoverdata/1.0.14/app-readme.md b/charts/diskoverdata/1.0.15/app-readme.md similarity index 100% rename from charts/diskoverdata/1.0.14/app-readme.md rename to charts/diskoverdata/1.0.15/app-readme.md diff --git a/charts/diskoverdata/1.0.14/charts/common-2304.0.1.tgz b/charts/diskoverdata/1.0.15/charts/common-2304.0.1.tgz similarity index 100% rename from charts/diskoverdata/1.0.14/charts/common-2304.0.1.tgz rename to charts/diskoverdata/1.0.15/charts/common-2304.0.1.tgz diff --git a/charts/diskoverdata/1.0.14/ci/test-values.yaml b/charts/diskoverdata/1.0.15/ci/test-values.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/ci/test-values.yaml rename to charts/diskoverdata/1.0.15/ci/test-values.yaml diff --git a/charts/diskoverdata/1.0.14/ix_values.yaml b/charts/diskoverdata/1.0.15/ix_values.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/ix_values.yaml rename to charts/diskoverdata/1.0.15/ix_values.yaml diff --git a/charts/diskoverdata/1.0.14/metadata.yaml b/charts/diskoverdata/1.0.15/metadata.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/metadata.yaml rename to charts/diskoverdata/1.0.15/metadata.yaml diff --git a/charts/diskoverdata/1.0.14/questions.yaml b/charts/diskoverdata/1.0.15/questions.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/questions.yaml rename to charts/diskoverdata/1.0.15/questions.yaml diff --git a/charts/diskoverdata/1.0.14/templates/_diskover.tpl b/charts/diskoverdata/1.0.15/templates/_diskover.tpl similarity index 96% rename from charts/diskoverdata/1.0.14/templates/_diskover.tpl rename to charts/diskoverdata/1.0.15/templates/_diskover.tpl index 12efc486ab..edafb8c7d3 100644 --- a/charts/diskoverdata/1.0.14/templates/_diskover.tpl +++ b/charts/diskoverdata/1.0.15/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/charts/diskoverdata/1.0.14/templates/deployment.yaml b/charts/diskoverdata/1.0.15/templates/deployment.yaml similarity index 99% rename from charts/diskoverdata/1.0.14/templates/deployment.yaml rename to charts/diskoverdata/1.0.15/templates/deployment.yaml index 1069180497..d1253c0b4e 100644 --- a/charts/diskoverdata/1.0.14/templates/deployment.yaml +++ b/charts/diskoverdata/1.0.15/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/charts/diskoverdata/1.0.14/templates/diskover-secrets.yaml b/charts/diskoverdata/1.0.15/templates/diskover-secrets.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/diskover-secrets.yaml rename to charts/diskoverdata/1.0.15/templates/diskover-secrets.yaml diff --git a/charts/diskoverdata/1.0.14/templates/elastic_search_deployment.yaml b/charts/diskoverdata/1.0.15/templates/elastic_search_deployment.yaml similarity index 96% rename from charts/diskoverdata/1.0.14/templates/elastic_search_deployment.yaml rename to charts/diskoverdata/1.0.15/templates/elastic_search_deployment.yaml index 183225eabf..8d2042e216 100644 --- a/charts/diskoverdata/1.0.14/templates/elastic_search_deployment.yaml +++ b/charts/diskoverdata/1.0.15/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/charts/diskoverdata/1.0.14/templates/elastic_search_service.yaml b/charts/diskoverdata/1.0.15/templates/elastic_search_service.yaml similarity index 79% rename from charts/diskoverdata/1.0.14/templates/elastic_search_service.yaml rename to charts/diskoverdata/1.0.15/templates/elastic_search_service.yaml index 99a33d28bf..7f054f2fe6 100644 --- a/charts/diskoverdata/1.0.14/templates/elastic_search_service.yaml +++ b/charts/diskoverdata/1.0.15/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 }} diff --git a/charts/diskoverdata/1.0.14/templates/elasticsearch-secret.yaml b/charts/diskoverdata/1.0.15/templates/elasticsearch-secret.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/elasticsearch-secret.yaml rename to charts/diskoverdata/1.0.15/templates/elasticsearch-secret.yaml diff --git a/charts/diskoverdata/1.0.14/templates/initial_scripts.yaml b/charts/diskoverdata/1.0.15/templates/initial_scripts.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/initial_scripts.yaml rename to charts/diskoverdata/1.0.15/templates/initial_scripts.yaml diff --git a/charts/diskoverdata/1.0.14/templates/pre-install-job.yaml b/charts/diskoverdata/1.0.15/templates/pre-install-job.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/pre-install-job.yaml rename to charts/diskoverdata/1.0.15/templates/pre-install-job.yaml diff --git a/charts/diskoverdata/1.0.14/templates/service.yaml b/charts/diskoverdata/1.0.15/templates/service.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/service.yaml rename to charts/diskoverdata/1.0.15/templates/service.yaml diff --git a/charts/diskoverdata/1.0.14/templates/tests/deployment-check.yaml b/charts/diskoverdata/1.0.15/templates/tests/deployment-check.yaml similarity index 100% rename from charts/diskoverdata/1.0.14/templates/tests/deployment-check.yaml rename to charts/diskoverdata/1.0.15/templates/tests/deployment-check.yaml