Skip to content
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

Added NODE_SIDE_TYPE flag to helm chart #8293

Merged
merged 11 commits into from
Dec 5, 2023
Merged

Added NODE_SIDE_TYPE flag to helm chart #8293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c3bd0b
added NODE_SIDE_TYPE flag to helm chart
PeterChung241 Nov 30, 2023
d8d9f5d
pass node side type to devspace.yml
shubham3121 Dec 1, 2023
6c95b70
Merge branch 'dev' into add_node_side_type
shubham3121 Dec 4, 2023
d468595
Merge branch 'OpenMined:dev' into add_node_side_type
PeterChung241 Dec 4, 2023
ac4d4aa
add node side type argument to values.yml in helm
shubham3121 Dec 4, 2023
3b5de74
pass node side type value to the backend container in helm
shubham3121 Dec 4, 2023
26e4109
Merge branch 'OpenMined:dev' into add_node_side_type
PeterChung241 Dec 4, 2023
b3e40f1
remove node_side_type from frontend contaier
rasswanth-s Dec 5, 2023
d7db139
executed tox -e syft.build.helm for building for helm template files
rasswanth-s Dec 5, 2023
413d471
updated mongo db container image
rasswanth-s Dec 5, 2023
c778108
added node_side_type in default.env
rasswanth-s Dec 5, 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
3 changes: 2 additions & 1 deletion packages/grid/default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ JAX_ENABLE_X64=True

# Mongo
MONGO_IMAGE=mongo
MONGO_VERSION="7.0.2"
MONGO_VERSION="7.0.3"
MONGO_HOST=mongo
MONGO_PORT=27017
MONGO_USERNAME=root
Expand All @@ -100,6 +100,7 @@ JAEGER_PORT=14268
# Syft
SYFT_TUTORIAL_MODE=False
ENABLE_WARNINGS=True
NODE_SIDE_TYPE=high

# Worker
USE_BLOB_STORAGE=False
Expand Down
2 changes: 2 additions & 0 deletions packages/grid/devspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ deployments:
value: "${NODE_TYPE}"
- name: NODE_NAME
value: "${NODE_NAME}"
- name: NODE_SIDE_TYPE
value: "${NODE_SIDE_TYPE}"
- name: STACK_API_KEY
value: "changeme"
- name: PORT
Expand Down
1 change: 1 addition & 0 deletions packages/grid/helm/helm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def str_presenter(dumper: Any, data: Any) -> Any:
"NODE_TYPE": "node.settings",
"VERSION_HASH": "node.settings",
"NODE_NAME": "node.settings",
"NODE_SIDE_TYPE": "node.settings",
}


Expand Down
10 changes: 6 additions & 4 deletions packages/grid/helm/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ spec:
- name: RELEASE
value: production
- name: VERSION
value: 0.8.2-beta.40
value: 0.8.3-beta.3
- name: VERSION_HASH
value: unknown
- name: NODE_TYPE
value: domain
- name: NODE_NAME
value: default_node_name
- name: NODE_SIDE_TYPE
value: ${NODE_SIDE_TYPE}
- name: STACK_API_KEY
value: changeme
- name: PORT
Expand Down Expand Up @@ -101,7 +103,7 @@ spec:
- name: DEFAULT_ROOT_PASSWORD
value: changethis
envFrom: null
image: docker.io/openmined/grid-backend:0.8.2-beta.40
image: docker.io/openmined/grid-backend:0.8.3-beta.3
lifecycle: null
livenessProbe: null
name: container-0
Expand Down Expand Up @@ -218,15 +220,15 @@ spec:
command: null
env:
- name: VERSION
value: 0.8.2-beta.40
value: 0.8.3-beta.3
- name: VERSION_HASH
value: unknown
- name: NODE_TYPE
value: domain
- name: NEXT_PUBLIC_API_URL
value: ${NEXT_PUBLIC_API_URL}
envFrom: null
image: docker.io/openmined/grid-frontend:0.8.2-beta.40
image: docker.io/openmined/grid-frontend:0.8.3-beta.3
lifecycle: null
livenessProbe: null
name: container-0
Expand Down
6 changes: 4 additions & 2 deletions packages/grid/helm/syft/templates/backend-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ spec:
- name: RELEASE
value: production
- name: VERSION
value: 0.8.2-beta.40
value: 0.8.3-beta.3
- name: VERSION_HASH
value: {{ .Values.node.settings.versionHash }}
- name: NODE_TYPE
value: {{ .Values.node.settings.nodeType }}
- name: NODE_NAME
value: {{ .Values.node.settings.nodeName }}
- name: NODE_SIDE_TYPE
value: {{ .Values.node.settings.nodeSideType }}
- name: STACK_API_KEY
value: {{ .Values.secrets.syft.stackApiKey }}
- name: PORT
Expand Down Expand Up @@ -80,7 +82,7 @@ spec:
- name: DEFAULT_ROOT_PASSWORD
value: {{ .Values.secrets.syft.defaultRootPassword }}
envFrom: null
image: docker.io/openmined/grid-backend:0.8.2-beta.40
image: docker.io/openmined/grid-backend:0.8.3-beta.3
lifecycle: null
livenessProbe: null
name: container-0
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/helm/syft/templates/frontend-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ spec:
command: null
env:
- name: VERSION
value: 0.8.2-beta.40
value: 0.8.3-beta.3
- name: VERSION_HASH
value: {{ .Values.node.settings.versionHash }}
- name: NODE_TYPE
value: {{ .Values.node.settings.nodeType }}
- name: NEXT_PUBLIC_API_URL
value: ${NEXT_PUBLIC_API_URL}
envFrom: null
image: docker.io/openmined/grid-frontend:0.8.2-beta.40
image: docker.io/openmined/grid-frontend:0.8.3-beta.3
lifecycle: null
livenessProbe: null
name: container-0
Expand Down
1 change: 1 addition & 0 deletions packages/grid/helm/syft/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ node:
nodeName: "mynode"
nodeType: "domain"
versionHash: "abc"
nodeSideType: "high"

ingress:
ingressClass: ""
Expand Down
Loading