Skip to content

revise the helm chart and update the poerty install lists #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xianglic wants to merge 5 commits into
base: master
Choose a base branch
from
Open

revise the helm chart and update the poerty install lists #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8fa1c5
revise the helm chart and update the poerty install lists
Aug 11, 2023
e420480
bring back the GPU specification under object engine deployment; dele…
Aug 16, 2023
97ab707
deletes the ./models from dockerignore file so that we will have a ./…
Aug 16, 2023
dfcb49e
delete the git diff file
Aug 16, 2023
0ddf4a2
add back the volume mount for ./models
Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,440 changes: 1,440 additions & 0 deletions git_diff.txt
View file
Open in desktop
Comment thread
xianglic marked this conversation as resolved.
Outdated

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nvidia/cuda:11.5.1-cudnn8-devel-ubuntu18.04
FROM nvidia/cuda:11.5.2-cudnn8-devel-ubuntu18.04
LABEL maintainer="Satyalab, satya-group@lists.andrew.cmu.edu"

ENV DEBIAN_FRONTEND=noninteractive \
Expand All @@ -16,6 +16,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
RUN apt-get update && apt-get install -y \
git \
libgl1 \
libglib2.0-0 \
python3.8 \
python3.8-venv \
python3-pip \
Expand Down
13 changes: 13 additions & 0 deletions server/charts/openscout/index.yaml
View file
Open in desktop
Comment thread
xianglic marked this conversation as resolved.
Outdated
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
entries:
openscout:
- apiVersion: v1
appVersion: 1.0.0
created: "2023-08-10T11:30:35.373609485-04:00"
description: Openrtist Helm chart for Kubernetes
digest: 8f3b92c454991b3c714954a180d1576e7d0cf71c7320e29608caa3787cb8c495
name: openscout
urls:
- openscout-1.0.0.tgz
version: 1.0.0
generated: "2023-08-10T11:30:35.372741286-04:00"
Binary file added server/charts/openscout/openscout-1.0.0.tgz
View file
Open in desktop
Comment thread
xianglic marked this conversation as resolved.
Outdated
Binary file not shown.
2 changes: 0 additions & 2 deletions server/charts/openscout/openscout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "openscout.fullname" . }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
release: {{ .Release.Name }}
Expand Down
2 changes: 0 additions & 2 deletions server/charts/openscout/template-stash/elasticsearch-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.elasticsearch.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.elasticsearch.name }}
chart: {{ .Values.images.elasticsearch.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.elasticsearch.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/template-stash/elasticsearch-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.elasticsearchservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
2 changes: 0 additions & 2 deletions server/charts/openscout/template-stash/kibana-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.kibana.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.kibana.name }}
chart: {{ .Values.images.kibana.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.kibana.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/template-stash/kibana-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.kibanaservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
2 changes: 0 additions & 2 deletions server/charts/openscout/template-stash/logstash-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.logstash.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.logstash.name }}
chart: {{ .Values.images.logstash.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.logstash.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/template-stash/logstash-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.logstashservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
29 changes: 29 additions & 0 deletions server/charts/openscout/templates/configMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: logstash-pipeline
data:
openscout-pipeline.cfg: |
input {
beats {
port => "5044"
}
}

filter {
grok {
match => { "message" => "%{DATA:detection_time},%{DATA:client_id},%{NUMBER:latitude:float},%{NUMBER:longitude:float},%{DATA:entity},%{NUMBER:confidence:float},(%{URI:image})?" }
}
mutate {
add_field => {"location" => "%{latitude},%{longitude}"
}
}
}

output {
stdout { codec => rubydebug }
elasticsearch {
hosts => [ "elasticsearch:9200" ]
index => "openscout"
}
}
2 changes: 0 additions & 2 deletions server/charts/openscout/templates/elasticsearch-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.elasticsearch.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.elasticsearch.name }}
chart: {{ .Values.images.elasticsearch.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.elasticsearch.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/templates/elasticsearch-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.elasticsearchservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
2 changes: 0 additions & 2 deletions server/charts/openscout/templates/gabriel-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.gabrielserver.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.gabrielserver.name }}
chart: {{ .Values.images.gabrielserver.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.gabrielserver.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/templates/gabriel-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.gabrielservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/templates/httpd-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.httpdservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
2 changes: 0 additions & 2 deletions server/charts/openscout/templates/httpd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.httpd.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.httpd.name }}
chart: {{ .Values.images.httpd.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.httpd.name }}
release: {{ .Release.Name }}
Expand Down
4 changes: 1 addition & 3 deletions server/charts/openscout/templates/kibana-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.kibana.name }}
namespace: {{ .Values.namespace }}
name: {{ .Values.images.kibana.name }}
labels:
app: {{ .Values.images.kibana.name }}
chart: {{ .Values.images.kibana.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.kibana.name }}
release: {{ .Release.Name }}
Expand Down
1 change: 0 additions & 1 deletion server/charts/openscout/templates/kibana-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.kibanaservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
14 changes: 7 additions & 7 deletions server/charts/openscout/templates/logstash-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.logstash.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.logstash.name }}
chart: {{ .Values.images.logstash.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.logstash.name }}
release: {{ .Release.Name }}
Expand All @@ -26,14 +24,16 @@ spec:
image: "{{ .Values.images.logstash.repository }}:{{ .Values.deployment.elkversion }}"
imagePullPolicy: {{ .Values.images.openscout.pullPolicy }}
volumeMounts:
- mountPath: {{ .Values.volumes.pipeline.mountPath }}
name: pipeline
#hardcoded the mountpath because there is no need for customize
- mountPath: /usr/share/logstash/pipeline
name: pipeline
readOnly: true
ports:
- containerPort: {{ .Values.logstashservice.port }}
hostPort: {{ .Values.logstashservice.targetPort }}
protocol: {{ .Values.deployment.protocol }}
volumes:
- name: pipeline
hostPath:
path: {{ .Values.volumes.pipeline.hostPath }}
- name: pipeline
configMap:
name: logstash-pipeline

