You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by ea...@apache.org on 2020/07/21 00:20:57 UTC
[incubator-sdap-nexus] branch bug_fixes updated: change
.Release.Namespace to .Release.Name
This is an automated email from the ASF dual-hosted git repository.
eamonford pushed a commit to branch bug_fixes
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/bug_fixes by this push:
new 8cf4f37 change .Release.Namespace to .Release.Name
8cf4f37 is described below
commit 8cf4f372678738c4808b491889b5fa63ee2d7f10
Author: Eamon Ford <ea...@jpl.nasa.gov>
AuthorDate: Mon Jul 20 17:20:43 2020 -0700
change .Release.Namespace to .Release.Name
---
helm/templates/granule-ingester.yml | 2 +-
helm/templates/solr-create-collection.yml | 4 ++--
helm/values.yaml | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/helm/templates/granule-ingester.yml b/helm/templates/granule-ingester.yml
index 078e744..16cac4d 100644
--- a/helm/templates/granule-ingester.yml
+++ b/helm/templates/granule-ingester.yml
@@ -29,7 +29,7 @@ spec:
- name: CASSANDRA_CONTACT_POINTS
value: sdap-cassandra
- name: ZK_HOST_AND_PORT
- value: {{ .Release.Namespace }}-zookeeper:2181
+ value: {{ .Release.Name }}-zookeeper:2181
resources:
requests:
cpu: {{ .Values.ingestion.granuleIngester.cpu }}
diff --git a/helm/templates/solr-create-collection.yml b/helm/templates/solr-create-collection.yml
index 6886cdd..7db5b97 100644
--- a/helm/templates/solr-create-collection.yml
+++ b/helm/templates/solr-create-collection.yml
@@ -24,11 +24,11 @@ spec:
- name: MINIMUM_NODES
value: "{{ .Values.solr.replicaCount }}"
- name: SOLR_HOST
- value: "{{ .Release.Namespace }}-solr-svc"
+ value: "{{ .Release.Name }}-solr-svc"
- name: SDAP_SOLR_URL
value: "http://$(SOLR_HOST):8983/solr/"
- name: SDAP_ZK_SOLR
- value: "{{ .Release.Namespace }}-zookeeper:2181/solr"
+ value: "{{ .Release.Name }}-zookeeper:2181/solr"
- name: CREATE_COLLECTION_PARAMS
value: "name=nexustiles&numShards=$(MINIMUM_NODES)&waitForFinalState=true"
restartPolicy: OnFailure
diff --git a/helm/values.yaml b/helm/values.yaml
index 5ad3b5b..b04dffd 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -111,7 +111,6 @@ cassandra:
solr:
replicaCount: 3
- storage: 10Gi
volumeClaimTemplates:
storageClassName: hostpath
storageSize: 10Gi