Merge branch 'master' into 1675_k8s_1.18

SeldonIO · Aug 28, 2020 · af843c0 · af843c0
2 parents 5bc2b9a + 043cf86
commit af843c0
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 2 deletions.
diff --git a/doc/source/reference/apis/external-prediction.md b/doc/source/reference/apis/external-prediction.md
@@ -23,7 +23,7 @@ The Seldon Core exposes a generic external API to connect your ML runtime predic
 
 ### Metadata - Graph Level
 
-- endpoint : GET /api/v1.0/metadata/
+- endpoint : GET /api/v1.0/metadata
 - example response :
 
 ```json

diff --git a/doc/source/workflow/install.md b/doc/source/workflow/install.md
@@ -6,6 +6,9 @@
 * Installer method
     * Helm version equal or higher than 3.0
     * Kustomize version equal or higher than 0.1.0
+* Ingress
+    * Istio ( sample installation using Istio 1.5 can be found at https://github.com/SeldonIO/seldon-core/tree/master/examples/auth )
+    * Ambassador
 
 #### Running older versions of Seldon Core? 
 

diff --git a/...-charts/seldon-core-analytics/templates/grafana/grafana-net-2115-dashboard-configmap.yaml b/...-charts/seldon-core-analytics/templates/grafana/grafana-net-2115-dashboard-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.grafana.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/grafana/configs/grafana-net-2115-dashboard.json").AsConfig | indent 2 }}
@@ -8,3 +9,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     seldon_dashboard: "1"
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/templates/grafana/metrics-test-dashboard-configmap.yaml b/helm-charts/seldon-core-analytics/templates/grafana/metrics-test-dashboard-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.grafana.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/grafana/configs/metrics-test-dashboard.json").AsConfig | indent 2 }}
@@ -8,3 +9,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     seldon_dashboard: "1"
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/templates/grafana/newdb.yaml b/helm-charts/seldon-core-analytics/templates/grafana/newdb.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.grafana.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/grafana/configs/newdb.json").AsConfig | indent 2 }}
@@ -8,3 +9,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     seldon_dashboard: "1"
+{{- end }}
diff --git a/...rts/seldon-core-analytics/templates/grafana/prediction-analytics-dashboard-configmap.yaml b/...rts/seldon-core-analytics/templates/grafana/prediction-analytics-dashboard-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.grafana.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/grafana/configs/predictions-analytics-dashboard.json").AsConfig | indent 2 }}
@@ -8,3 +9,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     seldon_dashboard: "1"
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/templates/prometheus/alertmanager-config-configmap.yaml b/helm-charts/seldon-core-analytics/templates/prometheus/alertmanager-config-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.prometheus.enabled }}
 apiVersion: v1
 data:
 {{- if .Values.alertmanager.config.enabled }}
@@ -19,3 +20,4 @@ metadata:
   creationTimestamp: null
   name: alertmanager-server-conf
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/templates/prometheus/prometheus-rules-configmap.yaml b/helm-charts/seldon-core-analytics/templates/prometheus/prometheus-rules-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.prometheus.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/prometheus/rules/*.rules").AsConfig | indent 2 }}
@@ -6,3 +7,4 @@ metadata:
   creationTimestamp: null
   name: prometheus-rules
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/templates/prometheus/prometheus-server-conf-configmap.yaml b/helm-charts/seldon-core-analytics/templates/prometheus/prometheus-server-conf-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.prometheus.enabled }}
 apiVersion: v1
 data:
 {{ (.Files.Glob "files/prometheus/prometheus-config.yaml").AsConfig | indent 2 }}
@@ -6,3 +7,4 @@ metadata:
   creationTimestamp: null
   name: prometheus-server-conf
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/helm-charts/seldon-core-analytics/values.yaml b/helm-charts/seldon-core-analytics/values.yaml
@@ -1,4 +1,5 @@
 grafana:
+  enabled: true
   adminUser: admin
   adminPassword: password
   sidecar:
@@ -19,6 +20,7 @@ alertmanager:
 rbac:
   enabled: true
 prometheus:
+  enabled: true
   service_type: ClusterIP
   server:
     name: seldon

diff --git a/python/tests/helpers.py b/python/tests/helpers.py
@@ -93,5 +93,6 @@ def _get_return_code(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if self.p:
+            group_id = os.getpgid(self.p.pid)
             # Kill the entire process groups (including subprocesses of self.p)
-            os.killpg(os.getpgid(self.p.pid), signal.SIGTERM)
+            os.killpg(group_id, signal.SIGKILL)