You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by nc...@apache.org on 2022/06/21 21:16:42 UTC

[incubator-sdap-nexus] branch master updated: chore: add insitu application to ingress template (#167)

This is an automated email from the ASF dual-hosted git repository.

nchung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git


The following commit(s) were added to refs/heads/master by this push:
     new 07a48c6  chore: add insitu application to ingress template (#167)
07a48c6 is described below

commit 07a48c68a1698050bcb148f0bb90a39e8f53cf0e
Author: wphyojpl <38...@users.noreply.github.com>
AuthorDate: Tue Jun 21 14:16:38 2022 -0700

    chore: add insitu application to ingress template (#167)
    
    * Add insitu ingress
    
    * add condition to include insitu ingress
    
    * add default value for insituAPI.enabled for ingress
    
    * chore: update changelog
    
    * chore: add SDAP issue number
---
 CHANGELOG.md               | 3 ++-
 helm/templates/ingress.yml | 9 +++++++++
 helm/values.yaml           | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0153018..e70258b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SDAP-372: Updated matchup algorithm to point to AWS insitu API endpoint
 - SDAP-372: Added new matchup endpoint `match_spark_doms` that points to DOMS insitu endpoint
 - SDAP-372: Updated `match_spark_doms` to interface with samos_cdms endpoint 
+- SDAP-393: Included `insitu` in ingress based on the value of `insituAPI.enabled` in `values.yaml`
 ### Changed
 ### Deprecated
 ### Removed
 ### Fixed
 - Fix failing test_matchup unit test
-### Security
\ No newline at end of file
+### Security
diff --git a/helm/templates/ingress.yml b/helm/templates/ingress.yml
index 8360b37..566aaad 100644
--- a/helm/templates/ingress.yml
+++ b/helm/templates/ingress.yml
@@ -30,6 +30,15 @@ spec:
               name: nexus-webapp
               port:
                 number: 8083
+        {{ if .Values.insituAPI.enabled }}
+        - backend:
+            service:
+              name: parquet-t1-parquet-spark-helm
+              port:
+                number: 9801
+          path: /(insitu.*)
+          pathType: ImplementationSpecific
+        {{ end }}
         {{ if ne .Values.onEarthProxyIP "" }}
         - path: /onearth/?(.*)
           pathType: ImplementationSpecific
diff --git a/helm/values.yaml b/helm/values.yaml
index afb43b4..53c3d77 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,5 +1,8 @@
 onEarthProxyIP: ""
 
+insituAPI:
+  enabled: true
+  
 rootWebpage:
   enabled: true