This is an automated email from the ASF dual-hosted git repository. tloubrieu pushed a commit to branch SDAP-268 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 124dc8418934495481bf69b1d5109bd4c4bd44c8 Author: Eamon Ford <[email protected]> AuthorDate: Wed Jul 29 16:49:37 2020 -0700 make solr history default --- helm/templates/collection-manager.yml | 8 ++++---- helm/values.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/templates/collection-manager.yml b/helm/templates/collection-manager.yml index 6708b13..374eabd 100644 --- a/helm/templates/collection-manager.yml +++ b/helm/templates/collection-manager.yml @@ -30,9 +30,9 @@ spec: value: {{ .Values.rabbitmq.fullnameOverride }} - name: COLLECTIONS_PATH value: {{ include "nexus.collectionsConfig.mountPath" . }}/collections.yml - {{- if $history.url }} + {{- if $history.solrEnabled }} - name: HISTORY_URL - value: {{ .Values.ingestion.history.url}} + value: http://{{ .Release.Name }}-solr-svc:8983 {{- else }} - name: HISTORY_PATH value: {{ include "nexus.history.mountPath" . }} @@ -46,7 +46,7 @@ spec: memory: {{ .Values.ingestion.collectionManager.memory }} volumeMounts: {{ include "nexus.ingestion.dataVolumeMount" . | indent 12 }} - {{- if not $history.url }} + {{- if not $history.solrEnabled }} - name: history-volume mountPath: {{ include "nexus.history.mountPath" . }} {{- end }} @@ -57,7 +57,7 @@ spec: - name: collections-config-volume configMap: name: {{ include "nexus.collectionsConfig.configmapName" . }} - {{- if not $history.url }} + {{- if not $history.solrEnabled }} - name: history-volume persistentVolumeClaim: claimName: history-volume-claim diff --git a/helm/values.yaml b/helm/values.yaml index c9b9cf1..9158cb0 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -97,7 +97,7 @@ ingestion: ## Defaults to a using a history directory, stored on a PVC using the storageClass defined in this file above history: ## Store ingestion history in a solr database instead of a filesystem directory - # url: http://history-solr + solrEnabled: true solr: replicaCount: 3