1 change: 0 additions & 1 deletion server/charts/openscout/templates/logstash-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: v1
kind: Service
metadata:
name: {{ .Values.logstashservice.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ template "openscout.name" . }}
chart: {{ template "openscout.chart" . }}
Expand Down
59 changes: 34 additions & 25 deletions server/charts/openscout/templates/openscout-object-engine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.images.objectengine.name }}
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.objectengine.name }}
chart: {{ .Values.images.objectengine.name }}
Expand All @@ -16,7 +15,6 @@ spec:
release: {{ .Release.Name }}
template:
metadata:
namespace: {{ .Values.namespace }}
labels:
app: {{ .Values.images.objectengine.name }}
release: {{ .Release.Name }}
Expand All @@ -26,32 +24,43 @@ spec:
image: "{{ .Values.images.openscout.repository }}:{{ .Values.images.openscout.tag }}"
imagePullPolicy: {{ .Values.images.openscout.pullPolicy }}
command: {{ .Values.images.objectengine.command }}
args: {{ .Values.images.objectengine.args }}
# command: ["openscout-object-engine", "--model", "coco", "--threshold", "0.7", "--exclude", "1", ""]
#ports:
# - containerPort: {{ .Values.images.objectengine.port }}
# hostPort: {{ .Values.images.objectengine.nodePort }}
# protocol: {{ .Values.deployment.protocol }}
#resources:
#limits:
# nvidia.com/gpu: 1
volumeMounts:
- name: shared-data
mountPath: /usr/share/openscout
- name: objectengine
mountPath: {{ .Values.volumes.objectengine.mountPath }}
- name: models
mountPath: {{ .Values.volumes.models.mountPath }}
args: {{ .Values.images.objectengine.args }}
env:
- name: "WEBSERVER"
value: "{{.Values.images.httpd.url}}:{{.Values.images.httpd.nodePort}}"
volumeMounts:
- name: modeldir
mountPath: "/openscout-server/models"
- name: cachedir
mountPath: "/root/.cache/torch/hub"
#These containers are run during pod initialization
initContainers:
{{ if .Values.model.url }}
- name: prepare-model
image: busybox:1.28
command:
- wget
- "-O"
- {{ printf "%s/%s" "/openscout-server/models" .Values.model.name }}
- {{.Values.model.url}}
volumeMounts:
- name: modeldir
mountPath: "/openscout-server/models"
{{ end }}
- name: prepare-model-2
Comment thread
xianglic marked this conversation as resolved.
Outdated
image: busybox:1.28
command:
- wget
- "-O"
- "/root/.cache/torch/hub/master.zip"
- "http://vm039.elijah.cs.cmu.edu:81/master.zip"
volumeMounts:
- name: cachedir
mountPath: "/root/.cache/torch/hub"
volumes:
- name: shared-data
- name: modeldir
emptyDir: {}
- name: cachedir
emptyDir: {}
- name: objectengine
hostPath:
path: {{ .Values.volumes.objectengine.hostPath }}
- name: models
hostPath:
path: {{ .Values.volumes.models.hostPath }}


Loading